diff --git a/build.gradle b/build.gradle index 952a3c5..3eb19a2 100644 --- 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 index 67580e0..7506fab 100644 --- 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 index 3330197..6b35313 100644 --- 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 index 1e00458..c227b16 100644 --- 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 index a2be1a5..ea96d78 100644 --- 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 index e9806f3..fc2b2df 100644 --- 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 index 32ad014..7adf1d9 100644 --- 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 index a6a4459..9c63cf8 100644 --- 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 index 08e809f..fdbfd95 100644 --- 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 index 90074b2..18c915f 100644 --- 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 index 4cc8b19..0e9a6a0 100644 --- 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 index 40a211c..55fea71 100644 --- 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 index c360718..6f28455 100644 --- a/src/main/java/remoteio/common/block/core/BlockIOCore.java +++ b/src/main/java/remoteio/common/block/core/BlockIOCore.java @@ -11,6 +11,8 @@ 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; @@ -18,8 +20,6 @@ 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 index 8abe42d..99bf2a6 100644 --- 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 index c0b02cf..0285bc9 100644 --- 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 index 38cf6af..95c60d6 100644 --- 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 index aa510ed..232fb67 100644 --- 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 index e62d474..ad76768 100644 --- 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 index fee8dab..1c44b65 100644 --- 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 index 796dd77..d2be76c 100644 --- 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 index 54167c0..4c63dfa 100644 --- 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 index 8a6ca83..606720e 100644 --- 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 diff --git a/src/main/java/remoteio/common/inventory/container/ContainerIntelligentWorkbench.java b/src/main/java/remoteio/common/inventory/container/ContainerIntelligentWorkbench.java index 2e82643..ac01ec3 100644 --- a/src/main/java/remoteio/common/inventory/container/ContainerIntelligentWorkbench.java +++ b/src/main/java/remoteio/common/inventory/container/ContainerIntelligentWorkbench.java @@ -5,20 +5,25 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.Slot; +import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import com.google.common.collect.Lists; + import remoteio.common.inventory.InventoryTileCrafting; import remoteio.common.network.PacketHandler; import remoteio.common.network.packet.PacketClientForceSlot; import remoteio.common.tile.TileIntelligentWorkbench; -import com.google.common.collect.Lists; - /** * @author dmillerw */ diff --git a/src/main/java/remoteio/common/lib/ModBlocks.java b/src/main/java/remoteio/common/lib/ModBlocks.java index 0faa681..45eef85 100644 --- a/src/main/java/remoteio/common/lib/ModBlocks.java +++ b/src/main/java/remoteio/common/lib/ModBlocks.java @@ -2,11 +2,19 @@ import net.minecraft.block.Block; -import remoteio.common.block.*; +import cpw.mods.fml.common.registry.GameRegistry; +import remoteio.common.block.BlockIntelligentWorkbench; +import remoteio.common.block.BlockMachine; +import remoteio.common.block.BlockRemoteInterface; +import remoteio.common.block.BlockRemoteInventory; +import remoteio.common.block.BlockSkylight; import remoteio.common.block.item.ItemBlockRemoteInventory; import remoteio.common.item.block.ItemBlockMulti; -import remoteio.common.tile.*; -import cpw.mods.fml.common.registry.GameRegistry; +import remoteio.common.tile.TileIntelligentWorkbench; +import remoteio.common.tile.TileMachineHeater; +import remoteio.common.tile.TileMachineReservoir; +import remoteio.common.tile.TileRemoteInterface; +import remoteio.common.tile.TileRemoteInventory; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/lib/ModItems.java b/src/main/java/remoteio/common/lib/ModItems.java index 6fc7052..5611d13 100644 --- a/src/main/java/remoteio/common/lib/ModItems.java +++ b/src/main/java/remoteio/common/lib/ModItems.java @@ -2,8 +2,16 @@ import net.minecraft.item.Item; -import remoteio.common.item.*; import cpw.mods.fml.common.registry.GameRegistry; +import remoteio.common.item.ItemBlankPlate; +import remoteio.common.item.ItemIOTool; +import remoteio.common.item.ItemLinker; +import remoteio.common.item.ItemLocationChip; +import remoteio.common.item.ItemPDA; +import remoteio.common.item.ItemRemoteAccessor; +import remoteio.common.item.ItemTransferChip; +import remoteio.common.item.ItemUpgradeChip; +import remoteio.common.item.ItemWirelessTransmitter; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/network/PacketHandler.java b/src/main/java/remoteio/common/network/PacketHandler.java index 41d29f9..1a309f7 100644 --- a/src/main/java/remoteio/common/network/PacketHandler.java +++ b/src/main/java/remoteio/common/network/PacketHandler.java @@ -1,10 +1,14 @@ package remoteio.common.network; -import remoteio.common.lib.ModInfo; -import remoteio.common.network.packet.*; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import remoteio.common.lib.ModInfo; +import remoteio.common.network.packet.PacketClientAllowContainer; +import remoteio.common.network.packet.PacketClientForceSlot; +import remoteio.common.network.packet.PacketServerApplyRFConfig; +import remoteio.common.network.packet.PacketServerOpenRemoteGUI; +import remoteio.common.network.packet.PacketServerSetChannel; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/network/packet/PacketClientAllowContainer.java b/src/main/java/remoteio/common/network/packet/PacketClientAllowContainer.java index 4946ec7..5a5302f 100644 --- a/src/main/java/remoteio/common/network/packet/PacketClientAllowContainer.java +++ b/src/main/java/remoteio/common/network/packet/PacketClientAllowContainer.java @@ -2,11 +2,11 @@ import net.minecraft.client.Minecraft; -import remoteio.common.core.handler.ContainerHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import remoteio.common.core.handler.ContainerHandler; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/network/packet/PacketClientForceSlot.java b/src/main/java/remoteio/common/network/packet/PacketClientForceSlot.java index 361e95d..a073565 100644 --- a/src/main/java/remoteio/common/network/packet/PacketClientForceSlot.java +++ b/src/main/java/remoteio/common/network/packet/PacketClientForceSlot.java @@ -4,12 +4,12 @@ import net.minecraft.item.ItemStack; -import remoteio.common.RemoteIO; -import remoteio.common.network.VanillaPacketHelper; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import remoteio.common.RemoteIO; +import remoteio.common.network.VanillaPacketHelper; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/network/packet/PacketServerApplyRFConfig.java b/src/main/java/remoteio/common/network/packet/PacketServerApplyRFConfig.java index c642b92..960fb3b 100644 --- a/src/main/java/remoteio/common/network/packet/PacketServerApplyRFConfig.java +++ b/src/main/java/remoteio/common/network/packet/PacketServerApplyRFConfig.java @@ -4,12 +4,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import remoteio.common.core.TransferType; -import remoteio.common.lib.ModItems; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import remoteio.common.core.TransferType; +import remoteio.common.lib.ModItems; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/network/packet/PacketServerOpenRemoteGUI.java b/src/main/java/remoteio/common/network/packet/PacketServerOpenRemoteGUI.java index 6fd7d82..a0e52ae 100644 --- a/src/main/java/remoteio/common/network/packet/PacketServerOpenRemoteGUI.java +++ b/src/main/java/remoteio/common/network/packet/PacketServerOpenRemoteGUI.java @@ -4,12 +4,12 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import remoteio.common.core.handler.ContainerHandler; -import remoteio.common.network.ServerProxyPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import remoteio.common.core.handler.ContainerHandler; +import remoteio.common.network.ServerProxyPlayer; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/network/packet/PacketServerSetChannel.java b/src/main/java/remoteio/common/network/packet/PacketServerSetChannel.java index 3349163..c0f9aa7 100644 --- a/src/main/java/remoteio/common/network/packet/PacketServerSetChannel.java +++ b/src/main/java/remoteio/common/network/packet/PacketServerSetChannel.java @@ -3,13 +3,13 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; -import remoteio.common.item.ItemWirelessLocationChip; -import remoteio.common.lib.ModItems; -import remoteio.common.tile.TileTransceiver; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import remoteio.common.item.ItemWirelessLocationChip; +import remoteio.common.lib.ModItems; +import remoteio.common.tile.TileTransceiver; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/recipe/ModRecipes.java b/src/main/java/remoteio/common/recipe/ModRecipes.java index f4c6572..f30ae17 100644 --- a/src/main/java/remoteio/common/recipe/ModRecipes.java +++ b/src/main/java/remoteio/common/recipe/ModRecipes.java @@ -5,6 +5,11 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import appeng.api.AEApi; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import ic2.api.item.IC2Items; import remoteio.common.core.TransferType; import remoteio.common.core.UpgradeType; import remoteio.common.core.helper.ModHelper; @@ -12,11 +17,6 @@ import remoteio.common.lib.DependencyInfo; import remoteio.common.lib.ModBlocks; import remoteio.common.lib.ModItems; -import appeng.api.AEApi; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; -import ic2.api.item.IC2Items; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/recipe/RecipeCopyLocation.java b/src/main/java/remoteio/common/recipe/RecipeCopyLocation.java index 8a8c15e..6cfbc74 100644 --- a/src/main/java/remoteio/common/recipe/RecipeCopyLocation.java +++ b/src/main/java/remoteio/common/recipe/RecipeCopyLocation.java @@ -5,9 +5,9 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; -import remoteio.common.lib.ModItems; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; +import remoteio.common.lib.ModItems; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/recipe/RecipeRemoteInventory.java b/src/main/java/remoteio/common/recipe/RecipeRemoteInventory.java index 113d528..cf975ec 100644 --- a/src/main/java/remoteio/common/recipe/RecipeRemoteInventory.java +++ b/src/main/java/remoteio/common/recipe/RecipeRemoteInventory.java @@ -8,11 +8,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; import remoteio.common.item.ItemWirelessTransmitter; import remoteio.common.lib.ModBlocks; import remoteio.common.lib.ModItems; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/tile/TileMachineHeater.java b/src/main/java/remoteio/common/tile/TileMachineHeater.java index df581fe..f0b2fe0 100644 --- a/src/main/java/remoteio/common/tile/TileMachineHeater.java +++ b/src/main/java/remoteio/common/tile/TileMachineHeater.java @@ -8,11 +8,11 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.Optional; +import ic2.api.energy.tile.IHeatSource; import remoteio.common.RemoteIO; import remoteio.common.lib.DependencyInfo; import remoteio.common.tile.core.TileCore; -import cpw.mods.fml.common.Optional; -import ic2.api.energy.tile.IHeatSource; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/tile/TileMachineReservoir.java b/src/main/java/remoteio/common/tile/TileMachineReservoir.java index 737cab2..498fc4b 100644 --- a/src/main/java/remoteio/common/tile/TileMachineReservoir.java +++ b/src/main/java/remoteio/common/tile/TileMachineReservoir.java @@ -5,7 +5,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import remoteio.common.tile.core.TileCore; diff --git a/src/main/java/remoteio/common/tile/TileRemoteInterface.java b/src/main/java/remoteio/common/tile/TileRemoteInterface.java index 90e4f27..7352c4d 100644 --- a/src/main/java/remoteio/common/tile/TileRemoteInterface.java +++ b/src/main/java/remoteio/common/tile/TileRemoteInterface.java @@ -17,23 +17,6 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import remoteio.common.core.TransferType; -import remoteio.common.core.UpgradeType; -import remoteio.common.core.compat.LinkedGridNode; -import remoteio.common.core.helper.RotationHelper; -import remoteio.common.core.helper.mod.IC2Helper; -import remoteio.common.lib.DependencyInfo; -import remoteio.common.lib.DimensionalCoords; -import remoteio.common.lib.ModItems; -import remoteio.common.lib.VisualState; -import remoteio.common.tile.core.TileIOCore; -import remoteio.common.tracker.BlockTracker; -import remoteio.common.tracker.RedstoneTracker; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.aspects.IAspectSource; -import thaumcraft.api.aspects.IEssentiaTransport; -import thaumcraft.api.wands.IWandable; import appeng.api.networking.GridFlags; import appeng.api.networking.GridNotification; import appeng.api.networking.IGrid; @@ -52,6 +35,23 @@ import ic2.api.energy.tile.IEnergySource; import ic2.api.tile.IEnergyStorage; import ic2.api.tile.IWrenchable; +import remoteio.common.core.TransferType; +import remoteio.common.core.UpgradeType; +import remoteio.common.core.compat.LinkedGridNode; +import remoteio.common.core.helper.RotationHelper; +import remoteio.common.core.helper.mod.IC2Helper; +import remoteio.common.lib.DependencyInfo; +import remoteio.common.lib.DimensionalCoords; +import remoteio.common.lib.ModItems; +import remoteio.common.lib.VisualState; +import remoteio.common.tile.core.TileIOCore; +import remoteio.common.tracker.BlockTracker; +import remoteio.common.tracker.RedstoneTracker; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.aspects.IAspectSource; +import thaumcraft.api.aspects.IEssentiaTransport; +import thaumcraft.api.wands.IWandable; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/tile/TileRemoteInventory.java b/src/main/java/remoteio/common/tile/TileRemoteInventory.java index 9ad3b30..f57a7cc 100644 --- a/src/main/java/remoteio/common/tile/TileRemoteInventory.java +++ b/src/main/java/remoteio/common/tile/TileRemoteInventory.java @@ -7,6 +7,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import cofh.api.energy.IEnergyHandler; +import cpw.mods.fml.common.Optional; +import ic2.api.energy.tile.IEnergySink; +import ic2.api.energy.tile.IEnergySource; import remoteio.common.core.TransferType; import remoteio.common.core.UpgradeType; import remoteio.common.core.helper.PlayerHelper; @@ -18,10 +22,6 @@ import remoteio.common.lib.DependencyInfo; import remoteio.common.lib.VisualState; import remoteio.common.tile.core.TileIOCore; -import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional; -import ic2.api.energy.tile.IEnergySink; -import ic2.api.energy.tile.IEnergySource; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/tracker/BlockTracker.java b/src/main/java/remoteio/common/tracker/BlockTracker.java index 8a85ed2..cb8e4db 100644 --- a/src/main/java/remoteio/common/tracker/BlockTracker.java +++ b/src/main/java/remoteio/common/tracker/BlockTracker.java @@ -7,10 +7,10 @@ import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; -import remoteio.common.lib.DimensionalCoords; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; +import remoteio.common.lib.DimensionalCoords; /** * @author dmillerw diff --git a/src/main/java/remoteio/common/tracker/RedstoneTracker.java b/src/main/java/remoteio/common/tracker/RedstoneTracker.java index d480b18..de4db00 100644 --- a/src/main/java/remoteio/common/tracker/RedstoneTracker.java +++ b/src/main/java/remoteio/common/tracker/RedstoneTracker.java @@ -4,13 +4,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; + import remoteio.common.core.TransferType; import remoteio.common.lib.DimensionalCoords; import remoteio.common.tile.TileRemoteInterface; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; - /** * @author dmillerw */ diff --git a/src/main/java/remoteio/core/transform/CoreTransformer.java b/src/main/java/remoteio/core/transform/CoreTransformer.java index 3a89b99..65717b3 100644 --- a/src/main/java/remoteio/core/transform/CoreTransformer.java +++ b/src/main/java/remoteio/core/transform/CoreTransformer.java @@ -5,10 +5,10 @@ import net.minecraft.launchwrapper.IClassTransformer; -import remoteio.core.MappingHelper; - import com.google.common.collect.Lists; +import remoteio.core.MappingHelper; + /** * @author dmillerw */ diff --git a/src/main/java/remoteio/core/transform/TransformTessellator.java b/src/main/java/remoteio/core/transform/TransformTessellator.java index 4b49340..936bc04 100644 --- a/src/main/java/remoteio/core/transform/TransformTessellator.java +++ b/src/main/java/remoteio/core/transform/TransformTessellator.java @@ -4,7 +4,18 @@ import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.*; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.FrameNode; +import org.objectweb.asm.tree.InsnList; +import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.IntInsnNode; +import org.objectweb.asm.tree.JumpInsnNode; +import org.objectweb.asm.tree.LabelNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.TypeInsnNode; +import org.objectweb.asm.tree.VarInsnNode; import remoteio.core.MappingHelper; import remoteio.core.mapping.MappingConstants; diff --git a/src/main/java/remoteio/core/transform/TransformWorld.java b/src/main/java/remoteio/core/transform/TransformWorld.java index 6800c68..900dea9 100644 --- a/src/main/java/remoteio/core/transform/TransformWorld.java +++ b/src/main/java/remoteio/core/transform/TransformWorld.java @@ -3,7 +3,11 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.*; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.VarInsnNode; import remoteio.core.MappingHelper; import remoteio.core.mapping.MappingConstants;