Fixing vampirism degrading nutrition (#17)

* Xabe's requested vamp changes

* Update WitcheryEventHandler.java

* removing unnecessary phases from module

* change deps

Author: Alastors

dependencies.gradle

@@ -35,6 +35,7 @@
  */
 dependencies {
     api("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false }
+    compileOnlyApi(deobfCurse('witchery-69673:2234410'))
 
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:SpiceOfLife:2.1.6-carrot:dev")
 }

src/main/java/ca/wescook/nutrition/Nutrition.java

@@ -4,6 +4,8 @@
 
 import ca.wescook.nutrition.effects.EffectsList;
 import ca.wescook.nutrition.events.*;
+import ca.wescook.nutrition.modules.witchery.WitcheryHelper;
+import ca.wescook.nutrition.modules.witchery.events.WitcheryEventHandler;
 import ca.wescook.nutrition.network.ModPacketHandler;
 import ca.wescook.nutrition.potions.ModPotions;
 import ca.wescook.nutrition.proxy.CommonProxy;
@@ -50,6 +52,14 @@ public void preInit(FMLPreInitializationEvent event) {
         }
     }
 
+    @Mod.EventHandler
+    public void load(FMLInitializationEvent event) {
+        if (WitcheryHelper.isActive()) {
+            WitcheryEventHandler witcheryEventHandler = new WitcheryEventHandler();
+            MinecraftForge.EVENT_BUS.register(witcheryEventHandler);
+        }
+    }
+
     @EventHandler
     public void init(FMLInitializationEvent event) {
         Nutrition.proxy.init(event);

src/main/java/ca/wescook/nutrition/data/NutrientManager.java

@@ -38,6 +38,14 @@ public void set(Nutrient nutrient, Float value) {
         nutrition.put(nutrient, value);
     }
 
+    public void vampireFloor() {
+        for (Nutrient nutrient : NutrientList.get()) {
+            if (nutrition.get(nutrient) < 50) {
+                nutrition.put(nutrient, 50f);
+            }
+        }
+    }
+
     // Update all nutrients
     public void set(Map<Nutrient, Float> nutrientData) {
         nutrition.putAll(nutrientData);

src/main/java/ca/wescook/nutrition/modules/ModHelperManager.java

@@ -0,0 +1,28 @@
+package ca.wescook.nutrition.modules;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import ca.wescook.nutrition.modules.witchery.WitcheryHelper;
+import ca.wescook.nutrition.utility.IModHelper;
+
+public class ModHelperManager {
+
+    private static List<IModHelper> helpers;
+
+    public static void preInit() {
+        setupHelpers();
+        for (IModHelper helper : helpers) {
+            helper.preInit();
+        }
+    }
+
+    public static void init() {}
+
+    public static void postInit() {}
+
+    private static void setupHelpers() {
+        helpers = new ArrayList<>();
+        helpers.add(new WitcheryHelper());
+    }
+}

src/main/java/ca/wescook/nutrition/modules/ModuleConfig.java

@@ -0,0 +1,6 @@
+package ca.wescook.nutrition.modules;
+
+public class ModuleConfig {
+
+    public static boolean witcheryModuleActive = true;
+}

src/main/java/ca/wescook/nutrition/modules/witchery/WitcheryHelper.java

@@ -0,0 +1,25 @@
+package ca.wescook.nutrition.modules.witchery;
+
+import ca.wescook.nutrition.modules.ModuleConfig;
+import ca.wescook.nutrition.utility.IModHelper;
+import cpw.mods.fml.common.Loader;
+
+public class WitcheryHelper implements IModHelper {
+
+    public static final String WITCHERY = "witchery";
+    private static boolean isWitcheryActive = false;
+
+    public static boolean isActive() {
+        return isWitcheryActive;
+    }
+
+    public void preInit() {
+        if (Loader.isModLoaded(WITCHERY) && (ModuleConfig.witcheryModuleActive)) {
+            isWitcheryActive = true;
+        }
+    }
+
+    public void init() {}
+
+    public void postInit() {}
+}

src/main/java/ca/wescook/nutrition/modules/witchery/events/WitcheryEventHandler.java

@@ -0,0 +1,39 @@
+package ca.wescook.nutrition.modules.witchery.events;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
+
+import com.emoniph.witchery.common.ExtendedPlayer;
+
+import ca.wescook.nutrition.data.NutrientManager;
+import ca.wescook.nutrition.data.PlayerDataHandler;
+import ca.wescook.nutrition.modules.witchery.WitcheryHelper;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+
+public class WitcheryEventHandler {
+
+    public static final PlayerCapabilities genericPlayerCapabilities = new PlayerCapabilities();
+
+    @SubscribeEvent
+    public void livingTick(LivingUpdateEvent event) {
+        if (!WitcheryHelper.isActive()) {
+            return;
+        }
+
+        if (!(event.entity.worldObj.isRemote)) {
+            return;
+        }
+
+        if ((event.entity instanceof EntityPlayer player)) {
+            final ExtendedPlayer prop = (ExtendedPlayer) player.getExtendedProperties("WitcheryExtendedPlayer");
+            if (prop.isVampire()) {
+                NutrientManager nutritionOld = PlayerDataHandler.getForPlayer(player); // Get old nutrition
+                NutrientManager nutritionNew = new NutrientManager(nutritionOld.get()); // Create new nutrition
+                nutritionNew.vampireFloor();
+                PlayerDataHandler.setForPlayer(player, nutritionNew, true);
+            }
+        }
+    }
+
+}

src/main/java/ca/wescook/nutrition/proxy/CommonProxy.java

@@ -1,10 +1,23 @@
 package ca.wescook.nutrition.proxy;
 
+import ca.wescook.nutrition.modules.ModHelperManager;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
 public class CommonProxy {
 
-    public void init(FMLInitializationEvent event) {}
+    public void preInit(FMLPreInitializationEvent event) {
+        ModHelperManager.preInit();
+    }
+
+    public void init(FMLInitializationEvent event) {
+        ModHelperManager.init();
+    }
+
+    public void postInit(FMLPostInitializationEvent event) {
+        ModHelperManager.postInit();
+    }
 
     public boolean isClient() {
         return false;

src/main/java/ca/wescook/nutrition/utility/IModHelper.java

@@ -0,0 +1,10 @@
+package ca.wescook.nutrition.utility;
+
+public interface IModHelper {
+
+    public void preInit();
+
+    public void init();
+
+    public void postInit();
+}