Merge pull request #6 from chochem/update-bs-and-deps

Update bs and deps to make the mod compile again
GTNewHorizons · Sep 10, 2023 · 9328be4 · 9328be4
2 parents 986f8bd + 236c5ca
commit 9328be4
Show file tree

Hide file tree

Showing 40 changed files with 600 additions and 289 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    compile("com.github.GTNewHorizons:TinkersConstruct:1.9.0.10-GTNH:dev")
-    compile("com.github.GTNewHorizons:Mantle:0.3.4:dev")
+    compile("com.github.GTNewHorizons:TinkersConstruct:1.10.1-GTNH:dev")
+    compile("com.github.GTNewHorizons:Mantle:0.3.7:dev")
 
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

diff --git a/src/main/java/tmechworks/TMechworks.java b/src/main/java/tmechworks/TMechworks.java
@@ -5,6 +5,16 @@
 
 import org.apache.logging.log4j.Logger;
 
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.relauncher.Side;
 import tmechworks.client.SignalTetherWorldOverlayRenderer;
 import tmechworks.command.BlockInfoCommand;
 import tmechworks.common.CommonProxy;
@@ -16,16 +26,6 @@
 import tmechworks.lib.multiblock.MultiblockServerTickHandler;
 import tmechworks.lib.util.TabTools;
 import tmechworks.network.packet.PacketPipeline;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.relauncher.Side;
 
 @Mod(modid = Repo.modId, name = Repo.modName, version = Repo.modVer, dependencies = Repo.modDeps)
 public class TMechworks {

diff --git a/src/main/java/tmechworks/blocks/FilterBlock.java b/src/main/java/tmechworks/blocks/FilterBlock.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,12 +20,13 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import mantle.world.CoordTuple;
 import tmechworks.blocks.logic.SubFilter;
 import tmechworks.client.block.FilterRender;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.blocks.IBlockWithMetadata;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class FilterBlock extends Block implements IBlockWithMetadata {
 

diff --git a/src/main/java/tmechworks/blocks/RedstoneMachine.java b/src/main/java/tmechworks/blocks/RedstoneMachine.java
@@ -3,13 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import mantle.blocks.abstracts.InventoryBlock;
-import mantle.blocks.abstracts.InventoryLogic;
-import mantle.blocks.iface.IActiveLogic;
-import mantle.blocks.iface.IFacingLogic;
-import mantle.common.ComparisonHelper;
-import mantle.world.CoordTuple;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -28,15 +21,21 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import mantle.blocks.abstracts.InventoryBlock;
+import mantle.blocks.abstracts.InventoryLogic;
+import mantle.blocks.iface.IActiveLogic;
+import mantle.blocks.iface.IFacingLogic;
+import mantle.common.ComparisonHelper;
+import mantle.world.CoordTuple;
 import tmechworks.TMechworks;
 import tmechworks.blocks.logic.AdvancedDrawbridgeLogic;
 import tmechworks.blocks.logic.DrawbridgeLogic;
 import tmechworks.blocks.logic.FirestarterLogic;
 import tmechworks.client.block.MachineRender;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.blocks.IDrawbridgeLogicBase;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class RedstoneMachine extends InventoryBlock {
 

diff --git a/src/main/java/tmechworks/blocks/SignalBus.java b/src/main/java/tmechworks/blocks/SignalBus.java
@@ -11,8 +11,6 @@
 import java.util.List;
 import java.util.Random;
 
-import mantle.world.WorldHelper;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
@@ -33,13 +31,14 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import mantle.world.WorldHelper;
 import tmechworks.TMechworks;
 import tmechworks.blocks.logic.SignalBusLogic;
 import tmechworks.client.block.SignalBusRender;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.multiblock.IMultiblockMember;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class SignalBus extends Block implements ITileEntityProvider {
 

diff --git a/src/main/java/tmechworks/blocks/SignalTerminal.java b/src/main/java/tmechworks/blocks/SignalTerminal.java
@@ -23,12 +23,12 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import tmechworks.TMechworks;
 import tmechworks.blocks.logic.SignalTerminalLogic;
 import tmechworks.client.block.SignalTerminalRender;
 import tmechworks.lib.TMechworksRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class SignalTerminal extends Block implements ITileEntityProvider {
 

diff --git a/src/main/java/tmechworks/blocks/component/SignalBusMasterLogic.java b/src/main/java/tmechworks/blocks/component/SignalBusMasterLogic.java
@@ -4,12 +4,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import mantle.world.CoordTuple;
 import tmechworks.blocks.logic.SignalBusLogic;
 import tmechworks.lib.multiblock.IMultiblockMember;
 import tmechworks.lib.multiblock.MultiblockMasterBaseLogic;

diff --git a/src/main/java/tmechworks/blocks/logic/AdvancedDrawbridgeLogic.java b/src/main/java/tmechworks/blocks/logic/AdvancedDrawbridgeLogic.java
@@ -4,10 +4,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import mantle.blocks.abstracts.InventoryLogic;
-import mantle.blocks.iface.IActiveLogic;
-import mantle.blocks.iface.IFacingLogic;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -32,13 +28,16 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.mojang.authlib.GameProfile;
+
+import mantle.blocks.abstracts.InventoryLogic;
+import mantle.blocks.iface.IActiveLogic;
+import mantle.blocks.iface.IFacingLogic;
 import tmechworks.inventory.AdvancedDrawbridgeContainer;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.blocks.IDrawbridgeLogicBase;
 import tmechworks.lib.player.FakePlayerLogic;
 
-import com.mojang.authlib.GameProfile;
-
 public class AdvancedDrawbridgeLogic extends InventoryLogic
         implements IFacingLogic, IActiveLogic, IDrawbridgeLogicBase {
 

diff --git a/src/main/java/tmechworks/blocks/logic/DrawbridgeLogic.java b/src/main/java/tmechworks/blocks/logic/DrawbridgeLogic.java
@@ -4,11 +4,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import mantle.blocks.BlockUtils;
-import mantle.blocks.abstracts.InventoryLogic;
-import mantle.blocks.iface.IActiveLogic;
-import mantle.blocks.iface.IFacingLogic;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -32,13 +27,17 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.mojang.authlib.GameProfile;
+
+import mantle.blocks.BlockUtils;
+import mantle.blocks.abstracts.InventoryLogic;
+import mantle.blocks.iface.IActiveLogic;
+import mantle.blocks.iface.IFacingLogic;
 import tmechworks.inventory.DrawbridgeContainer;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.blocks.IDrawbridgeLogicBase;
 import tmechworks.lib.player.FakePlayerLogic;
 
-import com.mojang.authlib.GameProfile;
-
 public class DrawbridgeLogic extends InventoryLogic implements IFacingLogic, IActiveLogic, IDrawbridgeLogicBase {
 
     boolean active;

diff --git a/src/main/java/tmechworks/blocks/logic/FilterLogic.java b/src/main/java/tmechworks/blocks/logic/FilterLogic.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.command.IEntitySelector;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
@@ -15,6 +13,7 @@
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 
+import mantle.world.CoordTuple;
 import tmechworks.blocks.FilterBlock;
 
 /*---------------- DEPRECATED, KEPT FOR REFERENCE ----------------*/

diff --git a/src/main/java/tmechworks/blocks/logic/FirestarterLogic.java b/src/main/java/tmechworks/blocks/logic/FirestarterLogic.java
@@ -1,9 +1,5 @@
 package tmechworks.blocks.logic;
 
-import mantle.blocks.iface.IActiveLogic;
-import mantle.blocks.iface.IFacingLogic;
-import mantle.world.WorldHelper;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.init.Blocks;
@@ -15,6 +11,9 @@
 import net.minecraft.util.MathHelper;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import mantle.blocks.iface.IActiveLogic;
+import mantle.blocks.iface.IFacingLogic;
+import mantle.world.WorldHelper;
 import tconstruct.library.tools.AbilityHelper;
 
 public class FirestarterLogic extends TileEntity implements IFacingLogic, IActiveLogic {

diff --git a/src/main/java/tmechworks/blocks/logic/SignalBusLogic.java b/src/main/java/tmechworks/blocks/logic/SignalBusLogic.java
@@ -7,8 +7,6 @@
 import java.util.Map;
 import java.util.Random;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -19,6 +17,7 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import mantle.world.CoordTuple;
 import tmechworks.TMechworks;
 import tmechworks.blocks.component.SignalBusMasterLogic;
 import tmechworks.lib.multiblock.IMultiblockMember;

diff --git a/src/main/java/tmechworks/blocks/logic/SignalTerminalLogic.java b/src/main/java/tmechworks/blocks/logic/SignalTerminalLogic.java
@@ -2,8 +2,6 @@
 
 import java.util.Arrays;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.nbt.NBTTagCompound;
@@ -16,6 +14,7 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import mantle.world.CoordTuple;
 import tmechworks.TMechworks;
 import tmechworks.blocks.SignalTerminal;
 import tmechworks.common.MechContent;

diff --git a/src/main/java/tmechworks/client/ClientProxy.java b/src/main/java/tmechworks/client/ClientProxy.java
@@ -5,6 +5,8 @@
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 
+import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import tmechworks.blocks.logic.AdvancedDrawbridgeLogic;
 import tmechworks.blocks.logic.DrawbridgeLogic;
 import tmechworks.blocks.logic.DynamoLogic;
@@ -18,8 +20,6 @@
 import tmechworks.client.item.DynamoItemRender;
 import tmechworks.common.CommonProxy;
 import tmechworks.common.MechContent;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.client.registry.RenderingRegistry;
 
 public class ClientProxy extends CommonProxy {
 

diff --git a/src/main/java/tmechworks/client/SignalTetherWorldOverlayRenderer.java b/src/main/java/tmechworks/client/SignalTetherWorldOverlayRenderer.java
@@ -2,9 +2,6 @@
 
 import java.util.ArrayDeque;
 
-import mantle.world.CoordTuple;
-import mantle.world.CoordTuplePair;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.tileentity.TileEntity;
@@ -14,9 +11,11 @@
 
 import org.lwjgl.opengl.GL11;
 
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import mantle.world.CoordTuple;
+import mantle.world.CoordTuplePair;
 import tmechworks.TMechworks;
 import tmechworks.lib.signal.ISignalTransceiver;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class SignalTetherWorldOverlayRenderer {
 

diff --git a/src/main/java/tmechworks/client/block/DynamoSpecialRender.java b/src/main/java/tmechworks/client/block/DynamoSpecialRender.java
@@ -8,10 +8,10 @@
 
 import org.lwjgl.opengl.GL11;
 
-import tmechworks.blocks.logic.DynamoLogic;
-import tmechworks.client.model.DynamoModel;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tmechworks.blocks.logic.DynamoLogic;
+import tmechworks.client.model.DynamoModel;
 
 @SideOnly(Side.CLIENT)
 public class DynamoSpecialRender extends TileEntitySpecialRenderer {

diff --git a/src/main/java/tmechworks/client/block/FilterRender.java b/src/main/java/tmechworks/client/block/FilterRender.java
@@ -1,17 +1,16 @@
 package tmechworks.client.block;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.world.IBlockAccess;
 
 import org.lwjgl.opengl.GL11;
 
-import tmechworks.blocks.FilterBlock;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import mantle.world.CoordTuple;
+import tmechworks.blocks.FilterBlock;
 
 public class FilterRender implements ISimpleBlockRenderingHandler {