Merge branch 'master' of github.com:InfinityStudio/GokiStats

# Conflicts:
#	src/main/java/net/infstudio/goki/common/StatsCommand.java

Author: LasmGratel

build.gradle

@@ -30,13 +30,13 @@ compileJava {
     sourceCompatibility = targetCompatibility = "1.8"
 }
 
-version = "1.2.6"
+version = "1.2.7.1"
 group= "net.infstudio.gokistats" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "gokiStats"
 
 minecraft {
     version = "1.12.2-14.23.5.2768"
-    runDir = "../run"
+    runDir = "run"
 
     // the mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   snapshot are built nightly.

crowdin.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /src/main/resources/assets/gokistats/lang/en_us.lang
+    translation: /src/main/resources/assets/gokistats/lang/%locale_with_underscore%.lang

logo/logo.ai

@@ -6,8 +6,8 @@
 import net.infstudio.goki.common.config.Configurable;
 import net.infstudio.goki.common.config.GokiConfig;
 import net.infstudio.goki.common.init.MinecraftEffects;
-import net.infstudio.goki.common.stats.StatBase;
-import net.infstudio.goki.common.stats.Stats;
+import net.infstudio.goki.api.stat.StatBase;
+import net.infstudio.goki.api.stat.Stats;
 import net.infstudio.goki.common.utils.Reference;
 import net.minecraft.command.ICommandManager;
 import net.minecraft.command.ServerCommandManager;

src/main/java/net/infstudio/goki/GokiStats.java

@@ -0,0 +1,45 @@
+package net.infstudio.goki.api.capability;
+
+import net.infstudio.goki.api.stat.StatBase;
+import net.infstudio.goki.api.stat.StatState;
+import net.infstudio.goki.api.stat.StatStorage;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.CapabilityInject;
+import net.minecraftforge.common.capabilities.CapabilityManager;
+
+public class CapabilityStat {
+    @CapabilityInject(StatStorage.class)
+    public static Capability<StatStorage> STAT;
+
+    public static void register() {
+        CapabilityManager.INSTANCE.register(StatStorage.class, new Capability.IStorage<StatStorage>() {
+            @Override
+            public NBTBase writeNBT(Capability<StatStorage> capability, StatStorage instance, EnumFacing side) {
+                NBTTagCompound compound = new NBTTagCompound();
+                instance.stateMap.forEach((stat, state) -> {
+                    NBTTagCompound stateTag = new NBTTagCompound();
+                    stateTag.setInteger("level", state.level);
+                    stateTag.setInteger("revertedLevel", state.revertedLevel);
+                    compound.setTag(stat.getKey(), stateTag);
+                });
+                return compound;
+            }
+
+            @Override
+            public void readNBT(Capability<StatStorage> capability, StatStorage instance, EnumFacing side, NBTBase nbt) {
+                if (nbt instanceof NBTTagCompound) {
+                    NBTTagCompound compound = (NBTTagCompound) nbt;
+                    for (String stat : compound.getKeySet()) {
+                        if (!StatBase.statKeyMap.containsKey(stat)) continue;
+                        NBTTagCompound stateTag = compound.getCompoundTag(stat);
+                        StatBase statBase = StatBase.statKeyMap.get(stat);
+                        instance.stateMap.put(statBase, new StatState(statBase, stateTag.getInteger("level"), stateTag.getInteger("revertedLevel")));
+                    }
+                }
+            }
+        }, StatStorage::new);
+    }
+}

src/main/java/net/infstudio/goki/api/capability/CapabilityStat.java

@@ -1,4 +1,4 @@
-package net.infstudio.goki.common.stats;
+package net.infstudio.goki.api.stat;
 
 import net.minecraft.entity.player.EntityPlayer;
 

…et/infstudio/goki/common/stats/Stat.java …va/net/infstudio/goki/api/stat/Stat.javasrc/main/java/net/infstudio/goki/common/stats/Stat.java renamed to src/main/java/net/infstudio/goki/api/stat/Stat.java src/main/java/net/infstudio/goki/common/stats/Stat.java renamed to src/main/java/net/infstudio/goki/api/stat/Stat.java

@@ -1,5 +1,7 @@
-package net.infstudio.goki.common.stats;
+package net.infstudio.goki.api.stat;
 
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import it.unimi.dsi.fastutil.objects.ObjectList;
 import net.infstudio.goki.common.config.Configurable;
 import net.infstudio.goki.common.config.GokiConfig;
 import net.infstudio.goki.common.config.stats.StatConfig;
@@ -13,10 +15,13 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 
 public abstract class StatBase<T extends StatConfig> implements Stat, Configurable<T> {
-    public static final ArrayList<StatBase> stats = new ArrayList<>(32);
+    public static final Map<String, StatBase> statKeyMap = new HashMap<>(16);
+    public static final ObjectList<StatBase> stats = new ObjectArrayList<>(16);
     public static int totalStats = 0;
     //	 public static final StatBase STAT_FOCUS = new StatFocus(14, "grpg_Focus",
 //	 "Focus", 25);
@@ -35,6 +40,7 @@ public StatBase() {
         this.key = "Dummy";
         this.name = "Dummy StatBase";
         stats.add(this);
+        statKeyMap.put(key, this);
     }
 
     public StatBase(int imgId, String key, int limit) {
@@ -43,6 +49,7 @@ public StatBase(int imgId, String key, int limit) {
         this.key = key;
         stats.add(this);
         totalStats ++;
+        statKeyMap.put(key, this);
     }
 
     protected static float getFinalBonus(float currentBonus) {
@@ -140,7 +147,23 @@ public String getLocalizedDes(EntityPlayer player) {
                 this.getAppliedDescriptionVar(player)[0]);
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof StatBase)) return false;
+        StatBase<?> statBase = (StatBase<?>) o;
+        return Objects.equals(getKey(), statBase.getKey());
+    }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(getKey());
+    }
+
+    @Override
+    public String toString() {
+        return getKey();
+    }
 //	protected float getSecondaryBonus(int amount)
 //	{
 //		return 0;

…nfstudio/goki/common/stats/StatBase.java …et/infstudio/goki/api/stat/StatBase.javasrc/main/java/net/infstudio/goki/common/stats/StatBase.java renamed to src/main/java/net/infstudio/goki/api/stat/StatBase.java src/main/java/net/infstudio/goki/common/stats/StatBase.java renamed to src/main/java/net/infstudio/goki/api/stat/StatBase.java

@@ -1,4 +1,4 @@
-package net.infstudio.goki.common.stats;
+package net.infstudio.goki.api.stat;
 
 import net.minecraft.entity.player.EntityPlayer;
 

…tudio/goki/common/stats/StatSpecial.java …infstudio/goki/api/stat/StatSpecial.javasrc/main/java/net/infstudio/goki/common/stats/StatSpecial.java renamed to src/main/java/net/infstudio/goki/api/stat/StatSpecial.java src/main/java/net/infstudio/goki/common/stats/StatSpecial.java renamed to src/main/java/net/infstudio/goki/api/stat/StatSpecial.java

@@ -1,4 +1,4 @@
-package net.infstudio.goki.common.stats;
+package net.infstudio.goki.api.stat;
 
 import net.infstudio.goki.common.utils.DataHelper;
 import net.minecraft.entity.player.EntityPlayer;

…o/goki/common/stats/StatSpecialBase.java …tudio/goki/api/stat/StatSpecialBase.javasrc/main/java/net/infstudio/goki/common/stats/StatSpecialBase.java renamed to src/main/java/net/infstudio/goki/api/stat/StatSpecialBase.java src/main/java/net/infstudio/goki/common/stats/StatSpecialBase.java renamed to src/main/java/net/infstudio/goki/api/stat/StatSpecialBase.java

@@ -0,0 +1,34 @@
+package net.infstudio.goki.api.stat;
+
+import java.util.Objects;
+
+public class StatState {
+    public Stat stat;
+    public int level, revertedLevel;
+
+    public StatState(Stat stat, int level) {
+        this.stat = stat;
+        this.level = level;
+    }
+
+    public StatState(Stat stat, int level, int revertedLevel) {
+        this.stat = stat;
+        this.level = level;
+        this.revertedLevel = revertedLevel;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        StatState statState = (StatState) o;
+        return level == statState.level &&
+                revertedLevel == statState.revertedLevel &&
+                Objects.equals(stat, statState.stat);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(stat, level, revertedLevel);
+    }
+}