Fixed #22, some of #21

Author: LasmGratel

build.gradle

@@ -30,7 +30,7 @@ compileJava {
     sourceCompatibility = targetCompatibility = "1.8"
 }
 
-version = "1.2.3.2"
+version = "1.2.5"
 group= "net.infstudio.gokistats" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "gokiStats"
 

src/main/java/net/infstudio/goki/common/config/GokiConfig.java

@@ -35,5 +35,9 @@ public static class GlobalModifiers {
         @Config.Name("Death Loss")
         @Config.Comment("Lose stats on death?")
         public boolean loseStatsOnDeath = false;
+
+        @Config.Name("Death Loss Multiplier")
+        @Config.Comment("Multiplier of levels you will lose, between 0~1.")
+        public float loseStatsMultiplier = 1;
     }
 }

src/main/java/net/infstudio/goki/common/handlers/CommonHandler.java

@@ -12,6 +12,7 @@
 import net.infstudio.goki.common.stats.tool.IDMDTuple;
 import net.infstudio.goki.common.stats.tool.StatMiningMagician;
 import net.infstudio.goki.common.utils.DataHelper;
+import net.infstudio.goki.common.utils.Reference;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -24,10 +25,13 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.text.TextComponentTranslation;
+import net.minecraftforge.common.config.Config;
+import net.minecraftforge.common.config.ConfigManager;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.living.*;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.fml.client.event.ConfigChangedEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
 import net.minecraftforge.fml.common.registry.ForgeRegistries;
@@ -155,9 +159,9 @@ public void playerDead(LivingDeathEvent event) {
             EntityPlayer player = (EntityPlayer) event.getEntityLiving();
             if (GokiConfig.globalModifiers.loseStatsOnDeath) {
                 for (int stat = 0; stat < StatBase.totalStats; stat++) {
-                    DataHelper.setPlayerStatLevel(player,
+                    DataHelper.multiplyPlayerStatLevel(player,
                             StatBase.stats.get(stat),
-                            0);
+                            level -> level - (int) GokiConfig.globalModifiers.loseStatsMultiplier * level);
                 }
             }
         }
@@ -287,4 +291,11 @@ public void entityHurt(LivingHurtEvent event) {
             }
         }
     }
+
+    @SubscribeEvent
+    public void configChanged(ConfigChangedEvent event) {
+        if (event.getModID().equals(Reference.MODID)) {
+            ConfigManager.sync(Reference.MODID, Config.Type.INSTANCE);
+        }
+    }
 }

src/main/java/net/infstudio/goki/common/stats/StatBase.java

@@ -77,7 +77,7 @@ public float getBonus(EntityPlayer player) {
     @Override
     public float[] getAppliedDescriptionVar(EntityPlayer player) {
         return new float[]
-                {DataHelper.trimDecimals(getBonus(getPlayerStatLevel(player)) * 100, 1)};
+                {DataHelper.trimDecimals(getBonus(player) * 100, 1)};
     }
 
     @Override

src/main/java/net/infstudio/goki/common/utils/DataHelper.java

@@ -12,6 +12,8 @@
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.DamageSource;
 
+import java.util.function.IntFunction;
+
 public class DataHelper {
     public static NBTTagCompound getPlayerPersistentNBT(EntityPlayer player) {
         NBTTagCompound nbt = player.getEntityData().getCompoundTag("PlayerPersisted");
@@ -38,6 +40,10 @@ public static void setPlayerStatLevel(EntityPlayer player, StatBase stat, int le
         }
     }
 
+    public static void multiplyPlayerStatLevel(EntityPlayer player, StatBase stat, IntFunction<Integer> multiplier) {
+        setPlayerStatLevel(player, stat, multiplier.apply(getPlayerStatLevel(player, stat)));
+    }
+
     public static float trimDecimals(float in, int decimals) {
         float f = (float) (in * Math.pow(10.0D, decimals));
         int i = (int) f;