Fixed team null in blocks sometimes + persistent diminishing per item

Author: Chocolateghasts

src/main/java/com/mewo/hbmenhanced/ResearchBlocks/Tier1/TileEntityT1.java

@@ -198,6 +198,7 @@ public void writeToNBT(NBTTagCompound compound) {
         }
         compound.setTag("Items", items);
         compound.setTag("researchData", researchData);
+        compound.setString("Team", team);
     }
 
     @Override
@@ -211,7 +212,7 @@ public void readFromNBT(NBTTagCompound compound) {
         currentBurnTime = researchData.getInteger("currentBurnTime");
         maxResearchProgress = researchData.getInteger("maxResearchProgress");
         isBurning = researchData.getBoolean("isBurning");
-
+        team = compound.getString("Team");
         NBTTagCompound items = compound.hasKey("Items") ? compound.getCompoundTag("Items") : new NBTTagCompound();
         for (int i = 0; i < inventory.length; i++) {
             if (items.hasKey("Slot" + i)) {

src/main/java/com/mewo/hbmenhanced/ResearchBlocks/Tier3/TileEntityT3.java

@@ -203,6 +203,7 @@ public void writeToNBT(NBTTagCompound compound) {
         researchData.setInteger("researchProgress", researchProgress);
         researchData.setInteger("maxResearchProgress", maxResearchProgress);
         compound.setTag("researchData", researchData);
+        compound.setString("Team", team);
     }
 
     @Override
@@ -225,6 +226,7 @@ public void readFromNBT(NBTTagCompound compound) {
         isResearching =  researchData.getBoolean("isResearching");
         researchProgress = researchData.getInteger("researchProgress");
         maxResearchProgress = researchData.getInteger("maxResearchProgress");
+        team = compound.getString("Team");
     }
 
     @Override

src/main/java/com/mewo/hbmenhanced/Util/getItemValues.java

@@ -1,5 +1,6 @@
 package com.mewo.hbmenhanced.Util;
 
+import com.google.gson.reflect.TypeToken;
 import com.hbm.items.ModItems;
 import com.mewo.hbmenhanced.ResearchBlocks.ResearchController.TileEntityResearchController;
 import com.mewo.hbmenhanced.ResearchBlocks.Tier1.TileEntityT1;
@@ -12,13 +13,33 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 
+import java.io.File;
+import java.lang.reflect.Type;
 import java.util.*;
 
 public class getItemValues {
 
     public static Map<String, Map<String, Integer>> researchCounts = new HashMap<>();
     public static Map<String, ResearchValue> Values = new HashMap<>();
 
+    public static void loadDiminish() {
+        File file = new File("config/hbmenhanced/research_diminish.json");
+        Type type = new TypeToken<Map<String, Map<String, Integer>>>() {}.getType();
+        Map<String, Map<String, Integer>> loaded = JsonUtil.read(file, type);
+        if (loaded != null) {
+            researchCounts = loaded;
+            System.out.println("[getItemValues] Loaded diminishing values for all teams.");
+        } else {
+            System.out.println("[getItemValues] No existing diminishing data found, starting fresh.");
+        }
+    }
+
+    public static void saveDiminish() {
+        File file = new File("config/hbmenhanced/research_diminish.json");
+        JsonUtil.write(file, researchCounts);
+        System.out.println("[getItemValues] Saved diminishing values for all teams.");
+    }
+
     // Creates a truly unique identifier for an item including metadata
     private static String getUniqueItemKey(Item item, int meta) {
         return Item.itemRegistry.getNameForObject(item) + ":" + meta;
@@ -165,6 +186,11 @@ public static void setValues(ResearchValue value, ItemStack outStack, String tea
 
         Map<PointManager.ResearchType, Integer> map = value.getAllPoints();
         System.out.println("Map size: " + map.size());
+        System.out.println(team);
+        if (team == null) {
+            System.err.println("[getItemValues] Cannot apply diminishing: team is null. Stack=" + sourceStack);
+            return;
+        }
         researchCounts.computeIfAbsent(team, t -> new HashMap<>());
 
         for (Map.Entry<PointManager.ResearchType, Integer> entry : map.entrySet()) {
@@ -174,6 +200,7 @@ public static void setValues(ResearchValue value, ItemStack outStack, String tea
 
         int current = researchCounts.get(team).getOrDefault(sourceKey, 0);
         researchCounts.get(team).put(sourceKey, current + 1);
+        getItemValues.saveDiminish();
         System.out.println("Applied diminishing for source item: " + sourceKey + " for team: " + team);
     }
 }

src/main/java/com/mewo/hbmenhanced/hbmenhanced.java

@@ -277,7 +277,7 @@ public void serverStarting(FMLServerStartingEvent event) {
 
         PointManager manager = new PointManager();
         manager.createFile(event.getServer().getEntityWorld());
-
+        getItemValues.loadDiminish();
         Timer timer = new Timer(true);
         timer.scheduleAtFixedRate(new TimerTask() {
             @Override