Fixed JEI double recipes and removed updating recipes after changed with In-game config, causes of changes in JEI, refresh resources now instead

GoryMoon · GoryMoon · commit 9f529501af81 · 2017-11-05T01:22:25.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -39,15 +39,15 @@ group = "se.gory_moon" // http://maven.apache.org/guides/mini/guide-naming-conve
 archivesBaseName = "HorsePower"
 
 minecraft {
-    version = "1.12-14.21.1.2443"
+    version = "1.12.2-14.23.0.2529"
     runDir = "run"
     
     // the mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   snapshot are built nightly.
     // stable_#            stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not always work.
     // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "snapshot_20170707"
+    mappings = "snapshot_20171003"
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 
     replaceIn "Reference.java"
diff --git a/build.properties b/build.properties
@@ -1,8 +1,8 @@
-mod_version=2.5.7
+mod_version=2.5.8
 local_build=1
 
-mc_version=1.12
-jei_version=4.7.5.83
-top_version=1.4.15-8
+mc_version=1.12.2
+jei_version=4.8.0.111
+top_version=1.4.19-11
 waila_version=1.7.1_1.11.2
-hwyla_version=1.8.19-B33_1.12
+hwyla_version=1.8.22-B37_1.12
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jun 03 03:43:45 CEST 2017
+#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
diff --git a/libs/CraftTweaker2-1.12-4.0.9.jar b/libs/CraftTweaker2-1.12-4.0.9.jar
diff --git a/src/main/java/se/gory_moon/horsepower/Configs.java b/src/main/java/se/gory_moon/horsepower/Configs.java
@@ -22,7 +22,7 @@ public class Configs {
     @Config.LangKey("config.gui.general")
     public static General general = new General();
 
-    @Comment("Contains the customizable recipes")
+    @Comment({"Contains the customizable recipes", "For the recipes to show in JEI the resources needs to be reloaded, F3+T"})
     @Config.LangKey("config.gui.recipes")
     public static Recipes recipes = new Recipes();
 
diff --git a/src/main/java/se/gory_moon/horsepower/HorsePowerMod.java b/src/main/java/se/gory_moon/horsepower/HorsePowerMod.java
@@ -11,8 +11,6 @@
 import org.apache.logging.log4j.Logger;
 import se.gory_moon.horsepower.blocks.ModBlocks;
 import se.gory_moon.horsepower.items.ModItems;
-import se.gory_moon.horsepower.jei.DummyJeiPlugin;
-import se.gory_moon.horsepower.jei.IJeiPlugin;
 import se.gory_moon.horsepower.lib.Reference;
 import se.gory_moon.horsepower.network.PacketHandler;
 import se.gory_moon.horsepower.proxy.CommonProxy;
@@ -34,7 +32,6 @@ public class HorsePowerMod {
 
     public static HorsePowerCreativeTab creativeTab = new HorsePowerCreativeTab();
     public static ITweakerPlugin tweakerPlugin = new DummyTweakPluginImpl();
-    public static IJeiPlugin jeiPlugin = new DummyJeiPlugin();
     public static Logger logger = LogManager.getLogger("HorsePower");
 
     @EventHandler
diff --git a/src/main/java/se/gory_moon/horsepower/blocks/BlockHPBase.java b/src/main/java/se/gory_moon/horsepower/blocks/BlockHPBase.java
@@ -143,7 +143,7 @@ public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state,
                 for (Object entity : worldIn.getEntitiesWithinAABB(clazz, new AxisAlignedBB((double) x - 7.0D, (double) y - 7.0D, (double) z - 7.0D, (double) x + 7.0D, (double) y + 7.0D, (double) z + 7.0D))) {
                     if (entity instanceof EntityCreature) {
                         EntityCreature tmp = (EntityCreature) entity;
-                        if ((tmp.getLeashed() && tmp.getLeashedToEntity() == playerIn)) {
+                        if ((tmp.getLeashed() && tmp.getLeashHolder() == playerIn)) {
                             creature = tmp;
                             break search;
                         }
diff --git a/src/main/java/se/gory_moon/horsepower/blocks/ModBlocks.java b/src/main/java/se/gory_moon/horsepower/blocks/ModBlocks.java
@@ -42,7 +42,10 @@ public static void registerBlocks(RegistryEvent.Register<Block> event) {
             final IForgeRegistry<Block> registry = event.getRegistry();
 
             BLOCK_PRESS_FILLER.setHarvestLevel("axe", 1);
-            final Block[] blocks = {BLOCK_HAND_GRINDSTONE, BLOCK_GRINDSTONE, BLOCK_MANUAL_CHOPPER, BLOCK_CHOPPER, BLOCK_CHOPPER_FILLER, BLOCK_PRESS, BLOCK_PRESS_FILLER};
+            final Block[] blocks = {BLOCK_HAND_GRINDSTONE, BLOCK_GRINDSTONE,
+                    BLOCK_MANUAL_CHOPPER, BLOCK_CHOPPER, BLOCK_CHOPPER_FILLER,
+                    BLOCK_PRESS, BLOCK_PRESS_FILLER,
+            };
 
             registry.registerAll(blocks);
         }
diff --git a/src/main/java/se/gory_moon/horsepower/jei/DummyJeiPlugin.java b/src/main/java/se/gory_moon/horsepower/jei/DummyJeiPlugin.java
diff --git a/src/main/java/se/gory_moon/horsepower/jei/HorsePowerPlugin.java b/src/main/java/se/gory_moon/horsepower/jei/HorsePowerPlugin.java
@@ -10,7 +10,6 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.oredict.OreDictionary;
 import se.gory_moon.horsepower.Configs;
-import se.gory_moon.horsepower.HorsePowerMod;
 import se.gory_moon.horsepower.blocks.ModBlocks;
 import se.gory_moon.horsepower.jei.chopping.ChoppingRecipeMaker;
 import se.gory_moon.horsepower.jei.chopping.ChoppingRecipeWrapper;
@@ -24,7 +23,7 @@
 import se.gory_moon.horsepower.recipes.*;
 
 @JEIPlugin
-public class HorsePowerPlugin implements IModPlugin, IJeiPlugin {
+public class HorsePowerPlugin implements IModPlugin {
 
     public static final String HAND_GRINDING = "horsepower.hand_grinding";
     public static final String GRINDING = "horsepower.grinding";
@@ -40,7 +39,7 @@ public class HorsePowerPlugin implements IModPlugin, IJeiPlugin {
 
     @Override
     public void register(IModRegistry registry) {
-        HorsePowerMod.jeiPlugin = this;
+
         jeiHelpers = registry.getJeiHelpers();
         guiHelper = jeiHelpers.getGuiHelper();
         craftingGridHelper = guiHelper.createCraftingGridHelper(1, 0);
@@ -125,57 +124,4 @@ public void registerCategories(IRecipeCategoryRegistration registry) {
         registry.addRecipeCategories(new HorsePowerPressCategory(registry.getJeiHelpers().getGuiHelper()));
     }
 
-    @Override
-    public void removeRecipe() {
-        if (Configs.recipes.useSeperateGrindstoneRecipes) {
-            for (GrindstoneRecipeWrapper recipe : GrindingRecipeMaker.getGrindstoneRecipes(jeiHelpers, true)) {
-                jeiRuntime.getRecipeRegistry().removeRecipe(recipe, HAND_GRINDING);
-            }
-        }
-
-        for (GrindstoneRecipeWrapper recipe: GrindingRecipeMaker.getGrindstoneRecipes(jeiHelpers, false)) {
-            jeiRuntime.getRecipeRegistry().removeRecipe(recipe, GRINDING);
-        }
-
-        if (Configs.recipes.useSeperateChoppingRecipes && Configs.general.enableHandChoppingBlock) {
-            for (ChoppingRecipeWrapper recipe : ChoppingRecipeMaker.getChoppingRecipes(jeiHelpers, true)) {
-                jeiRuntime.getRecipeRegistry().removeRecipe(recipe, MANUAL_CHOPPING);
-            }
-        }
-
-        for (ChoppingRecipeWrapper recipe: ChoppingRecipeMaker.getChoppingRecipes(jeiHelpers, false)) {
-            jeiRuntime.getRecipeRegistry().removeRecipe(recipe, CHOPPING);
-        }
-
-        for (PressRecipeWrapper recipe: PressRecipeMaker.getPressRecipes(jeiHelpers)) {
-            jeiRuntime.getRecipeRegistry().removeRecipe(recipe, PRESS);
-        }
-    }
-
-    @Override
-    public void addRecipes() {
-        if (Configs.recipes.useSeperateGrindstoneRecipes) {
-            for (GrindstoneRecipeWrapper recipe : GrindingRecipeMaker.getGrindstoneRecipes(jeiHelpers, true)) {
-                jeiRuntime.getRecipeRegistry().addRecipe(recipe, HAND_GRINDING);
-            }
-        }
-
-        for (GrindstoneRecipeWrapper recipe: GrindingRecipeMaker.getGrindstoneRecipes(jeiHelpers, false)) {
-            jeiRuntime.getRecipeRegistry().addRecipe(recipe, GRINDING);
-        }
-
-        if (Configs.recipes.useSeperateChoppingRecipes && Configs.general.enableHandChoppingBlock) {
-            for (ChoppingRecipeWrapper recipe : ChoppingRecipeMaker.getChoppingRecipes(jeiHelpers, true)) {
-                jeiRuntime.getRecipeRegistry().addRecipe(recipe, MANUAL_CHOPPING);
-            }
-        }
-
-        for (ChoppingRecipeWrapper recipe: ChoppingRecipeMaker.getChoppingRecipes(jeiHelpers, false)) {
-            jeiRuntime.getRecipeRegistry().addRecipe(recipe, CHOPPING);
-        }
-
-        for (PressRecipeWrapper recipe: PressRecipeMaker.getPressRecipes(jeiHelpers)) {
-            jeiRuntime.getRecipeRegistry().addRecipe(recipe, PRESS);
-        }
-    }
 }
diff --git a/src/main/java/se/gory_moon/horsepower/jei/IJeiPlugin.java b/src/main/java/se/gory_moon/horsepower/jei/IJeiPlugin.java
diff --git a/src/main/java/se/gory_moon/horsepower/recipes/HPRecipes.java b/src/main/java/se/gory_moon/horsepower/recipes/HPRecipes.java
@@ -42,7 +42,6 @@ public void reloadRecipes() {
     }
 
     public void reloadRecipes(List<String> grindstone, List<String> handGrindstone, List<String> chopping, List<String> manualChopping, List<String> press) {
-        HorsePowerMod.jeiPlugin.removeRecipe();
         grindstoneRecipes.clear();
         handgrindstoneRecipes.clear();
         choppingBlockRecipes.clear();
@@ -56,7 +55,6 @@ public void reloadRecipes(List<String> grindstone, List<String> handGrindstone,
         createRecipes(PressRecipe.class, press, false).forEach(this::addPressRecipe);
 
         HorsePowerMod.tweakerPlugin.applyTweaker();
-        HorsePowerMod.jeiPlugin.addRecipes();
     }
 
     private <T extends HPRecipeBase> List<T> createRecipes(Class<T> clazz, List<String> data, boolean requireTime) {
diff --git a/src/main/java/se/gory_moon/horsepower/tileentity/TileEntityHPHorseBase.java b/src/main/java/se/gory_moon/horsepower/tileentity/TileEntityHPHorseBase.java
@@ -96,7 +96,7 @@ public void setWorkerToPlayer(EntityPlayer player) {
         if (hasWorker() && worker.canBeLeashedTo(player)) {
             hasWorker = false;
             worker.detachHome();
-            worker.setLeashedToEntity(player, true);
+            worker.setLeashHolder(player, true);
             worker = null;
             nbtWorker = null;
         }
diff --git a/src/main/java/se/gory_moon/horsepower/util/color/ColorGetter.java b/src/main/java/se/gory_moon/horsepower/util/color/ColorGetter.java
@@ -65,7 +65,7 @@ private static List<Color> unsafeGetColors(ItemStack itemStack, int colorCount)
 
     private static List<Color> getItemColors(ItemStack itemStack, int colorCount) {
         final ItemColors itemColors = Minecraft.getMinecraft().getItemColors();
-        final int renderColor = itemColors.getColorFromItemstack(itemStack, 0);
+        final int renderColor = itemColors.colorMultiplier(itemStack, 0);
         final TextureAtlasSprite textureAtlasSprite = getTextureAtlasSprite(itemStack);
         if (textureAtlasSprite == null) {
             return Collections.emptyList();

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state,`
`143`	`143`	`for (Object entity : worldIn.getEntitiesWithinAABB(clazz, new AxisAlignedBB((double) x - 7.0D, (double) y - 7.0D, (double) z - 7.0D, (double) x + 7.0D, (double) y + 7.0D, (double) z + 7.0D))) {`
`144`	`144`	`if (entity instanceof EntityCreature) {`
`145`	`145`	`EntityCreature tmp = (EntityCreature) entity;`
`146`		`- if ((tmp.getLeashed() && tmp.getLeashedToEntity() == playerIn)) {`
	`146`	`+ if ((tmp.getLeashed() && tmp.getLeashHolder() == playerIn)) {`
`147`	`147`	`creature = tmp;`
`148`	`148`	`break search;`
`149`	`149`	`}`