update

Co-authored-by: boubou19 <[email protected]>

dependencies.gradle

@@ -2,21 +2,21 @@
 
 dependencies {
     api('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.16:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.42-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.5.15:dev")
+    compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.0:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.8-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.6.0:dev")
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39: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')
 
-    compileOnly('com.github.GTNewHorizons:waila:1.8.1:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-470-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.8.2:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-511-GTNH:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.49:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.14:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.0.3-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.26-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.36:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.0:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.0.5-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.16.0-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.1-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
@@ -24,5 +24,5 @@ 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-beta9:api') {transitive = false}
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta28:api') {transitive = false}
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

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

src/main/java/crazypants/enderio/conduit/ConduitRecipes.java

@@ -697,10 +697,6 @@ public class ConduitRecipes {
 
         res.stackSize = 1;
         ItemStack resDense = new ItemStack(EnderIO.itemMEConduit, 1, 1);
-        ItemStack resUltra = new ItemStack(EnderIO.itemMEConduit, 1, 2);
         addShaped(resDense, "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res);
-        if (Config.enableMEUltraDenseConduits) {
-            addShaped(resUltra, "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', resDense);
-        }
     }
 }

src/main/java/crazypants/enderio/conduit/me/IMEConduit.java

@@ -14,7 +14,5 @@ public interface IMEConduit extends IConduit {
 
     boolean isDense();
 
-    boolean isDenseUltra();
-
     int getChannelsInUse();
 }

src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java

@@ -15,8 +15,7 @@ public class ItemMEConduit extends AbstractItemConduit {
 
     private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
             new ItemConduitSubtype(ModObject.itemMEConduit.name(), "enderio:itemMeConduit"),
-            new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMeConduitDense"),
-            new ItemConduitSubtype(ModObject.itemMEConduit.name() + "DenseUltra", "enderio:itemMeConduitDenseUltra") };
+            new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMeConduitDense") };
 
     public static ItemMEConduit create() {
         ItemMEConduit result = new ItemMEConduit();

src/main/java/crazypants/enderio/conduit/me/MEConduit.java

@@ -16,7 +16,6 @@ import com.enderio.core.client.render.IconUtil;
 import com.enderio.core.common.util.BlockCoord;
 
 import appeng.api.AEApi;
-import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGridConnection;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
@@ -51,7 +50,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     public static IIcon[] longTextures;
 
     private boolean isDense;
-    private boolean isDenseUltra;
     private int playerID = -1;
 
     public MEConduit() {
@@ -59,7 +57,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     }
 
     public MEConduit(int itemDamage) {
-        isDenseUltra = itemDamage == 2;
         isDense = itemDamage == 1;
     }
 
@@ -68,16 +65,14 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
 
             @Override
             public void registerIcons(IIconRegister register) {
-                coreTextures = new IIcon[3];
-                longTextures = new IIcon[3];
+                coreTextures = new IIcon[2];
+                longTextures = new IIcon[2];
 
                 coreTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCore");
                 coreTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCoreDense");
-                coreTextures[2] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCoreDenseUltra");
 
                 longTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduit");
                 longTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitDense");
-                longTextures[2] = register.registerIcon(EnderIO.DOMAIN + ":meConduitDenseUltra");
             }
 
             @Override
@@ -87,10 +82,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
         });
     }
 
-    public static int getDamageForState(boolean isDense, boolean isDenseUltra) {
-        if (isDenseUltra) {
-            return 2;
-        }
+    public static int getDamageForState(boolean isDense) {
         if (isDense) {
             return 1;
         }
@@ -104,7 +96,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
 
     @Override
     public ItemStack createItem() {
-        return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense, isDenseUltra));
+        return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense));
     }
 
     @Override
@@ -122,7 +114,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     public void writeToNBT(NBTTagCompound nbtRoot) {
         super.writeToNBT(nbtRoot);
         nbtRoot.setBoolean("isDense", isDense);
-        nbtRoot.setBoolean("isDenseUltra", isDenseUltra);
         nbtRoot.setInteger("playerID", playerID);
     }
 
@@ -135,9 +126,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
         } else {
             playerID = -1;
         }
-        if (nbtRoot.hasKey("isDenseUltra")) {
-            isDenseUltra = nbtRoot.getBoolean("isDenseUltra");
-        }
     }
 
     public void setPlayerID(int playerID) {
@@ -208,22 +196,12 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
 
     @Method(modid = "appliedenergistics2")
     private Boolean canConnectToGridNode(IGridNode node, ForgeDirection dir) {
-        if (node.getGridBlock().getConnectableSides().contains(dir.getOpposite())) {
-            if (isDenseUltra()) {
-                return node.hasFlag(GridFlags.ULTRA_DENSE_CAPACITY)
-                        || ((node.hasFlag(GridFlags.DENSE_CAPACITY)) && !node.hasFlag(GridFlags.CANNOT_CARRY));
-            } else if (isDense()) {
-                return true;
-            } else {
-                return !node.hasFlag(GridFlags.ULTRA_DENSE_CAPACITY);
-            }
-        }
-        return false;
+        return node.getGridBlock().getConnectableSides().contains(dir.getOpposite());
     }
 
     @Override
     public IIcon getTextureForState(CollidableComponent component) {
-        int state = getDamageForState(isDense, isDenseUltra);
+        int state = getDamageForState(isDense);
         if (component.dir == ForgeDirection.UNKNOWN) {
             return coreTextures[state];
         } else {
@@ -400,9 +378,4 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
     public boolean isDense() {
         return isDense;
     }
-
-    @Override
-    public boolean isDenseUltra() {
-        return isDenseUltra;
-    }
 }

src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java

@@ -43,9 +43,6 @@ public class MEConduitGrid implements IGridBlock {
 
     @Override
     public EnumSet<GridFlags> getFlags() {
-        if (conduit.isDenseUltra()) {
-            return EnumSet.of(GridFlags.ULTRA_DENSE_CAPACITY);
-        }
         if (conduit.isDense()) {
             return EnumSet.of(GridFlags.DENSE_CAPACITY);
         }

src/main/java/crazypants/enderio/config/Config.java

@@ -475,7 +475,6 @@ public final class Config {
 
     public static boolean isGasConduitEnabled = true;
     public static boolean enableMEConduits = true;
-    public static boolean enableMEUltraDenseConduits = false;
     public static boolean enableOCConduits = true;
     public static boolean enableOCConduitsAnimatedTexture = true;
 
@@ -2415,11 +2414,6 @@ public final class Config {
                 sectionItems.name,
                 enableMEConduits,
                 "Allows ME conduits. Only has an effect with AE2 installed.");
-        enableMEUltraDenseConduits = config.getBoolean(
-                "enableMEUltraDenseConduits",
-                sectionItems.name,
-                enableMEUltraDenseConduits,
-                "Allows ME Ultra Dense conduits. Only has an effect with AE2 installed.");
         enableOCConduits = config.getBoolean(
                 "enableOCConduits",
                 sectionItems.name,

src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java

@@ -168,7 +168,8 @@ public abstract class AbstractMachineEntity extends TileEntityEio
     public final boolean isItemValidForSlot(int i, ItemStack itemstack) {
         if (slotDefinition.isUpgradeSlot(i)) {
             return itemstack != null && itemstack.getItem() == EnderIO.itemBasicCapacitor
-                    && itemstack.getItemDamage() > 0;
+                    && itemstack.getItemDamage() > 0
+                    && itemstack.getItemDamage() != 7;
         }
         return isMachineItemValidForSlot(i, itemstack);
     }

src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java

@@ -40,6 +40,11 @@ public class TileZombieGenerator extends AbstractGeneratorEntity
         public String getMachineName() {
             return ModObject.blockFrankenzombieGenerator.unlocalisedName;
         }
+
+        @Override
+        public GeneratorType getGeneratorType() {
+            return GeneratorType.FRANKENZOMBIE;
+        }
     }
 
     public static class TileEnderGenerator extends TileZombieGenerator {
@@ -58,6 +63,11 @@ public class TileZombieGenerator extends AbstractGeneratorEntity
         protected Fluid getFluidType() {
             return EnderIO.fluidEnderDistillation;
         }
+
+        @Override
+        public GeneratorType getGeneratorType() {
+            return GeneratorType.ENDER;
+        }
     }
 
     private static int IO_MB_TICK = 250;
@@ -326,7 +336,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity
     }
 
     public GeneratorType getGeneratorType() {
-        return ((BlockZombieGenerator) worldObj.getBlock(xCoord, yCoord, zCoord)).getGeneratorType();
+        return GeneratorType.ZOMBIE;
     }
 
     public int getOutputPerTick() {

src/main/java/crazypants/enderio/machine/light/BlockLightNode.java

@@ -5,6 +5,7 @@ import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
@@ -56,9 +57,10 @@ public class BlockLightNode extends BlockEio {
 
     @Override
     public void breakBlock(World world, int x, int y, int z, Block par5, int par6) {
-        TileLightNode te = (TileLightNode) world.getTileEntity(x, y, z);
-        if (te != null) {
-            te.onBlockRemoved();
+        TileEntity te = world.getTileEntity(x, y, z);
+        if (te instanceof TileLightNode) {
+            TileLightNode light = (TileLightNode) te;
+            light.onBlockRemoved();
         }
     }
 

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

@@ -103,7 +103,7 @@ public class ItemCapacitor extends Item implements ICapacitorItem {
     @Override
     @SideOnly(Side.CLIENT)
     public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
-        if (par1ItemStack != null && par1ItemStack.getItemDamage() > 0) {
+        if (par1ItemStack != null && par1ItemStack.getItemDamage() > 0 && par1ItemStack.getItemDamage() != 7) {
             par3List.add(EnderIO.lang.localize("machine.tooltip.upgrade"));
             if (SpecialTooltipHandler.showAdvancedTooltips()) {
                 SpecialTooltipHandler.addDetailedTooltipFromResources(par3List, "enderio.machine.tooltip.upgrade");

src/main/java/crazypants/enderio/waila/WailaCompat.java

@@ -344,14 +344,13 @@ public class WailaCompat implements IWailaDataProvider {
         } else if (itemStack.getItem() == EnderIO.itemMEConduit) {
             NBTTagCompound nbtRoot = accessor.getNBTData();
             if (nbtRoot.hasKey("isDense")) {
-                boolean isDenseUltra = nbtRoot.getBoolean("isDenseUltra");
                 boolean isDense = nbtRoot.getBoolean("isDense");
                 int channelsInUse = nbtRoot.getInteger("channelsInUse");
                 currenttip.add(
                         MessageFormat.format(
                                 EnderIO.lang.localize("itemMEConduit.channelsUsed"),
                                 channelsInUse,
-                                isDenseUltra ? 128 : (isDense ? 32 : 8)));
+                                isDense ? 32 : 8));
             }
         }
     }
@@ -387,7 +386,6 @@ public class WailaCompat implements IWailaDataProvider {
             if (mec != null) {
                 tag.setInteger("channelsInUse", mec.getChannelsInUse());
                 tag.setBoolean("isDense", mec.isDense());
-                tag.setBoolean("isDenseUltra", mec.isDenseUltra());
             }
         } else if (te instanceof IInternalPoweredTile) {
             IInternalPoweredTile ipte = (IInternalPoweredTile) te;

src/main/resources/assets/enderio/lang/de_DE.lang

@@ -130,7 +130,6 @@ enderio.itemGasConduit.tooltip.detailed.line1=Transportiert Mekanism-kompatible
 
 enderio.itemMEConduit.name=ME-Leitung
 enderio.itemMEConduitDense.name=Dichte ME-Leitung
-enderio.itemMEConduitDenseUltra.name=Extrem Dichte ME-Leitungen
 enderio.itemMEConduit.channelsUsed={0,number} von {1,number} Kanälen
 
 enderio.itemOCConduit.name=Netzwerkleitung (OC)

src/main/resources/assets/enderio/lang/en_US.lang

@@ -136,7 +136,6 @@ enderio.itemGasConduit.tooltip.detailed.line1=Transfers Mekanism-compatible gase
 
 enderio.itemMEConduit.name=ME Conduit
 enderio.itemMEConduitDense.name=Dense ME Conduit
-enderio.itemMEConduitDenseUltra.name=Ultra Dense ME Conduit
 enderio.itemMEConduit.channelsUsed={0,number} of {1,number} Channels
 
 enderio.itemOCConduit.name=Network Conduit (OC)