update 2.8.x deps and change to boubles expanded

Co-authored-by: Martin Robertz <[email protected]>

dependencies.gradle

@@ -3,22 +3,22 @@
 dependencies {
     api('com.github.GTNewHorizons:EnderCore:0.4.8:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.90-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.6.39:dev")
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.91-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.6.40:dev")
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
     api("com.github.GTNewHorizons:TinkersConstruct:1.13.54-GTNH:dev")
 
     compileOnly('com.github.GTNewHorizons:waila:1.8.14:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-689-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.464:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.18-1.7.10:dev") {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-691-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.16-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.474:dev') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.10-1.7.10:dev") {transitive = false}
     compileOnly('com.github.GTNewHorizons:Railcraft:9.16.33:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.7-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.16.13-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.19-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.9-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.16.14-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.20-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
@@ -26,5 +26,6 @@ dependencies {
     compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
     compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
 
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta56:api') {transitive = false}
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta62:api') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.3:dev")
 }

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.44'
 }
 
 

src/main/java/crazypants/enderio/EnderIO.java

@@ -213,6 +213,7 @@ public class EnderIO {
 
     public static final boolean hasLwjgl3 = Loader.isModLoaded("lwjgl3ify");
     public static final boolean hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi");
+    public static final boolean hasHP = Loader.isModLoaded("hodgepodge");
 
     // Materials
     public static ItemCapacitor itemBasicCapacitor;
@@ -486,7 +487,9 @@ public class EnderIO {
         itemGrindingBall = ItemGrindingBall.create();
         itemAlloyEndergy = ItemAlloyEndergy.create();
         itemGrindingBallEndergy = ItemGrindingBallEndergy.create();
-        itemPowderIngot = ItemPowderIngot.create();
+        if (!hasGT5) {
+            itemPowderIngot = ItemPowderIngot.create();
+        }
 
         registerFluids();
 
@@ -726,7 +729,9 @@ public class EnderIO {
             SkeletonHandler.registerSkeleton(this);
         }
 
-        MaterialRecipes.registerDependantOresInDictionary();
+        if (!hasGT5) {
+            MaterialRecipes.registerDependantOresInDictionary();
+        }
 
         EnderfaceRecipes.addRecipes();
         MaterialRecipes.addRecipes();

src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java

@@ -17,7 +17,9 @@ import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
+import com.mitchej123.hodgepodge.mixins.interfaces.INetherSeed;
 
+import crazypants.enderio.EnderIO;
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public class PlantableFarmer implements IFarmerJoe {
@@ -109,7 +111,13 @@ public class PlantableFarmer implements IFarmerJoe {
 
     protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc, IPlantable plantable) {
         worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2);
-        Block target = plantable.getPlant(null, 0, 0, 0);
+        Block target;
+        // needed for Pam's nether seeds
+        if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
+            target = netherSeed.hodgepodge$getPlant(null, 0, 0, 0);
+        } else {
+            target = plantable.getPlant(null, 0, 0, 0);
+        }
         int meta = plantable.getPlantMetadata(null, 0, 0, 0);
         worldObj.setBlock(bc.x, bc.y, bc.z, target, meta, 1 | 2);
         farm.actionPerformed(false);
@@ -117,7 +125,13 @@ public class PlantableFarmer implements IFarmerJoe {
     }
 
     protected boolean canPlant(World worldObj, BlockCoord bc, IPlantable plantable) {
-        Block target = plantable.getPlant(null, 0, 0, 0);
+        Block target;
+        // needed for Pam's nether seeds
+        if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
+            target = netherSeed.hodgepodge$getPlant(null, 0, 0, 0);
+        } else {
+            target = plantable.getPlant(null, 0, 0, 0);
+        }
         Block ground = worldObj.getBlock(bc.x, bc.y - 1, bc.z);
         if (target != null && target.canPlaceBlockAt(worldObj, bc.x, bc.y, bc.z)
                 && target.canBlockStay(worldObj, bc.x, bc.y, bc.z)
@@ -182,10 +196,14 @@ public class PlantableFarmer implements IFarmerJoe {
     }
 
     private boolean isPlantableForBlock(ItemStack stack, Block block) {
-        if (!(stack.getItem() instanceof IPlantable)) {
-            return false;
+        if (stack.getItem() instanceof IPlantable plantable) {
+            // needed for Pam's nether seeds
+            if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
+                return netherSeed.hodgepodge$getPlant(null, 0, 0, 0) == block;
+            } else {
+                return plantable.getPlant(null, 0, 0, 0) == block;
+            }
         }
-        IPlantable plantable = (IPlantable) stack.getItem();
-        return plantable.getPlant(null, 0, 0, 0) == block;
+        return false;
     }
 }

src/main/java/crazypants/enderio/material/MaterialRecipes.java

@@ -1,5 +1,6 @@
 package crazypants.enderio.material;
 
+import static crazypants.enderio.EnderIO.hasGT5;
 import static crazypants.enderio.material.Alloy.DARK_STEEL;
 import static crazypants.enderio.material.Alloy.END_STEEL;
 import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
@@ -58,10 +59,13 @@ public class MaterialRecipes {
 
     public static void registerOresInDictionary() {
         // Ore Dictionary Registration
-        for (PowderIngot powder : PowderIngot.values()) {
-            if (!powder.hasDependancy()) {
-                OreDictionary
-                        .registerOre(powder.oreDictName, new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal()));
+        if (!hasGT5) {
+            for (PowderIngot powder : PowderIngot.values()) {
+                if (!powder.hasDependancy()) {
+                    OreDictionary.registerOre(
+                            powder.oreDictName,
+                            new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal()));
+                }
             }
         }
 
@@ -431,17 +435,19 @@ public class MaterialRecipes {
         RecipeUtil.addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald");
 
         // Smelting
-        ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
-        ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal());
-        ItemStack ingotIron = new ItemStack(Items.iron_ingot);
-        ItemStack ingotGold = new ItemStack(Items.gold_ingot);
+        if (!hasGT5) {
+            ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
+            ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal());
+            ItemStack ingotIron = new ItemStack(Items.iron_ingot);
+            ItemStack ingotGold = new ItemStack(Items.gold_ingot);
 
-        GameRegistry.addSmelting(dustIron, ingotIron, 0);
-        GameRegistry.addSmelting(dustGold, ingotGold, 0);
+            GameRegistry.addSmelting(dustIron, ingotIron, 0);
+            GameRegistry.addSmelting(dustGold, ingotGold, 0);
 
-        // Ender Dusts
-        ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal());
-        RecipeUtil.addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust);
+            // Ender Dusts
+            ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal());
+            RecipeUtil.addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust);
+        }
 
         // Dark Iron Bars
         ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0);
@@ -564,24 +570,29 @@ public class MaterialRecipes {
         ItemStack darkRod = new ItemStack(EnderIO.itemMaterial, 1, Material.DARK_STEEL_ROD.ordinal());
         RecipeUtil.addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel, 'n', endSteelNugget);
 
-        // Food
-        ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal());
-        ItemStack bread = new ItemStack(Items.bread, 1, 0);
+        if (!hasGT5) {
+            // Food
+            ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal());
+            ItemStack bread = new ItemStack(Items.bread, 1, 0);
 
-        GameRegistry.addSmelting(flour, bread, 0.35f);
+            GameRegistry.addSmelting(flour, bread, 0.35f);
+        }
 
         ItemStack enderios = EnderFood.ENDERIOS.getStack();
         RecipeUtil.addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl");
 
-        if (OreDictionaryHelper.hasCopper()) {
-            ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal());
-            ItemStack ingotCoppper = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_COPPER);
-            GameRegistry.addSmelting(dustCopper, ingotCoppper, 0);
-        }
-        if (OreDictionaryHelper.hasTin()) {
-            ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal());
-            ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN);
-            GameRegistry.addSmelting(dustTin, ingotTin, 0);
+        if (!hasGT5) {
+            if (OreDictionaryHelper.hasCopper()) {
+                ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal());
+                ItemStack ingotCoppper = OreDictionaryPreferences.instance
+                        .getPreferred(OreDictionaryHelper.INGOT_COPPER);
+                GameRegistry.addSmelting(dustCopper, ingotCoppper, 0);
+            }
+            if (OreDictionaryHelper.hasTin()) {
+                ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal());
+                ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN);
+                GameRegistry.addSmelting(dustTin, ingotTin, 0);
+            }
         }
     }
 }

src/main/java/crazypants/util/EE3Util.java

@@ -1,5 +1,6 @@
 package crazypants.util;
 
+import static crazypants.enderio.EnderIO.hasGT5;
 import static crazypants.enderio.material.Material.BINDER_COMPOSITE;
 import static crazypants.enderio.material.Material.CONDUIT_BINDER;
 import static crazypants.enderio.material.Material.PHASED_IRON_NUGGET;
@@ -9,6 +10,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -20,6 +22,7 @@ import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
 import com.pahimar.ee3.api.exchange.RecipeRegistryProxy;
 
 import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.registry.GameRegistry;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.item.ItemEnderFood.EnderFood;
@@ -93,47 +96,59 @@ public class EE3Util {
      */
     public static void registerMiscRecipes() {
         if (IS_EE3_LOADED) {
-            ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal());
-            ItemStack stick4 = new ItemStack(Items.stick, 4);
-            ItemStack cobble4 = new ItemStack(Blocks.cobblestone, 4);
-            registerRecipe(basicGear, stick4, cobble4);
-
-            ItemStack flour10 = new ItemStack(EnderIO.itemPowderIngot, 10, PowderIngot.FLOUR.ordinal());
-            ItemStack wheat5 = new ItemStack(Items.wheat, 5);
-            ItemStack seeds1 = new ItemStack(Items.wheat_seeds, 1);
-            registerRecipe(flour10, wheat5, seeds1);
+            if (!hasGT5) {
+                ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal());
+                ItemStack stick4 = new ItemStack(Items.stick, 4);
+                ItemStack cobble4 = new ItemStack(Blocks.cobblestone, 4);
+                registerRecipe(basicGear, stick4, cobble4);
+                ItemStack flour10 = new ItemStack(EnderIO.itemPowderIngot, 10, PowderIngot.FLOUR.ordinal());
+                ItemStack wheat5 = new ItemStack(Items.wheat, 5);
+                ItemStack seeds1 = new ItemStack(Items.wheat_seeds, 1);
+                registerRecipe(flour10, wheat5, seeds1);
+            }
 
             ItemStack enderios = EnderFood.ENDERIOS.getStack();
             ItemStack bowl = new ItemStack(Items.bowl, 1);
             ItemStack wheat = new ItemStack(Items.wheat, 1);
             ItemStack milkb = new ItemStack(Items.milk_bucket, 1);
             FluidStack milk = FluidContainerRegistry.getFluidForFilledItem(milkb);
-            ItemStack dustEnderPearl = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal());
+            ItemStack dustEnderPearl;
+            if (hasGT5) {
+                dustEnderPearl = GameRegistry.findItemStack("gregtech", "gt.metaitem.01", 1);
+                Items.feather.setDamage(Objects.requireNonNull(dustEnderPearl), 2532);
+            } else {
+                dustEnderPearl = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal());
+            }
             if (milk != null) {
                 registerRecipe(enderios, bowl, milk, wheat, dustEnderPearl);
             } else {
                 registerRecipe(enderios, bowl, milkb, wheat, dustEnderPearl);
             }
 
-            ItemStack dustCoal = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal());
-            ItemStack coal = new ItemStack(Items.coal, 1);
-            registerRecipe(dustCoal, coal);
+            if (!hasGT5) {
+                ItemStack dustCoal = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal());
+                ItemStack coal = new ItemStack(Items.coal, 1);
+                registerRecipe(dustCoal, coal);
 
-            ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
-            ItemStack iron = new ItemStack(Items.iron_ingot, 1);
-            registerRecipe(dustIron, iron);
+                ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
+                ItemStack iron = new ItemStack(Items.iron_ingot, 1);
+                registerRecipe(dustIron, iron);
 
-            ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal());
-            ItemStack gold = new ItemStack(Items.gold_ingot, 1);
-            registerRecipe(dustGold, gold);
+                ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal());
+                ItemStack gold = new ItemStack(Items.gold_ingot, 1);
+                registerRecipe(dustGold, gold);
 
-            ItemStack dustObsidian4 = new ItemStack(EnderIO.itemPowderIngot, 4, PowderIngot.POWDER_OBSIDIAN.ordinal());
-            ItemStack obsidian = new ItemStack(Blocks.obsidian, 1);
-            registerRecipe(dustObsidian4, obsidian);
+                ItemStack dustObsidian4 = new ItemStack(
+                        EnderIO.itemPowderIngot,
+                        4,
+                        PowderIngot.POWDER_OBSIDIAN.ordinal());
+                ItemStack obsidian = new ItemStack(Blocks.obsidian, 1);
+                registerRecipe(dustObsidian4, obsidian);
 
-            ItemStack enderDust9 = new ItemStack(EnderIO.itemPowderIngot, 9, PowderIngot.POWDER_ENDER.ordinal());
-            ItemStack enderPearl = new ItemStack(Items.ender_pearl);
-            registerRecipe(enderDust9, enderPearl);
+                ItemStack enderDust9 = new ItemStack(EnderIO.itemPowderIngot, 9, PowderIngot.POWDER_ENDER.ordinal());
+                ItemStack enderPearl = new ItemStack(Items.ender_pearl);
+                registerRecipe(enderDust9, enderPearl);
+            }
 
             ItemStack cbc8 = BINDER_COMPOSITE.getStack(8);
             ItemStack sand2 = new ItemStack(Blocks.sand, 2);