Merge pull request #10 from GTNewHorizons/jankins

[bs] spotless apply for jenkins
GTNewHorizons · Jan 9, 2024 · 0a73528 · 0a73528
2 parents 622a6bf + 225bf8d
commit 0a73528
Show file tree

Hide file tree

Showing 43 changed files with 187 additions and 141 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1704650211
+//version: 1704751096
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -786,7 +786,7 @@ dependencies {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.4.4')
     }
 
     java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,8 +1,8 @@
 // Add your dependencies here
 
 dependencies {
-    compileOnly('com.github.GTNewHorizons:waila:1.5.20:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-82-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.6.5:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-309-GTNH:dev') {transitive = false}
 
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false}
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') {transitive = false}

diff --git a/gradle.properties b/gradle.properties
@@ -62,6 +62,3 @@ usesShadowedDependencies = false
 # Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
 # projects. New projects should not use this parameter.
 customArchiveBaseName = RemoteIO
-
-# TODO: Remove when you modify this repository, it's been put in for automatic buildscript updates
-disableCheckstyle = true
diff --git a/repositories.gradle b/repositories.gradle
@@ -1,26 +1,4 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    maven {
-        name 'GTNH Maven'
-        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
-        allowInsecureProtocol
-    }
-    maven {
-        name 'ic2'
-        url 'http://maven.ic2.player.to/'
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
-    }
-    maven {
-        url 'https://cursemaven.com'
-        content {
-            includeGroup 'curse.maven'
-        }
-    }
-    maven {
-        url 'https://jitpack.io'
-    }
 }
diff --git a/src/main/java/remoteio/client/ClientProxy.java b/src/main/java/remoteio/client/ClientProxy.java
@@ -9,6 +9,11 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 
+import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import remoteio.client.documentation.Documentation;
 import remoteio.client.handler.SoundHandler;
 import remoteio.client.handler.TooltipEventHandler;
@@ -28,11 +33,6 @@
 import remoteio.common.tile.TileRemoteInterface;
 import remoteio.common.tile.TileRemoteInventory;
 import remoteio.common.tile.TileTransceiver;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/client/documentation/DocumentationPageText.java b/src/main/java/remoteio/client/documentation/DocumentationPageText.java
@@ -4,9 +4,9 @@
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.util.StatCollector;
 
+import cpw.mods.fml.client.FMLClientHandler;
 import remoteio.client.gui.GuiDocumentation;
 import remoteio.common.lib.Strings;
-import cpw.mods.fml.client.FMLClientHandler;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/client/render/RenderBlockRemoteInterface.java b/src/main/java/remoteio/client/render/RenderBlockRemoteInterface.java
@@ -7,11 +7,11 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.client.ForgeHooksClient;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import remoteio.common.block.BlockRemoteInterface;
 import remoteio.common.block.core.BlockIOCore;
 import remoteio.common.lib.VisualState;
 import remoteio.common.tile.TileRemoteInterface;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/client/render/RenderTileRemoteInterface.java b/src/main/java/remoteio/client/render/RenderTileRemoteInterface.java
@@ -13,13 +13,13 @@
 
 import org.lwjgl.opengl.GL11;
 
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.FMLLog;
 import remoteio.client.helper.IORenderHelper;
 import remoteio.common.block.core.BlockIOCore;
 import remoteio.common.lib.DimensionalCoords;
 import remoteio.common.lib.VisualState;
 import remoteio.common.tile.TileRemoteInterface;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.common.FMLLog;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/common/CommonProxy.java b/src/main/java/remoteio/common/CommonProxy.java
@@ -8,11 +8,11 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 
-import remoteio.common.core.handler.ContainerHandler;
-import remoteio.common.network.ServerProxyPlayer;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import remoteio.common.core.handler.ContainerHandler;
+import remoteio.common.network.ServerProxyPlayer;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/common/RemoteIO.java b/src/main/java/remoteio/common/RemoteIO.java
@@ -4,9 +4,27 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.config.Configuration;
 
+import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.common.Loader;
+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.ModMetadata;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
 import remoteio.common.block.BlockRemoteInterface;
 import remoteio.common.core.ChannelRegistry;
-import remoteio.common.core.handler.*;
+import remoteio.common.core.handler.BlockUpdateTicker;
+import remoteio.common.core.handler.ContainerHandler;
+import remoteio.common.core.handler.GuiHandler;
+import remoteio.common.core.handler.LocalizationUpdater;
+import remoteio.common.core.handler.PlayerEventHandler;
 import remoteio.common.core.helper.EventHelper;
 import remoteio.common.lib.ModBlocks;
 import remoteio.common.lib.ModInfo;
@@ -17,16 +35,6 @@
 import remoteio.common.recipe.RecipeInhibitorApply;
 import remoteio.common.recipe.RecipeRemoteInventory;
 import remoteio.common.tracker.BlockTracker;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.Loader;
-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.ModMetadata;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.*;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 @Mod(modid = ModInfo.ID, name = ModInfo.NAME, version = ModInfo.VERSION, dependencies = ModInfo.DEPENDENCIES)
 public class RemoteIO {

diff --git a/src/main/java/remoteio/common/block/BlockRemoteInterface.java b/src/main/java/remoteio/common/block/BlockRemoteInterface.java
@@ -15,6 +15,10 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import remoteio.common.RemoteIO;
 import remoteio.common.block.core.BlockIOCore;
 import remoteio.common.core.TransferType;
@@ -25,10 +29,6 @@
 import remoteio.common.lib.VisualState;
 import remoteio.common.tile.TileRemoteInterface;
 import remoteio.common.tile.core.TileIOCore;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/common/block/BlockTransceiver.java b/src/main/java/remoteio/common/block/BlockTransceiver.java
@@ -6,12 +6,12 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import remoteio.common.RemoteIO;
 import remoteio.common.core.TabRemoteIO;
 import remoteio.common.core.handler.GuiHandler;
 import remoteio.common.tile.TileTransceiver;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/common/block/core/BlockIOCore.java b/src/main/java/remoteio/common/block/core/BlockIOCore.java
@@ -11,15 +11,15 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import remoteio.common.RemoteIO;
 import remoteio.common.core.TabRemoteIO;
 import remoteio.common.core.helper.InventoryHelper;
 import remoteio.common.core.helper.mod.ToolHelper;
 import remoteio.common.lib.ModInfo;
 import remoteio.common.tile.TileRemoteInterface;
 import remoteio.common.tile.core.TileIOCore;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/common/core/ChannelRegistry.java b/src/main/java/remoteio/common/core/ChannelRegistry.java
@@ -13,11 +13,11 @@
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.event.world.WorldEvent;
 
-import remoteio.common.lib.DimensionalCoords;
-
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import remoteio.common.lib.DimensionalCoords;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/common/core/TransferType.java b/src/main/java/remoteio/common/core/TransferType.java
@@ -1,6 +1,9 @@
 package remoteio.common.core;
 
-import static remoteio.common.lib.DependencyInfo.Paths.*;
+import static remoteio.common.lib.DependencyInfo.Paths.AE2;
+import static remoteio.common.lib.DependencyInfo.Paths.COFH;
+import static remoteio.common.lib.DependencyInfo.Paths.IC2;
+import static remoteio.common.lib.DependencyInfo.Paths.Thaumcraft;
 
 import java.util.Map;
 

diff --git a/src/main/java/remoteio/common/core/compat/LinkedGridNode.java b/src/main/java/remoteio/common/core/compat/LinkedGridNode.java
@@ -8,14 +8,20 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import remoteio.common.core.TransferType;
-import remoteio.common.tile.TileRemoteInterface;
+import com.google.common.collect.Lists;
+
 import appeng.api.AEApi;
-import appeng.api.networking.*;
+import appeng.api.networking.GridFlags;
+import appeng.api.networking.IGrid;
+import appeng.api.networking.IGridBlock;
+import appeng.api.networking.IGridConnection;
+import appeng.api.networking.IGridHost;
+import appeng.api.networking.IGridNode;
+import appeng.api.networking.IGridVisitor;
 import appeng.api.util.IReadOnlyCollection;
 import appeng.util.ReadOnlyCollection;
-
-import com.google.common.collect.Lists;
+import remoteio.common.core.TransferType;
+import remoteio.common.tile.TileRemoteInterface;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/common/core/compat/WailaProvider.java b/src/main/java/remoteio/common/core/compat/WailaProvider.java
@@ -2,17 +2,16 @@
 
 import java.util.List;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.api.IWailaRegistrar;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.IWailaRegistrar;
 import remoteio.common.block.BlockRemoteInterface;
 import remoteio.common.block.BlockRemoteInventory;
 import remoteio.common.lib.VisualState;

diff --git a/src/main/java/remoteio/common/core/handler/BlockUpdateTicker.java b/src/main/java/remoteio/common/core/handler/BlockUpdateTicker.java
@@ -8,14 +8,13 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import remoteio.common.block.BlockSkylight;
-import remoteio.common.lib.ModBlocks;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
+import remoteio.common.block.BlockSkylight;
+import remoteio.common.lib.ModBlocks;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/common/core/handler/GuiHandler.java b/src/main/java/remoteio/common/core/handler/GuiHandler.java
@@ -3,13 +3,24 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 
-import remoteio.client.gui.*;
+import cpw.mods.fml.common.network.IGuiHandler;
+import remoteio.client.gui.GuiDocumentation;
+import remoteio.client.gui.GuiIntelligentWorkbench;
+import remoteio.client.gui.GuiItemSetChannel;
+import remoteio.client.gui.GuiRFConfig;
+import remoteio.client.gui.GuiRemoteInterface;
+import remoteio.client.gui.GuiRemoteInventory;
+import remoteio.client.gui.GuiSimpleCamo;
+import remoteio.client.gui.GuiTileSetChannel;
 import remoteio.common.inventory.InventoryItem;
-import remoteio.common.inventory.container.*;
+import remoteio.common.inventory.container.ContainerIntelligentWorkbench;
+import remoteio.common.inventory.container.ContainerNull;
+import remoteio.common.inventory.container.ContainerRemoteInterface;
+import remoteio.common.inventory.container.ContainerRemoteInventory;
+import remoteio.common.inventory.container.ContainerSimpleCamo;
 import remoteio.common.tile.TileRemoteInterface;
 import remoteio.common.tile.TileRemoteInventory;
 import remoteio.common.tile.TileTransceiver;
-import cpw.mods.fml.common.network.IGuiHandler;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/common/core/handler/PlayerEventHandler.java b/src/main/java/remoteio/common/core/handler/PlayerEventHandler.java
@@ -4,9 +4,9 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 
-import remoteio.common.lib.ModItems;
 import cpw.mods.fml.common.eventhandler.Event;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import remoteio.common.lib.ModItems;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/common/core/helper/mod/IC2Helper.java b/src/main/java/remoteio/common/core/helper/mod/IC2Helper.java
@@ -3,12 +3,12 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.MinecraftForge;
 
-import remoteio.common.lib.DependencyInfo;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Optional;
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
 import ic2.api.energy.tile.IEnergyTile;
+import remoteio.common.lib.DependencyInfo;
 
 /**
  * @author dmillerw

diff --git a/src/main/java/remoteio/common/core/helper/mod/ToolHelper.java b/src/main/java/remoteio/common/core/helper/mod/ToolHelper.java
@@ -4,10 +4,10 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import remoteio.api.IIOTool;
-import remoteio.common.lib.DependencyInfo;
 import appeng.api.implementations.items.IAEWrench;
 import cpw.mods.fml.common.Loader;
+import remoteio.api.IIOTool;
+import remoteio.common.lib.DependencyInfo;
 
 /**
  * @author dmillerw