From 0f74be83ac77a8b33162c36caba1b16480e531f9 Mon Sep 17 00:00:00 2001 From: RubilaxXxx <162358670+RubilaxXxx@users.noreply.github.com> Date: Tue, 8 Apr 2025 23:17:25 +0200 Subject: [PATCH] cleanse the mod of its ae2 dep. (#51) --- dependencies.gradle | 14 +++-- gradle.properties | 2 +- settings.gradle | 2 +- .../common/block/tile/TileAspectAnalyzer.java | 5 +- .../tinkerer/common/block/tile/TileCamo.java | 4 ++ .../common/block/tile/TileEnchanter.java | 4 ++ .../block/tile/TileEntityMobilizer.java | 51 ++++++++----------- .../common/block/tile/TileEntityRelay.java | 4 ++ .../common/block/tile/TileFunnel.java | 4 ++ .../common/block/tile/TileMagnet.java | 5 +- .../common/block/tile/TileMobMagnet.java | 3 ++ .../common/block/tile/TileRepairer.java | 5 +- .../tile/tablet/TileAnimationTablet.java | 5 +- .../transvector/TileTransvectorInterface.java | 10 ++-- 14 files changed, 70 insertions(+), 48 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 7b673abd..6a3a4529 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,23 +1,21 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:Baubles:1.0.4:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-554-GTNH:api') - + api('com.github.GTNewHorizons:Baubles-Expanded:2.1.6-GTNH:dev') api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-576-GTNH:api') compileOnly('com.github.GTNewHorizons:Botania:1.12.6-GTNH:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:EnderIO:2.9.4:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:EnderIO:2.9.6:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:EnderStorage:1.7.2:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:waila:1.8.4:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.13.10-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.13.16-GTNH:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.10-GTNH:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:CodeChickenCore:1.4.1:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.12-GTNH:api') {transitive=false} compileOnly('curse.maven:computercraft-67504:2269339') - compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:cofh-core-69162:2388751') compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:api') {transitive=false} } diff --git a/gradle.properties b/gradle.properties index 849e42a3..ea2e9769 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ modId = ThaumicTinkerer modGroup = thaumic.tinkerer # Whether to use modGroup as the maven publishing group. -# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods. +# When false, com.github.GTNewHorizons is used. useModGroupForPublishing = false # Updates your build.gradle and settings.gradle automatically whenever an update is available. diff --git a/settings.gradle b/settings.gradle index 40fb369e..ff436f2c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.37' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38' } diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/TileAspectAnalyzer.java b/src/main/java/thaumic/tinkerer/common/block/tile/TileAspectAnalyzer.java index 32e2390b..c00df817 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/TileAspectAnalyzer.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/TileAspectAnalyzer.java @@ -37,7 +37,8 @@ import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager; import thaumic.tinkerer.common.lib.LibBlockNames; @Optional.InterfaceList({ @Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers"), - @Optional.Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft") }) + @Optional.Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft"), + @Optional.Interface(iface = "appeng.api.movable.IMovableTile", modid = "appliedenergistics2") }) public class TileAspectAnalyzer extends TileEntity implements IInventory, SimpleComponent, IPeripheral, IMovableTile { ItemStack[] inventorySlots = new ItemStack[1]; @@ -230,11 +231,13 @@ public class TileAspectAnalyzer extends TileEntity implements IInventory, Simple } @Override + @Optional.Method(modid = "appliedenergistics2") public boolean prepareToMove() { return true; } @Override + @Optional.Method(modid = "appliedenergistics2") public void doneMoving() {} @Override diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/TileCamo.java b/src/main/java/thaumic/tinkerer/common/block/tile/TileCamo.java index ab67e4db..a3d0ee44 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/TileCamo.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/TileCamo.java @@ -18,7 +18,9 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import appeng.api.movable.IMovableTile; +import cpw.mods.fml.common.Optional; +@Optional.Interface(iface = "appeng.api.movable.IMovableTile", modid = "appliedenergistics2") public class TileCamo extends TileEntity implements IMovableTile { private static final String TAG_CAMO = "camo"; @@ -73,10 +75,12 @@ public class TileCamo extends TileEntity implements IMovableTile { } @Override + @Optional.Method(modid = "appliedenergistics2") public boolean prepareToMove() { return true; } @Override + @Optional.Method(modid = "appliedenergistics2") public void doneMoving() {} } diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/TileEnchanter.java b/src/main/java/thaumic/tinkerer/common/block/tile/TileEnchanter.java index 42c42991..1fdd8c51 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/TileEnchanter.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/TileEnchanter.java @@ -30,6 +30,7 @@ import org.apache.commons.lang3.ArrayUtils; import appeng.api.movable.IMovableTile; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -41,6 +42,7 @@ import thaumic.tinkerer.common.enchantment.core.EnchantmentManager; import thaumic.tinkerer.common.lib.LibBlockNames; import thaumic.tinkerer.common.lib.LibFeatures; +@Optional.Interface(iface = "appeng.api.movable.IMovableTile", modid = "appliedenergistics2") public class TileEnchanter extends TileEntity implements ISidedInventory, IMovableTile { private static final String TAG_ENCHANTS = "enchantsIntArray"; @@ -494,10 +496,12 @@ public class TileEnchanter extends TileEntity implements ISidedInventory, IMovab } @Override + @Optional.Method(modid = "appliedenergistics2") public boolean prepareToMove() { return true; } @Override + @Optional.Method(modid = "appliedenergistics2") public void doneMoving() {} } diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/TileEntityMobilizer.java b/src/main/java/thaumic/tinkerer/common/block/tile/TileEntityMobilizer.java index 12162c08..2f63c1a7 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/TileEntityMobilizer.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/TileEntityMobilizer.java @@ -8,7 +8,7 @@ import net.minecraftforge.common.util.ForgeDirection; import appeng.api.AEApi; import appeng.api.IAppEngApi; -import appeng.api.movable.IMovableTile; +import cpw.mods.fml.common.Loader; import thaumic.tinkerer.common.ThaumicTinkerer; import thaumic.tinkerer.common.block.mobilizer.BlockMobilizer; @@ -117,16 +117,13 @@ public class TileEntityMobilizer extends TileEntity { if (!worldObj.isRemote) { TileEntity passenger = worldObj.getTileEntity(xCoord, yCoord + 1, zCoord); - IAppEngApi api = AEApi.instance(); // Prevent the passenger from popping off. Not sent to clients. worldObj.setBlock(targetX, yCoord, targetZ, Block.getBlockFromName("stone"), 0, 0); // Move non-TE blocks Block passengerId = worldObj.getBlock(xCoord, yCoord + 1, zCoord); - if (worldObj.isAirBlock(xCoord, yCoord + 1, zCoord) || passengerId.canPlaceBlockAt(worldObj, targetX, yCoord + 1, targetZ)) { - if (passenger == null) { if (passengerId != Block.getBlockFromName("bedrock") && passengerId != Block.getBlockFromName("")) { @@ -143,7 +140,8 @@ public class TileEntityMobilizer extends TileEntity { } } // If AE is installed, use its handler - } else if (api != null) { + } else if (Loader.isModLoaded("appliedenergistics2")) { + IAppEngApi api = AEApi.instance(); if (api.registries().movable().askToMove(passenger)) { worldObj.setBlock( targetX, @@ -159,34 +157,29 @@ public class TileEntityMobilizer extends TileEntity { api.registries().movable().doneMoving(passenger); passenger.validate(); } - // Handler IMovableTiles and vanilla TEs without AE - } else if (passenger instanceof IMovableTile - || passenger.getClass().getName().startsWith("net.minecraft.tileentity")) { - boolean imovable = passenger instanceof IMovableTile; - if (imovable) ((IMovableTile) passenger).prepareToMove(); - worldObj.setBlock( - targetX, - yCoord + 1, - targetZ, - worldObj.getBlock(xCoord, yCoord + 1, zCoord), - worldObj.getBlockMetadata(xCoord, yCoord + 1, zCoord), - 3); - passenger.invalidate(); - worldObj.setBlockToAir(xCoord, yCoord + 1, zCoord); + } else if (passenger.getClass().getName().startsWith("net.minecraft.tileentity")) { + worldObj.setBlock( + targetX, + yCoord + 1, + targetZ, + worldObj.getBlock(xCoord, yCoord + 1, zCoord), + worldObj.getBlockMetadata(xCoord, yCoord + 1, zCoord), + 3); + passenger.invalidate(); + worldObj.setBlockToAir(xCoord, yCoord + 1, zCoord); - // IMovableHandler default code - Chunk c = worldObj.getChunkFromBlockCoords(targetX, targetZ); + // IMovableHandler default code + Chunk c = worldObj.getChunkFromBlockCoords(targetX, targetZ); - c.func_150812_a(targetX & 0xF, yCoord + 1, targetZ & 0xF, passenger); + c.func_150812_a(targetX & 0xF, yCoord + 1, targetZ & 0xF, passenger); - if (c.isChunkLoaded) { - worldObj.addTileEntity(passenger); - worldObj.markBlockForUpdate(targetX, yCoord + 1, targetZ); - } - if (imovable) ((IMovableTile) passenger).doneMoving(); - passenger.validate(); - } + if (c.isChunkLoaded) { + worldObj.addTileEntity(passenger); + worldObj.markBlockForUpdate(targetX, yCoord + 1, targetZ); + } + passenger.validate(); + } } // Move self this.invalidate(); diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/TileEntityRelay.java b/src/main/java/thaumic/tinkerer/common/block/tile/TileEntityRelay.java index 25ee0a95..c205615a 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/TileEntityRelay.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/TileEntityRelay.java @@ -5,8 +5,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import appeng.api.movable.IMovableTile; +import cpw.mods.fml.common.Optional; import thaumic.tinkerer.common.ThaumicTinkerer; +@Optional.Interface(iface = "appeng.api.movable.IMovableTile", modid = "appliedenergistics2") public class TileEntityRelay extends TileEntity implements IMovableTile { public boolean hasPartner; @@ -137,10 +139,12 @@ public class TileEntityRelay extends TileEntity implements IMovableTile { } @Override + @Optional.Method(modid = "appliedenergistics2") public boolean prepareToMove() { return true; } @Override + @Optional.Method(modid = "appliedenergistics2") public void doneMoving() {} } diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/TileFunnel.java b/src/main/java/thaumic/tinkerer/common/block/tile/TileFunnel.java index fb83eb2c..1098c5d0 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/TileFunnel.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/TileFunnel.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import appeng.api.movable.IMovableTile; +import cpw.mods.fml.common.Optional; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; @@ -36,6 +37,7 @@ import thaumcraft.common.tiles.TileJarFillable; import thaumcraft.common.tiles.TileJarFillableVoid; import thaumic.tinkerer.common.lib.LibBlockNames; +@Optional.Interface(iface = "appeng.api.movable.IMovableTile", modid = "appliedenergistics2") public class TileFunnel extends TileEntity implements ISidedInventory, IAspectContainer, IMovableTile { ItemStack[] inventorySlots = new ItemStack[1]; @@ -290,10 +292,12 @@ public class TileFunnel extends TileEntity implements ISidedInventory, IAspectCo } @Override + @Optional.Method(modid = "appliedenergistics2") public boolean prepareToMove() { return true; } @Override + @Optional.Method(modid = "appliedenergistics2") public void doneMoving() {} } diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/TileMagnet.java b/src/main/java/thaumic/tinkerer/common/block/tile/TileMagnet.java index ef0dacae..5ac11e80 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/TileMagnet.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/TileMagnet.java @@ -34,7 +34,8 @@ import thaumic.tinkerer.common.ThaumicTinkerer; import thaumic.tinkerer.common.core.helper.MiscHelper; @Optional.InterfaceList({ @Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers"), - @Optional.Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft") }) + @Optional.Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft"), + @Optional.Interface(iface = "appeng.api.movable.IMovableTile", modid = "appliedenergistics2") }) public class TileMagnet extends TileEntity implements IPeripheral, IMovableTile, SimpleComponent { @Override @@ -146,11 +147,13 @@ public class TileMagnet extends TileEntity implements IPeripheral, IMovableTile, } @Override + @Optional.Method(modid = "appliedenergistics2") public boolean prepareToMove() { return true; } @Override + @Optional.Method(modid = "appliedenergistics2") public void doneMoving() {} @Callback(doc = "function():boolean -- Returns Whether magnet is pushing or pulling") diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/TileMobMagnet.java b/src/main/java/thaumic/tinkerer/common/block/tile/TileMobMagnet.java index 3e781684..aec941a4 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/TileMobMagnet.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/TileMobMagnet.java @@ -34,6 +34,7 @@ import li.cil.oc.api.machine.Context; import thaumic.tinkerer.common.item.ItemSoulMould; import thaumic.tinkerer.common.lib.LibBlockNames; +@Optional.Interface(iface = "appeng.api.movable.IMovableTile", modid = "appliedenergistics2") public class TileMobMagnet extends TileMagnet implements IInventory, IMovableTile { private static final String TAG_ADULT = "adultCheck"; @@ -230,10 +231,12 @@ public class TileMobMagnet extends TileMagnet implements IInventory, IMovableTil } @Override + @Optional.Method(modid = "appliedenergistics2") public boolean prepareToMove() { return true; } @Override + @Optional.Method(modid = "appliedenergistics2") public void doneMoving() {} } diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/TileRepairer.java b/src/main/java/thaumic/tinkerer/common/block/tile/TileRepairer.java index 040845be..2d4e098f 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/TileRepairer.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/TileRepairer.java @@ -27,6 +27,7 @@ import net.minecraftforge.common.util.ForgeDirection; import appeng.api.movable.IMovableTile; import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -38,7 +39,7 @@ import thaumic.tinkerer.common.core.handler.ConfigHandler; import thaumic.tinkerer.common.lib.LibBlockNames; /* import thaumic.tinkerer.common.compat.TinkersConstructCompat; */ - +@Optional.Interface(iface = "appeng.api.movable.IMovableTile", modid = "appliedenergistics2") public class TileRepairer extends TileEntity implements ISidedInventory, IAspectContainer, IEssentiaTransport, IMovableTile { @@ -376,10 +377,12 @@ public class TileRepairer extends TileEntity } @Override + @Optional.Method(modid = "appliedenergistics2") public boolean prepareToMove() { return true; } @Override + @Optional.Method(modid = "appliedenergistics2") public void doneMoving() {} } diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/tablet/TileAnimationTablet.java b/src/main/java/thaumic/tinkerer/common/block/tile/tablet/TileAnimationTablet.java index a4bb4b34..6a4a2daa 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/tablet/TileAnimationTablet.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/tablet/TileAnimationTablet.java @@ -55,7 +55,8 @@ import thaumic.tinkerer.common.block.BlockAnimationTablet; import thaumic.tinkerer.common.lib.LibBlockNames; @Optional.InterfaceList({ @Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers"), - @Optional.Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft") }) + @Optional.Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft"), + @Optional.Interface(iface = "appeng.api.movable.IMovableTile", modid = "appliedenergistics2") }) public class TileAnimationTablet extends TileEntity implements IInventory, IMovableTile, IPeripheral, SimpleComponent { private static final String TAG_LEFT_CLICK = "leftClick"; @@ -633,12 +634,14 @@ public class TileAnimationTablet extends TileEntity implements IInventory, IMova } @Override + @Optional.Method(modid = "appliedenergistics2") public boolean prepareToMove() { stopBreaking(); return true; } @Override + @Optional.Method(modid = "appliedenergistics2") public void doneMoving() {} @Override diff --git a/src/main/java/thaumic/tinkerer/common/block/tile/transvector/TileTransvectorInterface.java b/src/main/java/thaumic/tinkerer/common/block/tile/transvector/TileTransvectorInterface.java index 9e3f08c5..4bcbaefe 100644 --- a/src/main/java/thaumic/tinkerer/common/block/tile/transvector/TileTransvectorInterface.java +++ b/src/main/java/thaumic/tinkerer/common/block/tile/transvector/TileTransvectorInterface.java @@ -257,35 +257,35 @@ public class TileTransvectorInterface extends TileTransvector } @Override - @Optional.Method(modid = "CoFHLib") + @Optional.Method(modid = "CoFHCore") public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { TileEntity tile = getTile(); return tile instanceof IEnergyHandler ? ((IEnergyHandler) tile).receiveEnergy(from, maxReceive, simulate) : 0; } @Override - @Optional.Method(modid = "CoFHLib") + @Optional.Method(modid = "CoFHCore") public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { TileEntity tile = getTile(); return tile instanceof IEnergyHandler ? ((IEnergyHandler) tile).extractEnergy(from, maxExtract, simulate) : 0; } @Override - @Optional.Method(modid = "CoFHLib") + @Optional.Method(modid = "CoFHCore") public int getEnergyStored(ForgeDirection from) { TileEntity tile = getTile(); return tile instanceof IEnergyHandler ? ((IEnergyHandler) tile).getEnergyStored(from) : 0; } @Override - @Optional.Method(modid = "CoFHLib") + @Optional.Method(modid = "CoFHCore") public int getMaxEnergyStored(ForgeDirection from) { TileEntity tile = getTile(); return tile instanceof IEnergyHandler ? ((IEnergyHandler) tile).getMaxEnergyStored(from) : 0; } @Override - @Optional.Method(modid = "CoFHLib") + @Optional.Method(modid = "CoFHCore") public boolean canConnectEnergy(ForgeDirection from) { TileEntity tile = getTile(); return tile instanceof IEnergyHandler ? ((IEnergyHandler) tile).canConnectEnergy(from) : false;