Dev (#22)

* update gradle bs sa and dep * sa * update dummy core * fix dummy core version dep
GTNewHorizons · Jul 15, 2023 · f2117ce · f2117ce
1 parent 09bac9c
commit f2117ce
Show file tree

Hide file tree

Showing 67 changed files with 441 additions and 276 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,13 +1,13 @@
 // Add your dependencies here
 
 dependencies {
-	compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.264:dev') {transitive=false}
+	compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.128:dev') {transitive=false}
 
 	compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
-	compile('curse.maven:dummycore-230103:2244260')
-	compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev')
-	runtimeOnly("com.github.GTNewHorizons:NotEnoughItems:2.2.17-GTNH:dev")
+	compile('com.github.GTNewHorizons:CodeChickenLib:1.1.8:dev')
+	compile('com.github.GTNewHorizons:DummyCore:1.2.0:dev')
+	runtimeOnly("com.github.GTNewHorizons:NotEnoughItems:2.3.73-GTNH:dev")
 
-	runtimeOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev')
-	runtimeOnly('com.github.GTNewHorizons:CodeChickenCore:1.1.5:dev') // Required to allow dummycore to run in dev
+	runtimeOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev')
+	runtimeOnly('com.github.GTNewHorizons:CodeChickenCore:1.1.11:dev') // Required to allow dummycore to run in 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.1.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/tb/api/RevolverUpgrade.java b/src/main/java/tb/api/RevolverUpgrade.java
@@ -16,15 +16,15 @@
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.IExtendedEntityProperties;
 
+import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.Loader;
 import tb.utils.TBUtils;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.api.entities.IEldritchMob;
 import thaumcraft.api.entities.ITaintedMob;
 import thaumcraft.common.config.Config;
 import thaumcraft.common.lib.research.ScanManager;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Loader;
 
 public class RevolverUpgrade {
 

diff --git a/src/main/java/tb/client/RevolverEvents.java b/src/main/java/tb/client/RevolverEvents.java
@@ -5,9 +5,9 @@
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
 
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import tb.api.RevolverUpgrade;
 import tb.common.item.ItemRevolver;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class RevolverEvents {
 

diff --git a/src/main/java/tb/client/gui/GuiThaumicAnvil.java b/src/main/java/tb/client/gui/GuiThaumicAnvil.java
@@ -19,9 +19,9 @@
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 
-import tb.common.inventory.ContainerThaumicAnvil;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.common.inventory.ContainerThaumicAnvil;
 
 @SideOnly(Side.CLIENT)
 public class GuiThaumicAnvil extends GuiContainer implements ICrafting {

diff --git a/src/main/java/tb/client/gui/GuiVoidAnvil.java b/src/main/java/tb/client/gui/GuiVoidAnvil.java
@@ -19,9 +19,9 @@
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 
-import tb.common.inventory.ContainerVoidAnvil;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.common.inventory.ContainerVoidAnvil;
 
 @SideOnly(Side.CLIENT)
 public class GuiVoidAnvil extends GuiContainer implements ICrafting {

diff --git a/src/main/java/tb/client/render/block/BrazierRenderer.java b/src/main/java/tb/client/render/block/BrazierRenderer.java
@@ -8,10 +8,10 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import tb.common.tile.TileBrazier;
 import thaumcraft.client.renderers.block.BlockRenderer;
 import thaumcraft.common.config.ConfigBlocks;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
 public class BrazierRenderer extends BlockRenderer implements ISimpleBlockRenderingHandler {
 

diff --git a/src/main/java/tb/client/render/block/CampfireRenderer.java b/src/main/java/tb/client/render/block/CampfireRenderer.java
@@ -6,9 +6,9 @@
 import net.minecraft.init.Blocks;
 import net.minecraft.world.IBlockAccess;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import thaumcraft.client.renderers.block.BlockRenderer;
 import thaumcraft.common.config.ConfigBlocks;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
 public class CampfireRenderer extends BlockRenderer implements ISimpleBlockRenderingHandler {
 

diff --git a/src/main/java/tb/client/render/block/ThaumicRelocatorRenderer.java b/src/main/java/tb/client/render/block/ThaumicRelocatorRenderer.java
@@ -8,9 +8,9 @@
 
 import org.lwjgl.opengl.GL11;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import tb.common.block.BlockRelocator;
 import tb.common.tile.TileRelocator;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
 public class ThaumicRelocatorRenderer implements ISimpleBlockRenderingHandler {
 

diff --git a/src/main/java/tb/client/render/item/NodeFociRenderer.java b/src/main/java/tb/client/render/item/NodeFociRenderer.java
@@ -8,8 +8,8 @@
 
 import org.lwjgl.opengl.GL11;
 
-import tb.common.item.ItemNodeFoci;
 import DummyCore.Utils.MiscUtils;
+import tb.common.item.ItemNodeFoci;
 
 public class NodeFociRenderer implements IItemRenderer {
 

diff --git a/src/main/java/tb/client/render/item/RenderRevolver.java b/src/main/java/tb/client/render/item/RenderRevolver.java
@@ -12,9 +12,9 @@
 
 import org.lwjgl.opengl.GL11;
 
+import DummyCore.Utils.Pair;
 import tb.api.RevolverUpgrade;
 import tb.common.item.ItemRevolver;
-import DummyCore.Utils.Pair;
 
 public class RenderRevolver implements IItemRenderer {
 

diff --git a/src/main/java/tb/client/render/tile/RenderNodeManipulator.java b/src/main/java/tb/client/render/tile/RenderNodeManipulator.java
@@ -9,8 +9,8 @@
 
 import org.lwjgl.opengl.GL11;
 
-import tb.common.item.ItemNodeFoci;
 import DummyCore.Utils.MiscUtils;
+import tb.common.item.ItemNodeFoci;
 
 public class RenderNodeManipulator extends TileEntitySpecialRenderer {
 

diff --git a/src/main/java/tb/common/block/BlockAdvAlchemicalFurnace.java b/src/main/java/tb/common/block/BlockAdvAlchemicalFurnace.java
@@ -17,12 +17,12 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import tb.common.tile.TileAdvAlchemicalFurnace;
-import thaumcraft.common.Thaumcraft;
-import thaumcraft.common.tiles.TileAlchemyFurnace;
 import DummyCore.Utils.MiscUtils;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.common.tile.TileAdvAlchemicalFurnace;
+import thaumcraft.common.Thaumcraft;
+import thaumcraft.common.tiles.TileAlchemyFurnace;
 
 public class BlockAdvAlchemicalFurnace extends BlockContainer {
 

diff --git a/src/main/java/tb/common/block/BlockAureliaPlant.java b/src/main/java/tb/common/block/BlockAureliaPlant.java
@@ -13,9 +13,9 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import tb.init.TBBlocks;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.init.TBBlocks;
 
 public class BlockAureliaPlant extends Block {
 

diff --git a/src/main/java/tb/common/block/BlockBrazier.java b/src/main/java/tb/common/block/BlockBrazier.java
@@ -11,8 +11,8 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import tb.common.tile.TileBrazier;
 import DummyCore.Utils.MathUtils;
+import tb.common.tile.TileBrazier;
 
 public class BlockBrazier extends BlockContainer {
 

diff --git a/src/main/java/tb/common/block/BlockBriar.java b/src/main/java/tb/common/block/BlockBriar.java
@@ -15,9 +15,9 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import tb.init.TBItems;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.init.TBItems;
 
 public class BlockBriar extends BlockBush implements IGrowable {
 

diff --git a/src/main/java/tb/common/block/BlockCampfire.java b/src/main/java/tb/common/block/BlockCampfire.java
@@ -13,8 +13,8 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import tb.common.tile.TileCampfire;
 import DummyCore.Utils.MathUtils;
+import tb.common.tile.TileCampfire;
 
 public class BlockCampfire extends BlockContainer {
 

diff --git a/src/main/java/tb/common/block/BlockCrystalBlock.java b/src/main/java/tb/common/block/BlockCrystalBlock.java
@@ -11,10 +11,10 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import thaumcraft.api.crafting.IInfusionStabiliser;
-import thaumcraft.common.blocks.CustomStepSound;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import thaumcraft.api.crafting.IInfusionStabiliser;
+import thaumcraft.common.blocks.CustomStepSound;
 
 public class BlockCrystalBlock extends Block implements IInfusionStabiliser {
 

diff --git a/src/main/java/tb/common/block/BlockCrystalSlab.java b/src/main/java/tb/common/block/BlockCrystalSlab.java
@@ -11,11 +11,11 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import tb.init.TBBlocks;
 import thaumcraft.api.crafting.IInfusionStabiliser;
 import thaumcraft.common.blocks.CustomStepSound;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockCrystalSlab extends BlockSlab implements IInfusionStabiliser {
 

diff --git a/src/main/java/tb/common/block/BlockHalfSlab.java b/src/main/java/tb/common/block/BlockHalfSlab.java
@@ -12,10 +12,10 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import tb.init.TBBlocks;
-import thaumcraft.api.crafting.IInfusionStabiliser;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.init.TBBlocks;
+import thaumcraft.api.crafting.IInfusionStabiliser;
 
 public class BlockHalfSlab extends BlockSlab implements IInfusionStabiliser {
 

diff --git a/src/main/java/tb/common/block/BlockOverchanter.java b/src/main/java/tb/common/block/BlockOverchanter.java
@@ -9,11 +9,11 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import tb.common.tile.TileOverchanter;
-import tb.core.TBCore;
 import DummyCore.Utils.MiscUtils;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.common.tile.TileOverchanter;
+import tb.core.TBCore;
 
 public class BlockOverchanter extends BlockContainer {
 

diff --git a/src/main/java/tb/common/block/BlockPyrofluid.java b/src/main/java/tb/common/block/BlockPyrofluid.java
@@ -16,9 +16,9 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import tb.utils.TBConfig;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.utils.TBConfig;
 
 public class BlockPyrofluid extends Block {
 

diff --git a/src/main/java/tb/common/block/BlockRedlonStem.java b/src/main/java/tb/common/block/BlockRedlonStem.java
@@ -12,9 +12,9 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import tb.init.TBItems;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.init.TBItems;
 
 public class BlockRedlonStem extends BlockStem {
 

diff --git a/src/main/java/tb/common/block/BlockRelocator.java b/src/main/java/tb/common/block/BlockRelocator.java
@@ -17,11 +17,11 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import tb.common.tile.TileRelocator;
-import tb.core.TBCore;
 import DummyCore.Utils.MathUtils;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.common.tile.TileRelocator;
+import tb.core.TBCore;
 
 public class BlockRelocator extends BlockContainer {
 

diff --git a/src/main/java/tb/common/block/BlockSpike.java b/src/main/java/tb/common/block/BlockSpike.java
@@ -20,14 +20,13 @@
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.util.FakePlayer;
 
-import tb.init.TBItems;
-import thaumcraft.common.config.ConfigItems;
-import thaumcraft.common.items.armor.ItemVoidArmor;
-
 import com.mojang.authlib.GameProfile;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.init.TBItems;
+import thaumcraft.common.config.ConfigItems;
+import thaumcraft.common.items.armor.ItemVoidArmor;
 
 public class BlockSpike extends Block {
 

diff --git a/src/main/java/tb/common/block/BlockTBLeaves.java b/src/main/java/tb/common/block/BlockTBLeaves.java
@@ -32,12 +32,12 @@
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.oredict.OreDictionary;
 
-import tb.core.TBCore;
-import tb.init.TBBlocks;
 import DummyCore.Utils.MathUtils;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.core.TBCore;
+import tb.init.TBBlocks;
 
 public class BlockTBLeaves extends BlockOldLeaf {
 

diff --git a/src/main/java/tb/common/block/BlockTBLog.java b/src/main/java/tb/common/block/BlockTBLog.java
@@ -14,9 +14,9 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import tb.core.TBCore;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.core.TBCore;
 
 public class BlockTBLog extends BlockOldLog {
 

diff --git a/src/main/java/tb/common/block/BlockTBSapling.java b/src/main/java/tb/common/block/BlockTBSapling.java
@@ -12,11 +12,11 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import tb.common.event.WorldGenBigOak;
 import tb.common.event.WorldGenOak;
 import tb.init.TBBlocks;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockTBSapling extends BlockSapling {
 

diff --git a/src/main/java/tb/common/block/BlockThaumicAnvil.java b/src/main/java/tb/common/block/BlockThaumicAnvil.java
@@ -6,10 +6,10 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import tb.core.TBCore;
-import thaumcraft.api.crafting.IInfusionStabiliser;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tb.core.TBCore;
+import thaumcraft.api.crafting.IInfusionStabiliser;
 
 public class BlockThaumicAnvil extends BlockAnvil implements IInfusionStabiliser {
 

diff --git a/src/main/java/tb/common/block/BlockVoidAnvil.java b/src/main/java/tb/common/block/BlockVoidAnvil.java
@@ -9,11 +9,11 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import tb.core.TBCore;
 import thaumcraft.api.crafting.IInfusionStabiliser;
 import thaumcraft.common.Thaumcraft;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockVoidAnvil extends BlockAnvil implements IInfusionStabiliser {