diff --git a/build.gradle b/build.gradle index 952a3c59..3eb19a26 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/gradle.properties b/gradle.properties index fb927f63..1abafdd4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -58,6 +58,3 @@ containsMixinsAndOrCoreModOnly = false # If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your # responsibility check the licence and request permission for distribution, if required. usesShadowedDependencies = false - -# TODO: Remove when you modify this repository, it's been put in for automatic buildscript updates -disableCheckstyle = true diff --git a/src/main/java/vswe/stevescarts/Arcade/ArcadeGame.java b/src/main/java/vswe/stevescarts/Arcade/ArcadeGame.java index 83b25ad3..59561d03 100644 --- a/src/main/java/vswe/stevescarts/Arcade/ArcadeGame.java +++ b/src/main/java/vswe/stevescarts/Arcade/ArcadeGame.java @@ -3,14 +3,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.SoundHandler; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.Realtimers.ModuleArcade; import vswe.stevescarts.StevesCarts; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class ArcadeGame { diff --git a/src/main/java/vswe/stevescarts/Arcade/ArcadeInvaders.java b/src/main/java/vswe/stevescarts/Arcade/ArcadeInvaders.java index 2ad58346..149cff80 100644 --- a/src/main/java/vswe/stevescarts/Arcade/ArcadeInvaders.java +++ b/src/main/java/vswe/stevescarts/Arcade/ArcadeInvaders.java @@ -7,14 +7,14 @@ import org.lwjgl.input.Keyboard; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Arcade.Unit.UPDATE_RESULT; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.Realtimers.ModuleArcade; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ArcadeInvaders extends ArcadeGame { diff --git a/src/main/java/vswe/stevescarts/Arcade/ArcadeMonopoly.java b/src/main/java/vswe/stevescarts/Arcade/ArcadeMonopoly.java index 4cbb87b9..5dfa276a 100644 --- a/src/main/java/vswe/stevescarts/Arcade/ArcadeMonopoly.java +++ b/src/main/java/vswe/stevescarts/Arcade/ArcadeMonopoly.java @@ -5,6 +5,8 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Arcade.Piece.CONTROLLED_BY; import vswe.stevescarts.Arcade.Place.PLACE_STATE; import vswe.stevescarts.Carts.MinecartModular; @@ -12,8 +14,6 @@ import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.Realtimers.ModuleArcade; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ArcadeMonopoly extends ArcadeGame { diff --git a/src/main/java/vswe/stevescarts/Arcade/ArcadeSweeper.java b/src/main/java/vswe/stevescarts/Arcade/ArcadeSweeper.java index 80af214b..e72e8b33 100644 --- a/src/main/java/vswe/stevescarts/Arcade/ArcadeSweeper.java +++ b/src/main/java/vswe/stevescarts/Arcade/ArcadeSweeper.java @@ -3,6 +3,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Arcade.Tile.TILE_OPEN_RESULT; import vswe.stevescarts.Arcade.Tile.TILE_STATE; import vswe.stevescarts.Carts.MinecartModular; @@ -10,8 +12,6 @@ import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.Realtimers.ModuleArcade; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ArcadeSweeper extends ArcadeGame { diff --git a/src/main/java/vswe/stevescarts/Arcade/ArcadeTetris.java b/src/main/java/vswe/stevescarts/Arcade/ArcadeTetris.java index f01ae17f..e19c6f68 100644 --- a/src/main/java/vswe/stevescarts/Arcade/ArcadeTetris.java +++ b/src/main/java/vswe/stevescarts/Arcade/ArcadeTetris.java @@ -3,14 +3,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Arcade.TetrisPiece.MOVE_RESULT; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.Realtimers.ModuleArcade; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ArcadeTetris extends ArcadeGame { diff --git a/src/main/java/vswe/stevescarts/Arcade/ArcadeTracks.java b/src/main/java/vswe/stevescarts/Arcade/ArcadeTracks.java index 90660e06..ec408b73 100644 --- a/src/main/java/vswe/stevescarts/Arcade/ArcadeTracks.java +++ b/src/main/java/vswe/stevescarts/Arcade/ArcadeTracks.java @@ -5,6 +5,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Arcade.TrackOrientation.DIRECTION; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; @@ -12,8 +14,6 @@ import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.Realtimers.ModuleArcade; import vswe.stevescarts.StevesCarts; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ArcadeTracks extends ArcadeGame { diff --git a/src/main/java/vswe/stevescarts/Arcade/Building.java b/src/main/java/vswe/stevescarts/Arcade/Building.java index 7dd35db8..3cddb2dc 100644 --- a/src/main/java/vswe/stevescarts/Arcade/Building.java +++ b/src/main/java/vswe/stevescarts/Arcade/Building.java @@ -1,6 +1,5 @@ package vswe.stevescarts.Arcade; -import vswe.stevescarts.Arcade.Unit.UPDATE_RESULT; import vswe.stevescarts.Interfaces.GuiMinecart; public class Building extends Unit { diff --git a/src/main/java/vswe/stevescarts/Arcade/Community.java b/src/main/java/vswe/stevescarts/Arcade/Community.java index ce335e06..7e4d57ee 100644 --- a/src/main/java/vswe/stevescarts/Arcade/Community.java +++ b/src/main/java/vswe/stevescarts/Arcade/Community.java @@ -2,7 +2,6 @@ import java.util.EnumSet; -import vswe.stevescarts.Arcade.Place.PLACE_STATE; import vswe.stevescarts.Interfaces.GuiMinecart; public class Community extends CardPlace { diff --git a/src/main/java/vswe/stevescarts/Arcade/CornerPlace.java b/src/main/java/vswe/stevescarts/Arcade/CornerPlace.java index cb20ecdd..34aaad19 100644 --- a/src/main/java/vswe/stevescarts/Arcade/CornerPlace.java +++ b/src/main/java/vswe/stevescarts/Arcade/CornerPlace.java @@ -2,7 +2,6 @@ import java.util.EnumSet; -import vswe.stevescarts.Arcade.Place.PLACE_STATE; import vswe.stevescarts.Interfaces.GuiMinecart; public class CornerPlace extends Place { diff --git a/src/main/java/vswe/stevescarts/Arcade/Go.java b/src/main/java/vswe/stevescarts/Arcade/Go.java index 089b81b0..82df175d 100644 --- a/src/main/java/vswe/stevescarts/Arcade/Go.java +++ b/src/main/java/vswe/stevescarts/Arcade/Go.java @@ -2,7 +2,6 @@ import java.util.EnumSet; -import vswe.stevescarts.Arcade.Place.PLACE_STATE; import vswe.stevescarts.Interfaces.GuiMinecart; public class Go extends CornerPlace { diff --git a/src/main/java/vswe/stevescarts/Arcade/InvaderGhast.java b/src/main/java/vswe/stevescarts/Arcade/InvaderGhast.java index 3762c648..798361ca 100644 --- a/src/main/java/vswe/stevescarts/Arcade/InvaderGhast.java +++ b/src/main/java/vswe/stevescarts/Arcade/InvaderGhast.java @@ -1,6 +1,5 @@ package vswe.stevescarts.Arcade; -import vswe.stevescarts.Arcade.Unit.UPDATE_RESULT; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Interfaces.GuiMinecart; diff --git a/src/main/java/vswe/stevescarts/Arcade/Player.java b/src/main/java/vswe/stevescarts/Arcade/Player.java index a955542c..bea1c789 100644 --- a/src/main/java/vswe/stevescarts/Arcade/Player.java +++ b/src/main/java/vswe/stevescarts/Arcade/Player.java @@ -1,6 +1,5 @@ package vswe.stevescarts.Arcade; -import vswe.stevescarts.Arcade.Unit.UPDATE_RESULT; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Interfaces.GuiMinecart; diff --git a/src/main/java/vswe/stevescarts/Arcade/Property.java b/src/main/java/vswe/stevescarts/Arcade/Property.java index 8f3968df..302be18c 100644 --- a/src/main/java/vswe/stevescarts/Arcade/Property.java +++ b/src/main/java/vswe/stevescarts/Arcade/Property.java @@ -2,7 +2,6 @@ import java.util.EnumSet; -import vswe.stevescarts.Arcade.Place.PLACE_STATE; import vswe.stevescarts.Interfaces.GuiMinecart; public abstract class Property extends Place { diff --git a/src/main/java/vswe/stevescarts/Arcade/Station.java b/src/main/java/vswe/stevescarts/Arcade/Station.java index 85dbddf0..268d352f 100644 --- a/src/main/java/vswe/stevescarts/Arcade/Station.java +++ b/src/main/java/vswe/stevescarts/Arcade/Station.java @@ -2,7 +2,6 @@ import java.util.EnumSet; -import vswe.stevescarts.Arcade.Place.PLACE_STATE; import vswe.stevescarts.Interfaces.GuiMinecart; public class Station extends Property { diff --git a/src/main/java/vswe/stevescarts/Arcade/Street.java b/src/main/java/vswe/stevescarts/Arcade/Street.java index 4ba1fa3b..f1dd68f6 100644 --- a/src/main/java/vswe/stevescarts/Arcade/Street.java +++ b/src/main/java/vswe/stevescarts/Arcade/Street.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; -import vswe.stevescarts.Arcade.Place.PLACE_STATE; import vswe.stevescarts.Interfaces.GuiMinecart; public class Street extends Property { diff --git a/src/main/java/vswe/stevescarts/Arcade/TrackLevel.java b/src/main/java/vswe/stevescarts/Arcade/TrackLevel.java index 13d54b90..1aa6565d 100644 --- a/src/main/java/vswe/stevescarts/Arcade/TrackLevel.java +++ b/src/main/java/vswe/stevescarts/Arcade/TrackLevel.java @@ -12,10 +12,10 @@ import net.minecraft.client.Minecraft; -import vswe.stevescarts.Arcade.TrackOrientation.DIRECTION; -import vswe.stevescarts.Helpers.Localization; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Arcade.TrackOrientation.DIRECTION; +import vswe.stevescarts.Helpers.Localization; public class TrackLevel { diff --git a/src/main/java/vswe/stevescarts/Arcade/TrackOrientation.java b/src/main/java/vswe/stevescarts/Arcade/TrackOrientation.java index 47263fdd..f1aa57fb 100644 --- a/src/main/java/vswe/stevescarts/Arcade/TrackOrientation.java +++ b/src/main/java/vswe/stevescarts/Arcade/TrackOrientation.java @@ -2,7 +2,6 @@ import java.util.ArrayList; -import vswe.stevescarts.Arcade.TrackOrientation.DIRECTION; import vswe.stevescarts.Interfaces.GuiBase.RENDER_ROTATION; public abstract class TrackOrientation { diff --git a/src/main/java/vswe/stevescarts/Blocks/BlockActivator.java b/src/main/java/vswe/stevescarts/Blocks/BlockActivator.java index 87c77abf..9aae4f3a 100644 --- a/src/main/java/vswe/stevescarts/Blocks/BlockActivator.java +++ b/src/main/java/vswe/stevescarts/Blocks/BlockActivator.java @@ -7,11 +7,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vswe.stevescarts.StevesCarts; -import vswe.stevescarts.TileEntities.TileEntityActivator; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.StevesCarts; +import vswe.stevescarts.TileEntities.TileEntityActivator; public class BlockActivator extends BlockContainerBase { diff --git a/src/main/java/vswe/stevescarts/Blocks/BlockCargoManager.java b/src/main/java/vswe/stevescarts/Blocks/BlockCargoManager.java index d56c05db..9a7dcb6e 100644 --- a/src/main/java/vswe/stevescarts/Blocks/BlockCargoManager.java +++ b/src/main/java/vswe/stevescarts/Blocks/BlockCargoManager.java @@ -11,11 +11,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vswe.stevescarts.StevesCarts; -import vswe.stevescarts.TileEntities.TileEntityCargo; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.StevesCarts; +import vswe.stevescarts.TileEntities.TileEntityCargo; public class BlockCargoManager extends BlockContainerBase { diff --git a/src/main/java/vswe/stevescarts/Blocks/BlockCartAssembler.java b/src/main/java/vswe/stevescarts/Blocks/BlockCartAssembler.java index 9489929d..50252325 100644 --- a/src/main/java/vswe/stevescarts/Blocks/BlockCartAssembler.java +++ b/src/main/java/vswe/stevescarts/Blocks/BlockCartAssembler.java @@ -13,13 +13,13 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.PacketHandler; import vswe.stevescarts.StevesCarts; import vswe.stevescarts.TileEntities.TileEntityCartAssembler; import vswe.stevescarts.TileEntities.TileEntityUpgrade; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockCartAssembler extends BlockContainerBase { diff --git a/src/main/java/vswe/stevescarts/Blocks/BlockDetector.java b/src/main/java/vswe/stevescarts/Blocks/BlockDetector.java index 771619f5..206da600 100644 --- a/src/main/java/vswe/stevescarts/Blocks/BlockDetector.java +++ b/src/main/java/vswe/stevescarts/Blocks/BlockDetector.java @@ -14,12 +14,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import vswe.stevescarts.Helpers.DetectorType; -import vswe.stevescarts.StevesCarts; -import vswe.stevescarts.TileEntities.TileEntityDetector; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.DetectorType; +import vswe.stevescarts.StevesCarts; +import vswe.stevescarts.TileEntities.TileEntityDetector; public class BlockDetector extends BlockContainerBase { diff --git a/src/main/java/vswe/stevescarts/Blocks/BlockDistributor.java b/src/main/java/vswe/stevescarts/Blocks/BlockDistributor.java index a8644c99..7a8a03d3 100644 --- a/src/main/java/vswe/stevescarts/Blocks/BlockDistributor.java +++ b/src/main/java/vswe/stevescarts/Blocks/BlockDistributor.java @@ -7,11 +7,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vswe.stevescarts.StevesCarts; -import vswe.stevescarts.TileEntities.TileEntityDistributor; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.StevesCarts; +import vswe.stevescarts.TileEntities.TileEntityDistributor; public class BlockDistributor extends BlockContainerBase { diff --git a/src/main/java/vswe/stevescarts/Blocks/BlockLiquidManager.java b/src/main/java/vswe/stevescarts/Blocks/BlockLiquidManager.java index 4518de44..bd67a16f 100644 --- a/src/main/java/vswe/stevescarts/Blocks/BlockLiquidManager.java +++ b/src/main/java/vswe/stevescarts/Blocks/BlockLiquidManager.java @@ -11,11 +11,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vswe.stevescarts.StevesCarts; -import vswe.stevescarts.TileEntities.TileEntityLiquid; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.StevesCarts; +import vswe.stevescarts.TileEntities.TileEntityLiquid; public class BlockLiquidManager extends BlockContainerBase { diff --git a/src/main/java/vswe/stevescarts/Blocks/BlockMetalStorage.java b/src/main/java/vswe/stevescarts/Blocks/BlockMetalStorage.java index 4b354a03..9acf063c 100644 --- a/src/main/java/vswe/stevescarts/Blocks/BlockMetalStorage.java +++ b/src/main/java/vswe/stevescarts/Blocks/BlockMetalStorage.java @@ -5,10 +5,10 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import vswe.stevescarts.Items.ModItems; -import vswe.stevescarts.StevesCarts; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Items.ModItems; +import vswe.stevescarts.StevesCarts; public class BlockMetalStorage extends Block implements IBlockBase { diff --git a/src/main/java/vswe/stevescarts/Blocks/BlockRailAdvDetector.java b/src/main/java/vswe/stevescarts/Blocks/BlockRailAdvDetector.java index d5a45107..4ffcf2ea 100644 --- a/src/main/java/vswe/stevescarts/Blocks/BlockRailAdvDetector.java +++ b/src/main/java/vswe/stevescarts/Blocks/BlockRailAdvDetector.java @@ -10,6 +10,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.DetectorType; import vswe.stevescarts.ModuleData.ModuleData; @@ -21,8 +23,6 @@ import vswe.stevescarts.Upgrades.BaseEffect; import vswe.stevescarts.Upgrades.Disassemble; import vswe.stevescarts.Upgrades.Transposer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockRailAdvDetector extends BlockSpecialRailBase { diff --git a/src/main/java/vswe/stevescarts/Blocks/BlockRailJunction.java b/src/main/java/vswe/stevescarts/Blocks/BlockRailJunction.java index 7439bfc2..9dce7321 100644 --- a/src/main/java/vswe/stevescarts/Blocks/BlockRailJunction.java +++ b/src/main/java/vswe/stevescarts/Blocks/BlockRailJunction.java @@ -5,10 +5,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import vswe.stevescarts.Carts.MinecartModular; -import vswe.stevescarts.StevesCarts; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Carts.MinecartModular; +import vswe.stevescarts.StevesCarts; public class BlockRailJunction extends BlockSpecialRailBase { diff --git a/src/main/java/vswe/stevescarts/Blocks/BlockUpgrade.java b/src/main/java/vswe/stevescarts/Blocks/BlockUpgrade.java index 7e613f6d..8c0d742e 100644 --- a/src/main/java/vswe/stevescarts/Blocks/BlockUpgrade.java +++ b/src/main/java/vswe/stevescarts/Blocks/BlockUpgrade.java @@ -15,14 +15,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Items.ModItems; import vswe.stevescarts.StevesCarts; import vswe.stevescarts.TileEntities.TileEntityCartAssembler; import vswe.stevescarts.TileEntities.TileEntityUpgrade; import vswe.stevescarts.Upgrades.AssemblerUpgrade; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockUpgrade extends BlockContainerBase { diff --git a/src/main/java/vswe/stevescarts/Blocks/ModBlocks.java b/src/main/java/vswe/stevescarts/Blocks/ModBlocks.java index cd842ac2..be81cd5e 100644 --- a/src/main/java/vswe/stevescarts/Blocks/ModBlocks.java +++ b/src/main/java/vswe/stevescarts/Blocks/ModBlocks.java @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.registry.GameRegistry; import vswe.stevescarts.Helpers.ComponentTypes; import vswe.stevescarts.Helpers.RecipeHelper; import vswe.stevescarts.Items.ItemBlockDetector; @@ -16,8 +17,13 @@ import vswe.stevescarts.Items.ItemUpgrade; import vswe.stevescarts.Items.ModItems; import vswe.stevescarts.StevesCarts; -import vswe.stevescarts.TileEntities.*; -import cpw.mods.fml.common.registry.GameRegistry; +import vswe.stevescarts.TileEntities.TileEntityActivator; +import vswe.stevescarts.TileEntities.TileEntityCargo; +import vswe.stevescarts.TileEntities.TileEntityCartAssembler; +import vswe.stevescarts.TileEntities.TileEntityDetector; +import vswe.stevescarts.TileEntities.TileEntityDistributor; +import vswe.stevescarts.TileEntities.TileEntityLiquid; +import vswe.stevescarts.TileEntities.TileEntityUpgrade; public enum ModBlocks { diff --git a/src/main/java/vswe/stevescarts/Buttons/ButtonBase.java b/src/main/java/vswe/stevescarts/Buttons/ButtonBase.java index cf1a50ed..1a271764 100644 --- a/src/main/java/vswe/stevescarts/Buttons/ButtonBase.java +++ b/src/main/java/vswe/stevescarts/Buttons/ButtonBase.java @@ -3,11 +3,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.ModuleBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class ButtonBase { diff --git a/src/main/java/vswe/stevescarts/Carts/MinecartModular.java b/src/main/java/vswe/stevescarts/Carts/MinecartModular.java index 73cb2850..cb1f1009 100644 --- a/src/main/java/vswe/stevescarts/Carts/MinecartModular.java +++ b/src/main/java/vswe/stevescarts/Carts/MinecartModular.java @@ -37,6 +37,12 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import cpw.mods.fml.relauncher.ReflectionHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; import vswe.stevescarts.Blocks.ModBlocks; import vswe.stevescarts.Containers.ContainerMinecart; import vswe.stevescarts.Helpers.ActivatorOption; @@ -61,12 +67,6 @@ import vswe.stevescarts.Modules.Workers.Tools.ModuleTool; import vswe.stevescarts.StevesCarts; import vswe.stevescarts.TileEntities.TileEntityCartAssembler; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; /** * The modular minecart class, this is the cart. This is what controls all modules whereas the diff --git a/src/main/java/vswe/stevescarts/ClientProxy.java b/src/main/java/vswe/stevescarts/ClientProxy.java index e6096dbc..37c2ec90 100644 --- a/src/main/java/vswe/stevescarts/ClientProxy.java +++ b/src/main/java/vswe/stevescarts/ClientProxy.java @@ -4,16 +4,20 @@ import net.minecraft.init.Items; import net.minecraft.world.World; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Fancy.FancyPancyLoader; -import vswe.stevescarts.Helpers.*; +import vswe.stevescarts.Helpers.ComponentTypes; +import vswe.stevescarts.Helpers.EntityCake; +import vswe.stevescarts.Helpers.EntityEasterEgg; +import vswe.stevescarts.Helpers.MinecartSoundMuter; +import vswe.stevescarts.Helpers.SoundHandler; import vswe.stevescarts.Items.ModItems; import vswe.stevescarts.ModuleData.ModuleData; import vswe.stevescarts.Renders.RendererMinecart; import vswe.stevescarts.Renders.RendererMinecartItem; import vswe.stevescarts.Renders.RendererUpgrade; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/vswe/stevescarts/CommonProxy.java b/src/main/java/vswe/stevescarts/CommonProxy.java index 045255d8..66568bfc 100644 --- a/src/main/java/vswe/stevescarts/CommonProxy.java +++ b/src/main/java/vswe/stevescarts/CommonProxy.java @@ -5,9 +5,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.TileEntities.TileEntityBase; -import cpw.mods.fml.common.network.IGuiHandler; public class CommonProxy implements IGuiHandler { diff --git a/src/main/java/vswe/stevescarts/Containers/ContainerBase.java b/src/main/java/vswe/stevescarts/Containers/ContainerBase.java index f313e753..2d7de546 100644 --- a/src/main/java/vswe/stevescarts/Containers/ContainerBase.java +++ b/src/main/java/vswe/stevescarts/Containers/ContainerBase.java @@ -9,11 +9,11 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.TransferHandler; import vswe.stevescarts.Helpers.TransferHandler.TRANSFER_TYPE; import vswe.stevescarts.TileEntities.TileEntityBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class ContainerBase extends Container { diff --git a/src/main/java/vswe/stevescarts/Containers/ContainerCartAssembler.java b/src/main/java/vswe/stevescarts/Containers/ContainerCartAssembler.java index 569acac3..0f18bee6 100644 --- a/src/main/java/vswe/stevescarts/Containers/ContainerCartAssembler.java +++ b/src/main/java/vswe/stevescarts/Containers/ContainerCartAssembler.java @@ -10,12 +10,12 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Slots.SlotAssembler; import vswe.stevescarts.Slots.SlotHull; import vswe.stevescarts.TileEntities.TileEntityBase; import vswe.stevescarts.TileEntities.TileEntityCartAssembler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ContainerCartAssembler extends ContainerBase { diff --git a/src/main/java/vswe/stevescarts/Containers/ContainerMinecart.java b/src/main/java/vswe/stevescarts/Containers/ContainerMinecart.java index 34a0469b..ec86b1cc 100644 --- a/src/main/java/vswe/stevescarts/Containers/ContainerMinecart.java +++ b/src/main/java/vswe/stevescarts/Containers/ContainerMinecart.java @@ -9,12 +9,12 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Slots.SlotBase; import vswe.stevescarts.TileEntities.TileEntityBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ContainerMinecart extends ContainerBase { diff --git a/src/main/java/vswe/stevescarts/Fancy/FancyPancyHandler.java b/src/main/java/vswe/stevescarts/Fancy/FancyPancyHandler.java index 7ded1905..9834b550 100644 --- a/src/main/java/vswe/stevescarts/Fancy/FancyPancyHandler.java +++ b/src/main/java/vswe/stevescarts/Fancy/FancyPancyHandler.java @@ -2,7 +2,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.*; +import java.util.HashMap; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; @@ -15,13 +15,13 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StringUtils; -import vswe.stevescarts.Helpers.ResourceHelper; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; @SideOnly(Side.CLIENT) public abstract class FancyPancyHandler { diff --git a/src/main/java/vswe/stevescarts/Helpers/CraftingHandler.java b/src/main/java/vswe/stevescarts/Helpers/CraftingHandler.java index 751153cd..10bd2ca2 100644 --- a/src/main/java/vswe/stevescarts/Helpers/CraftingHandler.java +++ b/src/main/java/vswe/stevescarts/Helpers/CraftingHandler.java @@ -4,10 +4,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import vswe.stevescarts.Items.ModItems; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; +import vswe.stevescarts.Items.ModItems; public class CraftingHandler { diff --git a/src/main/java/vswe/stevescarts/Helpers/DropDownMenu.java b/src/main/java/vswe/stevescarts/Helpers/DropDownMenu.java index c73de09b..b036a2e9 100644 --- a/src/main/java/vswe/stevescarts/Helpers/DropDownMenu.java +++ b/src/main/java/vswe/stevescarts/Helpers/DropDownMenu.java @@ -4,9 +4,9 @@ import net.minecraft.util.IIcon; -import vswe.stevescarts.Interfaces.GuiDetector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Interfaces.GuiDetector; @SideOnly(Side.CLIENT) public class DropDownMenu { diff --git a/src/main/java/vswe/stevescarts/Helpers/EnchantmentInfo.java b/src/main/java/vswe/stevescarts/Helpers/EnchantmentInfo.java index 2eb2a3b2..72deaea1 100644 --- a/src/main/java/vswe/stevescarts/Helpers/EnchantmentInfo.java +++ b/src/main/java/vswe/stevescarts/Helpers/EnchantmentInfo.java @@ -7,8 +7,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagList; -import vswe.stevescarts.Helpers.EnchantmentInfo.ENCHANTMENT_TYPE; - public class EnchantmentInfo { private Enchantment enchantment; diff --git a/src/main/java/vswe/stevescarts/Helpers/ITankHolder.java b/src/main/java/vswe/stevescarts/Helpers/ITankHolder.java index 71aa3dfb..fab0d586 100644 --- a/src/main/java/vswe/stevescarts/Helpers/ITankHolder.java +++ b/src/main/java/vswe/stevescarts/Helpers/ITankHolder.java @@ -3,9 +3,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import vswe.stevescarts.Interfaces.GuiBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Interfaces.GuiBase; public interface ITankHolder { diff --git a/src/main/java/vswe/stevescarts/Helpers/LogicObject.java b/src/main/java/vswe/stevescarts/Helpers/LogicObject.java index 90d88f27..e31844ea 100644 --- a/src/main/java/vswe/stevescarts/Helpers/LogicObject.java +++ b/src/main/java/vswe/stevescarts/Helpers/LogicObject.java @@ -4,14 +4,14 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Interfaces.GuiDetector; import vswe.stevescarts.ModuleData.ModuleData; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.PacketHandler; import vswe.stevescarts.TileEntities.TileEntityDetector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class LogicObject { diff --git a/src/main/java/vswe/stevescarts/Helpers/MinecartSoundMuter.java b/src/main/java/vswe/stevescarts/Helpers/MinecartSoundMuter.java index e8ca55fd..45c836fd 100644 --- a/src/main/java/vswe/stevescarts/Helpers/MinecartSoundMuter.java +++ b/src/main/java/vswe/stevescarts/Helpers/MinecartSoundMuter.java @@ -7,9 +7,9 @@ import net.minecraftforge.client.event.sound.PlaySoundEvent17; import net.minecraftforge.common.MinecraftForge; -import vswe.stevescarts.Carts.MinecartModular; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.ReflectionHelper; +import vswe.stevescarts.Carts.MinecartModular; public class MinecartSoundMuter { diff --git a/src/main/java/vswe/stevescarts/Helpers/RecipeHelper.java b/src/main/java/vswe/stevescarts/Helpers/RecipeHelper.java index 0177c58a..91b5135a 100644 --- a/src/main/java/vswe/stevescarts/Helpers/RecipeHelper.java +++ b/src/main/java/vswe/stevescarts/Helpers/RecipeHelper.java @@ -8,8 +8,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; -import vswe.stevescarts.Items.ModItems; import cpw.mods.fml.common.registry.GameRegistry; +import vswe.stevescarts.Items.ModItems; public final class RecipeHelper { diff --git a/src/main/java/vswe/stevescarts/Helpers/Tank.java b/src/main/java/vswe/stevescarts/Helpers/Tank.java index 67581eb6..e12ebb88 100644 --- a/src/main/java/vswe/stevescarts/Helpers/Tank.java +++ b/src/main/java/vswe/stevescarts/Helpers/Tank.java @@ -13,9 +13,9 @@ import org.lwjgl.opengl.GL11; -import vswe.stevescarts.Interfaces.GuiBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Interfaces.GuiBase; public class Tank implements IFluidTank { diff --git a/src/main/java/vswe/stevescarts/Helpers/TradeHandler.java b/src/main/java/vswe/stevescarts/Helpers/TradeHandler.java index ca30288d..6a97471b 100644 --- a/src/main/java/vswe/stevescarts/Helpers/TradeHandler.java +++ b/src/main/java/vswe/stevescarts/Helpers/TradeHandler.java @@ -7,8 +7,8 @@ import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; -import vswe.stevescarts.Items.ModItems; import cpw.mods.fml.common.registry.VillagerRegistry; +import vswe.stevescarts.Items.ModItems; public class TradeHandler implements VillagerRegistry.IVillageTradeHandler { diff --git a/src/main/java/vswe/stevescarts/Helpers/WoodFuelHandler.java b/src/main/java/vswe/stevescarts/Helpers/WoodFuelHandler.java index 08d5bad6..3801c16b 100644 --- a/src/main/java/vswe/stevescarts/Helpers/WoodFuelHandler.java +++ b/src/main/java/vswe/stevescarts/Helpers/WoodFuelHandler.java @@ -2,10 +2,10 @@ import net.minecraft.item.ItemStack; -import vswe.stevescarts.Items.ItemCartComponent; -import vswe.stevescarts.Items.ModItems; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.registry.GameRegistry; +import vswe.stevescarts.Items.ItemCartComponent; +import vswe.stevescarts.Items.ModItems; public class WoodFuelHandler implements IFuelHandler { diff --git a/src/main/java/vswe/stevescarts/Interfaces/GuiActivator.java b/src/main/java/vswe/stevescarts/Interfaces/GuiActivator.java index b7f214d9..ed4a49d3 100644 --- a/src/main/java/vswe/stevescarts/Interfaces/GuiActivator.java +++ b/src/main/java/vswe/stevescarts/Interfaces/GuiActivator.java @@ -5,14 +5,14 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Containers.ContainerActivator; import vswe.stevescarts.Helpers.ActivatorOption; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.PacketHandler; import vswe.stevescarts.TileEntities.TileEntityActivator; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiActivator extends GuiBase { diff --git a/src/main/java/vswe/stevescarts/Interfaces/GuiCargo.java b/src/main/java/vswe/stevescarts/Interfaces/GuiCargo.java index 5c28142f..bb40f83a 100644 --- a/src/main/java/vswe/stevescarts/Interfaces/GuiCargo.java +++ b/src/main/java/vswe/stevescarts/Interfaces/GuiCargo.java @@ -9,14 +9,14 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Blocks.ModBlocks; import vswe.stevescarts.Containers.ContainerCargo; import vswe.stevescarts.Helpers.CargoItemSelection; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.TileEntities.TileEntityCargo; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiCargo extends GuiManager { diff --git a/src/main/java/vswe/stevescarts/Interfaces/GuiCartAssembler.java b/src/main/java/vswe/stevescarts/Interfaces/GuiCartAssembler.java index 82bbb8fd..43973b85 100644 --- a/src/main/java/vswe/stevescarts/Interfaces/GuiCartAssembler.java +++ b/src/main/java/vswe/stevescarts/Interfaces/GuiCartAssembler.java @@ -13,6 +13,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Containers.ContainerCartAssembler; import vswe.stevescarts.Helpers.DropDownMenuItem; import vswe.stevescarts.Helpers.Localization; @@ -25,8 +27,6 @@ import vswe.stevescarts.Slots.SlotAssembler; import vswe.stevescarts.StevesCarts; import vswe.stevescarts.TileEntities.TileEntityCartAssembler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiCartAssembler extends GuiBase { diff --git a/src/main/java/vswe/stevescarts/Interfaces/GuiDetector.java b/src/main/java/vswe/stevescarts/Interfaces/GuiDetector.java index dce7c147..bbfbed7a 100644 --- a/src/main/java/vswe/stevescarts/Interfaces/GuiDetector.java +++ b/src/main/java/vswe/stevescarts/Interfaces/GuiDetector.java @@ -7,6 +7,8 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Containers.ContainerDetector; import vswe.stevescarts.Helpers.DetectorType; import vswe.stevescarts.Helpers.DropDownMenu; @@ -17,8 +19,6 @@ import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.ModuleData.ModuleData; import vswe.stevescarts.TileEntities.TileEntityDetector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiDetector extends GuiBase { diff --git a/src/main/java/vswe/stevescarts/Interfaces/GuiDistributor.java b/src/main/java/vswe/stevescarts/Interfaces/GuiDistributor.java index ce731a0f..34e2460a 100644 --- a/src/main/java/vswe/stevescarts/Interfaces/GuiDistributor.java +++ b/src/main/java/vswe/stevescarts/Interfaces/GuiDistributor.java @@ -7,6 +7,8 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Containers.ContainerDistributor; import vswe.stevescarts.Helpers.DistributorSetting; import vswe.stevescarts.Helpers.DistributorSide; @@ -14,8 +16,6 @@ import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.TileEntities.TileEntityDistributor; import vswe.stevescarts.TileEntities.TileEntityManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiDistributor extends GuiBase { diff --git a/src/main/java/vswe/stevescarts/Interfaces/GuiLiquid.java b/src/main/java/vswe/stevescarts/Interfaces/GuiLiquid.java index 2ec0955e..a51c4e50 100644 --- a/src/main/java/vswe/stevescarts/Interfaces/GuiLiquid.java +++ b/src/main/java/vswe/stevescarts/Interfaces/GuiLiquid.java @@ -4,13 +4,13 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Blocks.ModBlocks; import vswe.stevescarts.Containers.ContainerLiquid; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.TileEntities.TileEntityLiquid; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiLiquid extends GuiManager { diff --git a/src/main/java/vswe/stevescarts/Interfaces/GuiManager.java b/src/main/java/vswe/stevescarts/Interfaces/GuiManager.java index 13679ece..23ba9db1 100644 --- a/src/main/java/vswe/stevescarts/Interfaces/GuiManager.java +++ b/src/main/java/vswe/stevescarts/Interfaces/GuiManager.java @@ -7,11 +7,11 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Containers.ContainerManager; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.TileEntities.TileEntityManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public abstract class GuiManager extends GuiBase { diff --git a/src/main/java/vswe/stevescarts/Interfaces/GuiMinecart.java b/src/main/java/vswe/stevescarts/Interfaces/GuiMinecart.java index 1108c3d6..7abc6718 100644 --- a/src/main/java/vswe/stevescarts/Interfaces/GuiMinecart.java +++ b/src/main/java/vswe/stevescarts/Interfaces/GuiMinecart.java @@ -9,13 +9,13 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.ModuleCountPair; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Slots.SlotBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiMinecart extends GuiBase { diff --git a/src/main/java/vswe/stevescarts/Interfaces/GuiUpgrade.java b/src/main/java/vswe/stevescarts/Interfaces/GuiUpgrade.java index 9f675a3f..07db9e24 100644 --- a/src/main/java/vswe/stevescarts/Interfaces/GuiUpgrade.java +++ b/src/main/java/vswe/stevescarts/Interfaces/GuiUpgrade.java @@ -5,13 +5,13 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Containers.ContainerUpgrade; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.TileEntities.TileEntityUpgrade; import vswe.stevescarts.Upgrades.InterfaceEffect; import vswe.stevescarts.Upgrades.InventoryEffect; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiUpgrade extends GuiBase { diff --git a/src/main/java/vswe/stevescarts/Items/ItemBlockStorage.java b/src/main/java/vswe/stevescarts/Items/ItemBlockStorage.java index 6af4a9a4..cb6ba5d5 100644 --- a/src/main/java/vswe/stevescarts/Items/ItemBlockStorage.java +++ b/src/main/java/vswe/stevescarts/Items/ItemBlockStorage.java @@ -10,11 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ComponentTypes; import vswe.stevescarts.Helpers.StorageBlock; import vswe.stevescarts.StevesCarts; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockStorage extends ItemBlock { diff --git a/src/main/java/vswe/stevescarts/Items/ItemCartComponent.java b/src/main/java/vswe/stevescarts/Items/ItemCartComponent.java index 3c185d30..66acbde8 100644 --- a/src/main/java/vswe/stevescarts/Items/ItemCartComponent.java +++ b/src/main/java/vswe/stevescarts/Items/ItemCartComponent.java @@ -13,11 +13,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ComponentTypes; import vswe.stevescarts.Helpers.EntityEasterEgg; import vswe.stevescarts.StevesCarts; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemCartComponent extends Item { diff --git a/src/main/java/vswe/stevescarts/Items/ItemCartModule.java b/src/main/java/vswe/stevescarts/Items/ItemCartModule.java index 2fbb92ea..a94d294b 100644 --- a/src/main/java/vswe/stevescarts/Items/ItemCartModule.java +++ b/src/main/java/vswe/stevescarts/Items/ItemCartModule.java @@ -10,12 +10,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.ModuleData.ModuleData; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.StevesCarts; import vswe.stevescarts.TileEntities.TileEntityCartAssembler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemCartModule extends Item { diff --git a/src/main/java/vswe/stevescarts/Items/ItemCarts.java b/src/main/java/vswe/stevescarts/Items/ItemCarts.java index 6b5ee814..8f2386f4 100644 --- a/src/main/java/vswe/stevescarts/Items/ItemCarts.java +++ b/src/main/java/vswe/stevescarts/Items/ItemCarts.java @@ -14,14 +14,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.CartVersion; import vswe.stevescarts.Helpers.ColorHelper; import vswe.stevescarts.Helpers.ModuleCountPair; import vswe.stevescarts.ModuleData.ModuleData; import vswe.stevescarts.StevesCarts; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemCarts extends ItemMinecart { diff --git a/src/main/java/vswe/stevescarts/Items/ItemUpgrade.java b/src/main/java/vswe/stevescarts/Items/ItemUpgrade.java index f711293b..6eb4fc90 100644 --- a/src/main/java/vswe/stevescarts/Items/ItemUpgrade.java +++ b/src/main/java/vswe/stevescarts/Items/ItemUpgrade.java @@ -13,12 +13,12 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.StevesCarts; import vswe.stevescarts.TileEntities.TileEntityUpgrade; import vswe.stevescarts.Upgrades.AssemblerUpgrade; import vswe.stevescarts.Upgrades.BaseEffect; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemUpgrade extends ItemBlock { diff --git a/src/main/java/vswe/stevescarts/Items/ModItems.java b/src/main/java/vswe/stevescarts/Items/ModItems.java index a12a9eeb..2ad5b4bc 100644 --- a/src/main/java/vswe/stevescarts/Items/ModItems.java +++ b/src/main/java/vswe/stevescarts/Items/ModItems.java @@ -8,6 +8,7 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.common.config.Configuration; +import cpw.mods.fml.common.registry.GameRegistry; import vswe.stevescarts.Blocks.ModBlocks; import vswe.stevescarts.Helpers.ComponentTypes; import vswe.stevescarts.Helpers.DetectorType; @@ -15,7 +16,6 @@ import vswe.stevescarts.ModuleData.ModuleData; import vswe.stevescarts.StevesCarts; import vswe.stevescarts.Upgrades.AssemblerUpgrade; -import cpw.mods.fml.common.registry.GameRegistry; public final class ModItems { diff --git a/src/main/java/vswe/stevescarts/Listeners/ChunkListener.java b/src/main/java/vswe/stevescarts/Listeners/ChunkListener.java index f6ff497a..3fb9ba03 100644 --- a/src/main/java/vswe/stevescarts/Listeners/ChunkListener.java +++ b/src/main/java/vswe/stevescarts/Listeners/ChunkListener.java @@ -3,8 +3,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.EntityEvent; -import vswe.stevescarts.Carts.MinecartModular; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import vswe.stevescarts.Carts.MinecartModular; public class ChunkListener { diff --git a/src/main/java/vswe/stevescarts/Listeners/MobDeathListener.java b/src/main/java/vswe/stevescarts/Listeners/MobDeathListener.java index 1cc3ef28..7d284a15 100644 --- a/src/main/java/vswe/stevescarts/Listeners/MobDeathListener.java +++ b/src/main/java/vswe/stevescarts/Listeners/MobDeathListener.java @@ -8,8 +8,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; -import vswe.stevescarts.Helpers.ComponentTypes; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import vswe.stevescarts.Helpers.ComponentTypes; public class MobDeathListener { diff --git a/src/main/java/vswe/stevescarts/Listeners/MobInteractListener.java b/src/main/java/vswe/stevescarts/Listeners/MobInteractListener.java index 7105e4b8..5555b184 100644 --- a/src/main/java/vswe/stevescarts/Listeners/MobInteractListener.java +++ b/src/main/java/vswe/stevescarts/Listeners/MobInteractListener.java @@ -10,10 +10,10 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.EntityInteractEvent; -import vswe.stevescarts.Helpers.TradeHandler; -import vswe.stevescarts.Items.ModItems; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.VillagerRegistry; +import vswe.stevescarts.Helpers.TradeHandler; +import vswe.stevescarts.Items.ModItems; public class MobInteractListener { diff --git a/src/main/java/vswe/stevescarts/Listeners/OverlayRenderer.java b/src/main/java/vswe/stevescarts/Listeners/OverlayRenderer.java index e7deb32e..fb559f31 100644 --- a/src/main/java/vswe/stevescarts/Listeners/OverlayRenderer.java +++ b/src/main/java/vswe/stevescarts/Listeners/OverlayRenderer.java @@ -2,12 +2,12 @@ import net.minecraft.entity.player.EntityPlayer; -import vswe.stevescarts.Carts.MinecartModular; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Carts.MinecartModular; public class OverlayRenderer { diff --git a/src/main/java/vswe/stevescarts/Listeners/PlayerSleepListener.java b/src/main/java/vswe/stevescarts/Listeners/PlayerSleepListener.java index f864041e..23bafaf6 100644 --- a/src/main/java/vswe/stevescarts/Listeners/PlayerSleepListener.java +++ b/src/main/java/vswe/stevescarts/Listeners/PlayerSleepListener.java @@ -3,12 +3,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import vswe.stevescarts.Items.ModItems; -import vswe.stevescarts.StevesCarts; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; +import vswe.stevescarts.Items.ModItems; +import vswe.stevescarts.StevesCarts; public class PlayerSleepListener { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelAdvancedTank.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelAdvancedTank.java index c147074f..7db26101 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelAdvancedTank.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelAdvancedTank.java @@ -5,12 +5,12 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Storages.Tanks.ModuleTank; import vswe.stevescarts.Renders.RendererMinecart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelAdvancedTank extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelBridge.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelBridge.java index ded71d52..d6e3a872 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelBridge.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelBridge.java @@ -4,11 +4,11 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Workers.ModuleBridge; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelBridge extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelCage.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelCage.java index 43229924..b1e94fbd 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelCage.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelCage.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelCage extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelCake.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelCake.java index d551ad80..bedaa19d 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelCake.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelCake.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Realtimers.ModuleCakeServer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelCake extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelCartbase.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelCartbase.java index ae3881ee..833e8bfa 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelCartbase.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelCartbase.java @@ -7,10 +7,10 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public abstract class ModelCartbase extends ModelBase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelCleaner.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelCleaner.java index 398e5fc9..9863e8f9 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelCleaner.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelCleaner.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelCleaner extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelCompactSolarPanel.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelCompactSolarPanel.java index e5b70d93..2f2ebb9a 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelCompactSolarPanel.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelCompactSolarPanel.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.Engines.ModuleSolarCompact; import vswe.stevescarts.Modules.ModuleBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelCompactSolarPanel extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelDrill.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelDrill.java index 1f451962..e629a06c 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelDrill.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelDrill.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Modules.ModuleBase; -import vswe.stevescarts.Modules.Workers.Tools.ModuleDrill; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.ModuleBase; +import vswe.stevescarts.Modules.Workers.Tools.ModuleDrill; @SideOnly(Side.CLIENT) public class ModelDrill extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelDynamite.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelDynamite.java index 6fe72eec..4c50f6cc 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelDynamite.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelDynamite.java @@ -6,11 +6,11 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Realtimers.ModuleDynamite; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelDynamite extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelEggBasket.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelEggBasket.java index 79824834..f35b30fe 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelEggBasket.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelEggBasket.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Storages.Chests.ModuleEggBasket; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelEggBasket extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelEngineFrame.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelEngineFrame.java index 99f96f2d..c8995474 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelEngineFrame.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelEngineFrame.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelEngineFrame extends ModelEngineBase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelEngineInside.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelEngineInside.java index 6f38eb06..7a3b2ffa 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelEngineInside.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelEngineInside.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.Engines.ModuleCoalBase; import vswe.stevescarts.Modules.ModuleBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelEngineInside extends ModelEngineBase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelExtractingChests.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelExtractingChests.java index f8fbc8fc..020f9896 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelExtractingChests.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelExtractingChests.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Storages.Chests.ModuleExtractingChests; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelExtractingChests extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelFarmer.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelFarmer.java index e0f8cfd7..5a0f8452 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelFarmer.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelFarmer.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Modules.ModuleBase; -import vswe.stevescarts.Modules.Workers.Tools.ModuleFarmer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.ModuleBase; +import vswe.stevescarts.Modules.Workers.Tools.ModuleFarmer; @SideOnly(Side.CLIENT) public class ModelFarmer extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelFrontChest.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelFrontChest.java index 775caa2e..0ae0ad1e 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelFrontChest.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelFrontChest.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Storages.Chests.ModuleChest; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelFrontChest extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelFrontTank.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelFrontTank.java index dd54dbd3..a789760b 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelFrontTank.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelFrontTank.java @@ -5,12 +5,12 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Storages.Tanks.ModuleTank; import vswe.stevescarts.Renders.RendererMinecart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelFrontTank extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelGiftStorage.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelGiftStorage.java index ef648826..16342bdd 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelGiftStorage.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelGiftStorage.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Storages.Chests.ModuleChest; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelGiftStorage extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelGun.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelGun.java index 697dbd52..750730db 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelGun.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelGun.java @@ -5,11 +5,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Realtimers.ModuleShooter; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelGun extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelHull.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelHull.java index 1eea6f18..54c47898 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelHull.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelHull.java @@ -6,9 +6,9 @@ import org.lwjgl.opengl.GL11; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelHull extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelHullTop.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelHullTop.java index 46208fb8..e1fae2b7 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelHullTop.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelHullTop.java @@ -6,9 +6,9 @@ import org.lwjgl.opengl.GL11; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelHullTop extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelLawnMower.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelLawnMower.java index 8b0363a5..ebf10f04 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelLawnMower.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelLawnMower.java @@ -5,11 +5,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Realtimers.ModuleFlowerRemover; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelLawnMower extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelLever.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelLever.java index 8b49de4d..55980b0c 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelLever.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelLever.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Modules.ILeverModule; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.ILeverModule; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelLever extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelLiquidDrainer.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelLiquidDrainer.java index 061f3184..835aabda 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelLiquidDrainer.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelLiquidDrainer.java @@ -1,8 +1,8 @@ package vswe.stevescarts.Models.Cart; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelLiquidDrainer extends ModelCleaner { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelLiquidSensors.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelLiquidSensors.java index 05996775..7ab5eed6 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelLiquidSensors.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelLiquidSensors.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.Addons.ModuleLiquidSensors; import vswe.stevescarts.Modules.ModuleBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelLiquidSensors extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelMobDetector.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelMobDetector.java index 1d7be03c..9d72f5f2 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelMobDetector.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelMobDetector.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Realtimers.ModuleShooterAdv; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelMobDetector extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelNote.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelNote.java index d07b35de..ef800783 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelNote.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelNote.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelNote extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelPigHead.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelPigHead.java index b230745e..d676bbd3 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelPigHead.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelPigHead.java @@ -6,10 +6,10 @@ import org.lwjgl.opengl.GL11; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelPigHead extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelPigHelmet.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelPigHelmet.java index da2bb6ff..07575920 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelPigHelmet.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelPigHelmet.java @@ -6,10 +6,10 @@ import org.lwjgl.opengl.GL11; -import vswe.stevescarts.Modules.Hull.ModulePig; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.Hull.ModulePig; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelPigHelmet extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelPigTail.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelPigTail.java index ce88aef1..6b5941fd 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelPigTail.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelPigTail.java @@ -6,10 +6,10 @@ import org.lwjgl.opengl.GL11; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelPigTail extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelPumpkinHull.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelPumpkinHull.java index c4f9dc14..ff6b4b8d 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelPumpkinHull.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelPumpkinHull.java @@ -2,9 +2,9 @@ import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelPumpkinHull extends ModelHull { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelPumpkinHullTop.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelPumpkinHullTop.java index e8b43685..b121c8c2 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelPumpkinHullTop.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelPumpkinHullTop.java @@ -2,9 +2,9 @@ import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelPumpkinHullTop extends ModelHullTop { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelRailer.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelRailer.java index 8534e287..19a490fb 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelRailer.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelRailer.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Workers.ModuleRailer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelRailer extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelSeat.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelSeat.java index 7fcc52d0..b9c3152b 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelSeat.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelSeat.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Realtimers.ModuleSeat; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelSeat extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelShield.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelShield.java index a065c4b5..9218953e 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelShield.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelShield.java @@ -4,11 +4,11 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.Addons.ModuleShield; import vswe.stevescarts.Modules.ModuleBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelShield extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelShootingRig.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelShootingRig.java index 40d78d1b..4671ed03 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelShootingRig.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelShootingRig.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelShootingRig extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelSideChests.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelSideChests.java index 85314166..f3f5f5ab 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelSideChests.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelSideChests.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Storages.Chests.ModuleChest; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelSideChests extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelSideTanks.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelSideTanks.java index eb5839f1..618f9501 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelSideTanks.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelSideTanks.java @@ -5,12 +5,12 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Storages.Tanks.ModuleTank; import vswe.stevescarts.Renders.RendererMinecart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelSideTanks extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelSniperRifle.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelSniperRifle.java index e696148b..818b175a 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelSniperRifle.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelSniperRifle.java @@ -2,10 +2,10 @@ import net.minecraft.client.model.ModelRenderer; -import vswe.stevescarts.Modules.ModuleBase; -import vswe.stevescarts.Modules.Realtimers.ModuleShooterAdv; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.ModuleBase; +import vswe.stevescarts.Modules.Realtimers.ModuleShooterAdv; @SideOnly(Side.CLIENT) public class ModelSniperRifle extends ModelGun { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanel.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanel.java index 0776b247..f096f41c 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanel.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanel.java @@ -2,10 +2,10 @@ import net.minecraft.client.model.ModelRenderer; -import vswe.stevescarts.Modules.Engines.ModuleSolarTop; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.Engines.ModuleSolarTop; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public abstract class ModelSolarPanel extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanelBase.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanelBase.java index f8434500..10584598 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanelBase.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanelBase.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelSolarPanelBase extends ModelSolarPanel { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanelHeads.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanelHeads.java index b69f8dce..dbd76bde 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanelHeads.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelSolarPanelHeads.java @@ -5,11 +5,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.Engines.ModuleSolarTop; import vswe.stevescarts.Modules.ModuleBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelSolarPanelHeads extends ModelSolarPanel { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelToolPlate.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelToolPlate.java index e24f31a1..f27b22b2 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelToolPlate.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelToolPlate.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelToolPlate extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelTopChest.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelTopChest.java index 5970486c..18cddd3c 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelTopChest.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelTopChest.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Storages.Chests.ModuleChest; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelTopChest extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelTopTank.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelTopTank.java index a02894e3..6fcc1fa6 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelTopTank.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelTopTank.java @@ -5,12 +5,12 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Storages.Tanks.ModuleTank; import vswe.stevescarts.Renders.RendererMinecart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelTopTank extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelTorchplacer.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelTorchplacer.java index cc4fe8ea..597c2dff 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelTorchplacer.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelTorchplacer.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Workers.ModuleTorch; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelTorchplacer extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelTrackRemover.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelTrackRemover.java index 7634efd5..6a98ad3d 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelTrackRemover.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelTrackRemover.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public class ModelTrackRemover extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelWheel.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelWheel.java index e7f93fe3..484b099f 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelWheel.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelWheel.java @@ -3,11 +3,11 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Realtimers.ModuleAdvControl; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelWheel extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelWire.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelWire.java index 2fdcfbe2..3e0b8df7 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelWire.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelWire.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Helpers.ResourceHelper; -import vswe.stevescarts.Modules.ModuleBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Modules.ModuleBase; @SideOnly(Side.CLIENT) public abstract class ModelWire extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/Models/Cart/ModelWoodCutter.java b/src/main/java/vswe/stevescarts/Models/Cart/ModelWoodCutter.java index def64eb4..e34c4757 100644 --- a/src/main/java/vswe/stevescarts/Models/Cart/ModelWoodCutter.java +++ b/src/main/java/vswe/stevescarts/Models/Cart/ModelWoodCutter.java @@ -3,10 +3,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Modules.ModuleBase; -import vswe.stevescarts.Modules.Workers.Tools.ModuleWoodcutter; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Modules.ModuleBase; +import vswe.stevescarts.Modules.Workers.Tools.ModuleWoodcutter; @SideOnly(Side.CLIENT) public class ModelWoodCutter extends ModelCartbase { diff --git a/src/main/java/vswe/stevescarts/ModuleData/ModuleData.java b/src/main/java/vswe/stevescarts/ModuleData/ModuleData.java index 90228e97..3b76220e 100644 --- a/src/main/java/vswe/stevescarts/ModuleData/ModuleData.java +++ b/src/main/java/vswe/stevescarts/ModuleData/ModuleData.java @@ -15,16 +15,92 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; -import vswe.stevescarts.Helpers.*; +import vswe.stevescarts.Helpers.CartVersion; +import vswe.stevescarts.Helpers.ColorHelper; +import vswe.stevescarts.Helpers.ComponentTypes; +import vswe.stevescarts.Helpers.Localization; +import vswe.stevescarts.Helpers.RecipeHelper; +import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Items.ModItems; -import vswe.stevescarts.Models.Cart.*; -import vswe.stevescarts.Modules.Addons.*; +import vswe.stevescarts.Models.Cart.ModelAdvancedTank; +import vswe.stevescarts.Models.Cart.ModelBridge; +import vswe.stevescarts.Models.Cart.ModelCage; +import vswe.stevescarts.Models.Cart.ModelCake; +import vswe.stevescarts.Models.Cart.ModelCartbase; +import vswe.stevescarts.Models.Cart.ModelCleaner; +import vswe.stevescarts.Models.Cart.ModelCompactSolarPanel; +import vswe.stevescarts.Models.Cart.ModelDrill; +import vswe.stevescarts.Models.Cart.ModelDynamite; +import vswe.stevescarts.Models.Cart.ModelEggBasket; +import vswe.stevescarts.Models.Cart.ModelEngineFrame; +import vswe.stevescarts.Models.Cart.ModelEngineInside; +import vswe.stevescarts.Models.Cart.ModelExtractingChests; +import vswe.stevescarts.Models.Cart.ModelFarmer; +import vswe.stevescarts.Models.Cart.ModelFrontChest; +import vswe.stevescarts.Models.Cart.ModelFrontTank; +import vswe.stevescarts.Models.Cart.ModelGiftStorage; +import vswe.stevescarts.Models.Cart.ModelGun; +import vswe.stevescarts.Models.Cart.ModelHull; +import vswe.stevescarts.Models.Cart.ModelHullTop; +import vswe.stevescarts.Models.Cart.ModelLawnMower; +import vswe.stevescarts.Models.Cart.ModelLever; +import vswe.stevescarts.Models.Cart.ModelLiquidDrainer; +import vswe.stevescarts.Models.Cart.ModelLiquidSensors; +import vswe.stevescarts.Models.Cart.ModelMobDetector; +import vswe.stevescarts.Models.Cart.ModelNote; +import vswe.stevescarts.Models.Cart.ModelPigHead; +import vswe.stevescarts.Models.Cart.ModelPigHelmet; +import vswe.stevescarts.Models.Cart.ModelPigTail; +import vswe.stevescarts.Models.Cart.ModelPumpkinHull; +import vswe.stevescarts.Models.Cart.ModelPumpkinHullTop; +import vswe.stevescarts.Models.Cart.ModelRailer; +import vswe.stevescarts.Models.Cart.ModelSeat; +import vswe.stevescarts.Models.Cart.ModelShield; +import vswe.stevescarts.Models.Cart.ModelShootingRig; +import vswe.stevescarts.Models.Cart.ModelSideChests; +import vswe.stevescarts.Models.Cart.ModelSideTanks; +import vswe.stevescarts.Models.Cart.ModelSniperRifle; +import vswe.stevescarts.Models.Cart.ModelSolarPanelBase; +import vswe.stevescarts.Models.Cart.ModelSolarPanelHeads; +import vswe.stevescarts.Models.Cart.ModelToolPlate; +import vswe.stevescarts.Models.Cart.ModelTopChest; +import vswe.stevescarts.Models.Cart.ModelTopTank; +import vswe.stevescarts.Models.Cart.ModelTorchplacer; +import vswe.stevescarts.Models.Cart.ModelTrackRemover; +import vswe.stevescarts.Models.Cart.ModelWheel; +import vswe.stevescarts.Models.Cart.ModelWoodCutter; import vswe.stevescarts.Modules.Addons.Mobdetectors.ModuleAnimal; import vswe.stevescarts.Modules.Addons.Mobdetectors.ModuleBat; import vswe.stevescarts.Modules.Addons.Mobdetectors.ModuleMonster; import vswe.stevescarts.Modules.Addons.Mobdetectors.ModulePlayer; import vswe.stevescarts.Modules.Addons.Mobdetectors.ModuleVillager; +import vswe.stevescarts.Modules.Addons.ModuleAddon; +import vswe.stevescarts.Modules.Addons.ModuleBrake; +import vswe.stevescarts.Modules.Addons.ModuleChunkLoader; +import vswe.stevescarts.Modules.Addons.ModuleColorRandomizer; +import vswe.stevescarts.Modules.Addons.ModuleColorizer; +import vswe.stevescarts.Modules.Addons.ModuleCrafter; +import vswe.stevescarts.Modules.Addons.ModuleCrafterAdv; +import vswe.stevescarts.Modules.Addons.ModuleCreativeIncinerator; +import vswe.stevescarts.Modules.Addons.ModuleCreativeSupplies; +import vswe.stevescarts.Modules.Addons.ModuleDrillIntelligence; +import vswe.stevescarts.Modules.Addons.ModuleEnchants; +import vswe.stevescarts.Modules.Addons.ModuleHeightControl; +import vswe.stevescarts.Modules.Addons.ModuleIncinerator; +import vswe.stevescarts.Modules.Addons.ModuleInvisible; +import vswe.stevescarts.Modules.Addons.ModuleLabel; +import vswe.stevescarts.Modules.Addons.ModuleLiquidSensors; +import vswe.stevescarts.Modules.Addons.ModuleMelter; +import vswe.stevescarts.Modules.Addons.ModuleMelterExtreme; +import vswe.stevescarts.Modules.Addons.ModuleOreTracker; +import vswe.stevescarts.Modules.Addons.ModulePowerObserver; +import vswe.stevescarts.Modules.Addons.ModuleShield; +import vswe.stevescarts.Modules.Addons.ModuleSmelter; +import vswe.stevescarts.Modules.Addons.ModuleSmelterAdv; +import vswe.stevescarts.Modules.Addons.ModuleSnowCannon; import vswe.stevescarts.Modules.Addons.Plants.ModuleModTrees; import vswe.stevescarts.Modules.Addons.Plants.ModuleNetherwart; import vswe.stevescarts.Modules.Addons.Plants.ModulePlantSize; @@ -81,7 +157,14 @@ import vswe.stevescarts.Modules.Storages.Tanks.ModuleOpenTank; import vswe.stevescarts.Modules.Storages.Tanks.ModuleSideTanks; import vswe.stevescarts.Modules.Storages.Tanks.ModuleTopTank; -import vswe.stevescarts.Modules.Workers.*; +import vswe.stevescarts.Modules.Workers.ModuleBridge; +import vswe.stevescarts.Modules.Workers.ModuleFertilizer; +import vswe.stevescarts.Modules.Workers.ModuleHydrater; +import vswe.stevescarts.Modules.Workers.ModuleLiquidDrainer; +import vswe.stevescarts.Modules.Workers.ModuleRailer; +import vswe.stevescarts.Modules.Workers.ModuleRailerLarge; +import vswe.stevescarts.Modules.Workers.ModuleRemover; +import vswe.stevescarts.Modules.Workers.ModuleTorch; import vswe.stevescarts.Modules.Workers.Tools.ModuleDrillDiamond; import vswe.stevescarts.Modules.Workers.Tools.ModuleDrillGalgadorian; import vswe.stevescarts.Modules.Workers.Tools.ModuleDrillHardened; @@ -93,8 +176,6 @@ import vswe.stevescarts.Modules.Workers.Tools.ModuleWoodcutterGalgadorian; import vswe.stevescarts.Modules.Workers.Tools.ModuleWoodcutterHardened; import vswe.stevescarts.StevesCarts; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleData { diff --git a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleBrake.java b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleBrake.java index 43231504..d1912aaf 100644 --- a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleBrake.java +++ b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleBrake.java @@ -3,13 +3,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.ILeverModule; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleBrake extends ModuleAddon implements ILeverModule { diff --git a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleChunkLoader.java b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleChunkLoader.java index 261e00b6..66511343 100644 --- a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleChunkLoader.java +++ b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleChunkLoader.java @@ -3,12 +3,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.IActivatorModule; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleChunkLoader extends ModuleAddon implements IActivatorModule { diff --git a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleEnchants.java b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleEnchants.java index 03dca8b0..63ac8746 100644 --- a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleEnchants.java +++ b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleEnchants.java @@ -4,6 +4,8 @@ import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.EnchantmentData; import vswe.stevescarts.Helpers.EnchantmentInfo; @@ -13,8 +15,6 @@ import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Slots.SlotBase; import vswe.stevescarts.Slots.SlotEnchantment; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleEnchants extends ModuleAddon { diff --git a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleInvisible.java b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleInvisible.java index 580c90a8..5a3a7267 100644 --- a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleInvisible.java +++ b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleInvisible.java @@ -3,13 +3,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.IActivatorModule; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleInvisible extends ModuleAddon implements IActivatorModule { diff --git a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleLabel.java b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleLabel.java index 5b7322bd..6b8822e2 100644 --- a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleLabel.java +++ b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleLabel.java @@ -5,6 +5,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.LabelInformation; import vswe.stevescarts.Helpers.Localization; @@ -15,8 +17,6 @@ import vswe.stevescarts.Modules.Workers.Tools.ModuleTool; import vswe.stevescarts.Slots.SlotBase; import vswe.stevescarts.Slots.SlotChest; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleLabel extends ModuleAddon { diff --git a/src/main/java/vswe/stevescarts/Modules/Addons/ModulePowerObserver.java b/src/main/java/vswe/stevescarts/Modules/Addons/ModulePowerObserver.java index 2c1a280d..575acde8 100644 --- a/src/main/java/vswe/stevescarts/Modules/Addons/ModulePowerObserver.java +++ b/src/main/java/vswe/stevescarts/Modules/Addons/ModulePowerObserver.java @@ -4,13 +4,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.Engines.ModuleEngine; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModulePowerObserver extends ModuleAddon { diff --git a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleRecipe.java b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleRecipe.java index 7fa9235d..8f59b8d0 100644 --- a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleRecipe.java +++ b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleRecipe.java @@ -8,6 +8,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; @@ -16,8 +18,6 @@ import vswe.stevescarts.Slots.SlotBase; import vswe.stevescarts.Slots.SlotChest; import vswe.stevescarts.TileEntities.TileEntityCargo; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class ModuleRecipe extends ModuleAddon { diff --git a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleShield.java b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleShield.java index 744be690..b27fc7e6 100644 --- a/src/main/java/vswe/stevescarts/Modules/Addons/ModuleShield.java +++ b/src/main/java/vswe/stevescarts/Modules/Addons/ModuleShield.java @@ -4,13 +4,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.IActivatorModule; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleShield extends ModuleAddon implements IActivatorModule { diff --git a/src/main/java/vswe/stevescarts/Modules/Addons/Plants/ModulePlantSize.java b/src/main/java/vswe/stevescarts/Modules/Addons/Plants/ModulePlantSize.java index 57586730..4203773c 100644 --- a/src/main/java/vswe/stevescarts/Modules/Addons/Plants/ModulePlantSize.java +++ b/src/main/java/vswe/stevescarts/Modules/Addons/Plants/ModulePlantSize.java @@ -3,13 +3,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.Addons.ModuleAddon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModulePlantSize extends ModuleAddon { diff --git a/src/main/java/vswe/stevescarts/Modules/Engines/ModuleSolarBase.java b/src/main/java/vswe/stevescarts/Modules/Engines/ModuleSolarBase.java index a0651754..74612ec2 100644 --- a/src/main/java/vswe/stevescarts/Modules/Engines/ModuleSolarBase.java +++ b/src/main/java/vswe/stevescarts/Modules/Engines/ModuleSolarBase.java @@ -2,12 +2,12 @@ import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class ModuleSolarBase extends ModuleEngine { diff --git a/src/main/java/vswe/stevescarts/Modules/Hull/ModulePig.java b/src/main/java/vswe/stevescarts/Modules/Hull/ModulePig.java index 033e03d0..658cfa13 100644 --- a/src/main/java/vswe/stevescarts/Modules/Hull/ModulePig.java +++ b/src/main/java/vswe/stevescarts/Modules/Hull/ModulePig.java @@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import vswe.stevescarts.Carts.MinecartModular; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Carts.MinecartModular; public class ModulePig extends ModuleHull { diff --git a/src/main/java/vswe/stevescarts/Modules/ModuleBase.java b/src/main/java/vswe/stevescarts/Modules/ModuleBase.java index 5f036b79..6c478f18 100644 --- a/src/main/java/vswe/stevescarts/Modules/ModuleBase.java +++ b/src/main/java/vswe/stevescarts/Modules/ModuleBase.java @@ -27,6 +27,8 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Buttons.ButtonBase; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Containers.ContainerMinecart; @@ -39,8 +41,6 @@ import vswe.stevescarts.ModuleData.ModuleData; import vswe.stevescarts.PacketHandler; import vswe.stevescarts.Slots.SlotBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * The base for all modules. This is what's used by the cart to add features, models and interfaces for the cart. should diff --git a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleAdvControl.java b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleAdvControl.java index 25a4c2e9..2cdefbec 100644 --- a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleAdvControl.java +++ b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleAdvControl.java @@ -10,6 +10,8 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; @@ -18,8 +20,6 @@ import vswe.stevescarts.Modules.ILeverModule; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.PacketHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleAdvControl extends ModuleBase implements ILeverModule { diff --git a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleArcade.java b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleArcade.java index 875738ba..f8bc6f09 100644 --- a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleArcade.java +++ b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleArcade.java @@ -5,6 +5,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Arcade.ArcadeGame; import vswe.stevescarts.Arcade.ArcadeInvaders; import vswe.stevescarts.Arcade.ArcadeSweeper; @@ -15,8 +17,6 @@ import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.ModuleBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleArcade extends ModuleBase { diff --git a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleCage.java b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleCage.java index 73734d88..4b0b135f 100644 --- a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleCage.java +++ b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleCage.java @@ -23,14 +23,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.IActivatorModule; import vswe.stevescarts.Modules.ModuleBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleCage extends ModuleBase implements IActivatorModule { diff --git a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleCakeServer.java b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleCakeServer.java index e4b2bf0d..da30a449 100644 --- a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleCakeServer.java +++ b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleCakeServer.java @@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; @@ -13,8 +15,6 @@ import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Slots.SlotBase; import vswe.stevescarts.Slots.SlotCake; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleCakeServer extends ModuleBase implements ISuppliesModule { diff --git a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleExperience.java b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleExperience.java index 02b1b0d2..6bffdca3 100644 --- a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleExperience.java +++ b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleExperience.java @@ -7,13 +7,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.ModuleBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleExperience extends ModuleBase { diff --git a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleSeat.java b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleSeat.java index f90c29c5..4b9ef252 100644 --- a/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleSeat.java +++ b/src/main/java/vswe/stevescarts/Modules/Realtimers/ModuleSeat.java @@ -3,13 +3,13 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.Localization; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.ModuleBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ModuleSeat extends ModuleBase { diff --git a/src/main/java/vswe/stevescarts/Modules/Storages/Tanks/ModuleTank.java b/src/main/java/vswe/stevescarts/Modules/Storages/Tanks/ModuleTank.java index f0e243a0..2e59fba9 100644 --- a/src/main/java/vswe/stevescarts/Modules/Storages/Tanks/ModuleTank.java +++ b/src/main/java/vswe/stevescarts/Modules/Storages/Tanks/ModuleTank.java @@ -9,16 +9,20 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; -import vswe.stevescarts.Helpers.*; +import vswe.stevescarts.Helpers.ColorHelper; +import vswe.stevescarts.Helpers.ITankHolder; +import vswe.stevescarts.Helpers.Localization; +import vswe.stevescarts.Helpers.ResourceHelper; +import vswe.stevescarts.Helpers.Tank; import vswe.stevescarts.Interfaces.GuiBase; import vswe.stevescarts.Interfaces.GuiMinecart; import vswe.stevescarts.Modules.Storages.ModuleStorage; import vswe.stevescarts.Slots.SlotBase; import vswe.stevescarts.Slots.SlotLiquidInput; import vswe.stevescarts.Slots.SlotLiquidOutput; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class ModuleTank extends ModuleStorage implements IFluidTank, ITankHolder { diff --git a/src/main/java/vswe/stevescarts/Modules/Workers/Tools/ModuleDrill.java b/src/main/java/vswe/stevescarts/Modules/Workers/Tools/ModuleDrill.java index b62b65f8..14b1a747 100644 --- a/src/main/java/vswe/stevescarts/Modules/Workers/Tools/ModuleDrill.java +++ b/src/main/java/vswe/stevescarts/Modules/Workers/Tools/ModuleDrill.java @@ -15,6 +15,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Vec3; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Blocks.ModBlocks; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.BlockCoord; @@ -28,8 +30,6 @@ import vswe.stevescarts.Modules.IActivatorModule; import vswe.stevescarts.Modules.ModuleBase; import vswe.stevescarts.Modules.Storages.Chests.ModuleChest; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class ModuleDrill extends ModuleTool implements IActivatorModule { diff --git a/src/main/java/vswe/stevescarts/Modules/Workers/Tools/ModuleTool.java b/src/main/java/vswe/stevescarts/Modules/Workers/Tools/ModuleTool.java index 9cfbe1cb..0645450a 100644 --- a/src/main/java/vswe/stevescarts/Modules/Workers/Tools/ModuleTool.java +++ b/src/main/java/vswe/stevescarts/Modules/Workers/Tools/ModuleTool.java @@ -4,6 +4,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.EnchantmentInfo.ENCHANTMENT_TYPE; import vswe.stevescarts.Helpers.Localization; @@ -14,8 +16,6 @@ import vswe.stevescarts.Modules.Workers.ModuleWorker; import vswe.stevescarts.Slots.SlotBase; import vswe.stevescarts.Slots.SlotRepair; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class ModuleTool extends ModuleWorker { diff --git a/src/main/java/vswe/stevescarts/PacketHandler.java b/src/main/java/vswe/stevescarts/PacketHandler.java index 328849eb..89969b25 100644 --- a/src/main/java/vswe/stevescarts/PacketHandler.java +++ b/src/main/java/vswe/stevescarts/PacketHandler.java @@ -15,14 +15,6 @@ import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.world.World; -import vswe.stevescarts.Blocks.BlockCartAssembler; -import vswe.stevescarts.Blocks.ModBlocks; -import vswe.stevescarts.Carts.MinecartModular; -import vswe.stevescarts.Containers.ContainerBase; -import vswe.stevescarts.Containers.ContainerMinecart; -import vswe.stevescarts.Modules.ModuleBase; -import vswe.stevescarts.TileEntities.TileEntityBase; - import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; @@ -35,6 +27,13 @@ import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import vswe.stevescarts.Blocks.BlockCartAssembler; +import vswe.stevescarts.Blocks.ModBlocks; +import vswe.stevescarts.Carts.MinecartModular; +import vswe.stevescarts.Containers.ContainerBase; +import vswe.stevescarts.Containers.ContainerMinecart; +import vswe.stevescarts.Modules.ModuleBase; +import vswe.stevescarts.TileEntities.TileEntityBase; public class PacketHandler { diff --git a/src/main/java/vswe/stevescarts/Renders/RendererUpgrade.java b/src/main/java/vswe/stevescarts/Renders/RendererUpgrade.java index bfda2d55..70ce5635 100644 --- a/src/main/java/vswe/stevescarts/Renders/RendererUpgrade.java +++ b/src/main/java/vswe/stevescarts/Renders/RendererUpgrade.java @@ -6,12 +6,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import vswe.stevescarts.Blocks.BlockCartAssembler; import vswe.stevescarts.Blocks.BlockUpgrade; import vswe.stevescarts.TileEntities.TileEntityCartAssembler; import vswe.stevescarts.TileEntities.TileEntityUpgrade; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class RendererUpgrade implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vswe/stevescarts/StevesCarts.java b/src/main/java/vswe/stevescarts/StevesCarts.java index 8da12750..32317357 100644 --- a/src/main/java/vswe/stevescarts/StevesCarts.java +++ b/src/main/java/vswe/stevescarts/StevesCarts.java @@ -6,7 +6,18 @@ import org.apache.logging.log4j.Logger; -import vswe.stevescarts.Blocks.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +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.FMLPreInitializationEvent; +import cpw.mods.fml.common.network.FMLEventChannel; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import vswe.stevescarts.Blocks.ModBlocks; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Helpers.CraftingHandler; import vswe.stevescarts.Helpers.CreativeTabSC2; @@ -15,7 +26,8 @@ import vswe.stevescarts.Helpers.GiftItem; import vswe.stevescarts.Helpers.TradeHandler; import vswe.stevescarts.Helpers.WoodFuelHandler; -import vswe.stevescarts.Items.*; +import vswe.stevescarts.Items.ItemBlockStorage; +import vswe.stevescarts.Items.ModItems; import vswe.stevescarts.Listeners.ChunkListener; import vswe.stevescarts.Listeners.MobDeathListener; import vswe.stevescarts.Listeners.MobInteractListener; @@ -24,17 +36,6 @@ import vswe.stevescarts.Listeners.TicketListener; import vswe.stevescarts.TileEntities.TileEntityCargo; import vswe.stevescarts.Upgrades.AssemblerUpgrade; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -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.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.FMLEventChannel; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; @Mod(modid = "StevesCarts", name = "Steve's Carts 2", version = "GRADLETOKEN_VERSION") public class StevesCarts { diff --git a/src/main/java/vswe/stevescarts/TileEntities/TileEntityActivator.java b/src/main/java/vswe/stevescarts/TileEntities/TileEntityActivator.java index c0ce9e0c..8ee76155 100644 --- a/src/main/java/vswe/stevescarts/TileEntities/TileEntityActivator.java +++ b/src/main/java/vswe/stevescarts/TileEntities/TileEntityActivator.java @@ -8,6 +8,8 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Containers.ContainerActivator; import vswe.stevescarts.Containers.ContainerBase; @@ -20,8 +22,6 @@ import vswe.stevescarts.Modules.Addons.ModuleShield; import vswe.stevescarts.Modules.Realtimers.ModuleCage; import vswe.stevescarts.Modules.Workers.Tools.ModuleDrill; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * The tile entity used by the Module Toggler diff --git a/src/main/java/vswe/stevescarts/TileEntities/TileEntityBase.java b/src/main/java/vswe/stevescarts/TileEntities/TileEntityBase.java index 43061662..bd4d3ae2 100644 --- a/src/main/java/vswe/stevescarts/TileEntities/TileEntityBase.java +++ b/src/main/java/vswe/stevescarts/TileEntities/TileEntityBase.java @@ -6,10 +6,10 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.tileentity.TileEntity; -import vswe.stevescarts.Containers.ContainerBase; -import vswe.stevescarts.Interfaces.GuiBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vswe.stevescarts.Containers.ContainerBase; +import vswe.stevescarts.Interfaces.GuiBase; public abstract class TileEntityBase extends TileEntity { diff --git a/src/main/java/vswe/stevescarts/TileEntities/TileEntityCargo.java b/src/main/java/vswe/stevescarts/TileEntities/TileEntityCargo.java index 03d25b43..7ac703e2 100644 --- a/src/main/java/vswe/stevescarts/TileEntities/TileEntityCargo.java +++ b/src/main/java/vswe/stevescarts/TileEntities/TileEntityCargo.java @@ -12,10 +12,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Containers.ContainerBase; import vswe.stevescarts.Containers.ContainerCargo; import vswe.stevescarts.Containers.ContainerManager; -import vswe.stevescarts.Helpers.*; +import vswe.stevescarts.Helpers.CargoItemSelection; +import vswe.stevescarts.Helpers.ComponentTypes; +import vswe.stevescarts.Helpers.Localization; +import vswe.stevescarts.Helpers.ManagerTransfer; +import vswe.stevescarts.Helpers.TransferHandler; import vswe.stevescarts.Helpers.TransferHandler.TRANSFER_TYPE; import vswe.stevescarts.Interfaces.GuiBase; import vswe.stevescarts.Interfaces.GuiCargo; @@ -34,8 +40,6 @@ import vswe.stevescarts.Slots.SlotSapling; import vswe.stevescarts.Slots.SlotSeed; import vswe.stevescarts.Slots.SlotTorch; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TileEntityCargo extends TileEntityManager { diff --git a/src/main/java/vswe/stevescarts/TileEntities/TileEntityCartAssembler.java b/src/main/java/vswe/stevescarts/TileEntities/TileEntityCartAssembler.java index a1590884..f0312bfd 100644 --- a/src/main/java/vswe/stevescarts/TileEntities/TileEntityCartAssembler.java +++ b/src/main/java/vswe/stevescarts/TileEntities/TileEntityCartAssembler.java @@ -15,13 +15,21 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Blocks.BlockCartAssembler; import vswe.stevescarts.Blocks.ModBlocks; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Containers.ContainerBase; import vswe.stevescarts.Containers.ContainerCartAssembler; import vswe.stevescarts.Containers.ContainerUpgrade; -import vswe.stevescarts.Helpers.*; +import vswe.stevescarts.Helpers.DropDownMenuItem; +import vswe.stevescarts.Helpers.Localization; +import vswe.stevescarts.Helpers.ManagerTransfer; +import vswe.stevescarts.Helpers.NBTHelper; +import vswe.stevescarts.Helpers.SimulationInfo; +import vswe.stevescarts.Helpers.TitleBox; +import vswe.stevescarts.Helpers.TransferHandler; import vswe.stevescarts.Interfaces.GuiBase; import vswe.stevescarts.Interfaces.GuiCartAssembler; import vswe.stevescarts.Items.ItemCarts; @@ -45,8 +53,6 @@ import vswe.stevescarts.Upgrades.TimeFlatCart; import vswe.stevescarts.Upgrades.TimeFlatRemoved; import vswe.stevescarts.Upgrades.WorkEfficiency; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * The tile entity used by the Cart Assembler diff --git a/src/main/java/vswe/stevescarts/TileEntities/TileEntityDetector.java b/src/main/java/vswe/stevescarts/TileEntities/TileEntityDetector.java index f126ff70..39547e1e 100644 --- a/src/main/java/vswe/stevescarts/TileEntities/TileEntityDetector.java +++ b/src/main/java/vswe/stevescarts/TileEntities/TileEntityDetector.java @@ -6,6 +6,8 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Containers.ContainerBase; import vswe.stevescarts.Containers.ContainerDetector; @@ -13,8 +15,6 @@ import vswe.stevescarts.Helpers.LogicObject; import vswe.stevescarts.Interfaces.GuiBase; import vswe.stevescarts.Interfaces.GuiDetector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TileEntityDetector extends TileEntityBase { diff --git a/src/main/java/vswe/stevescarts/TileEntities/TileEntityDistributor.java b/src/main/java/vswe/stevescarts/TileEntities/TileEntityDistributor.java index 2bb47aff..4edaad5f 100644 --- a/src/main/java/vswe/stevescarts/TileEntities/TileEntityDistributor.java +++ b/src/main/java/vswe/stevescarts/TileEntities/TileEntityDistributor.java @@ -19,6 +19,8 @@ import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Containers.ContainerBase; import vswe.stevescarts.Containers.ContainerDistributor; import vswe.stevescarts.Helpers.DistributorSetting; @@ -28,8 +30,6 @@ import vswe.stevescarts.Interfaces.GuiBase; import vswe.stevescarts.Interfaces.GuiDistributor; import vswe.stevescarts.PacketHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TileEntityDistributor extends TileEntityBase implements IInventory, ISidedInventory, IFluidHandler { diff --git a/src/main/java/vswe/stevescarts/TileEntities/TileEntityLiquid.java b/src/main/java/vswe/stevescarts/TileEntities/TileEntityLiquid.java index 76fa5a79..45c44c7c 100644 --- a/src/main/java/vswe/stevescarts/TileEntities/TileEntityLiquid.java +++ b/src/main/java/vswe/stevescarts/TileEntities/TileEntityLiquid.java @@ -17,6 +17,8 @@ import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Carts.MinecartModular; import vswe.stevescarts.Containers.ContainerBase; import vswe.stevescarts.Containers.ContainerLiquid; @@ -31,8 +33,6 @@ import vswe.stevescarts.Slots.SlotLiquidFilter; import vswe.stevescarts.Slots.SlotLiquidManagerInput; import vswe.stevescarts.Slots.SlotLiquidOutput; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TileEntityLiquid extends TileEntityManager implements IFluidHandler, ITankHolder, ISidedInventory { diff --git a/src/main/java/vswe/stevescarts/TileEntities/TileEntityUpgrade.java b/src/main/java/vswe/stevescarts/TileEntities/TileEntityUpgrade.java index c9703999..bdb6daef 100644 --- a/src/main/java/vswe/stevescarts/TileEntities/TileEntityUpgrade.java +++ b/src/main/java/vswe/stevescarts/TileEntities/TileEntityUpgrade.java @@ -21,6 +21,8 @@ import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Containers.ContainerBase; import vswe.stevescarts.Containers.ContainerUpgrade; import vswe.stevescarts.Helpers.ITankHolder; @@ -32,8 +34,6 @@ import vswe.stevescarts.Upgrades.AssemblerUpgrade; import vswe.stevescarts.Upgrades.InterfaceEffect; import vswe.stevescarts.Upgrades.InventoryEffect; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TileEntityUpgrade extends TileEntityBase implements IInventory, ISidedInventory, IFluidHandler, IFluidTank, ITankHolder { diff --git a/src/main/java/vswe/stevescarts/Upgrades/AssemblerUpgrade.java b/src/main/java/vswe/stevescarts/Upgrades/AssemblerUpgrade.java index 7f427e8c..2fc39898 100644 --- a/src/main/java/vswe/stevescarts/Upgrades/AssemblerUpgrade.java +++ b/src/main/java/vswe/stevescarts/Upgrades/AssemblerUpgrade.java @@ -14,14 +14,14 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Blocks.ModBlocks; import vswe.stevescarts.Helpers.ComponentTypes; import vswe.stevescarts.Helpers.RecipeHelper; import vswe.stevescarts.Items.ModItems; import vswe.stevescarts.StevesCarts; import vswe.stevescarts.TileEntities.TileEntityUpgrade; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class AssemblerUpgrade { diff --git a/src/main/java/vswe/stevescarts/Upgrades/InterfaceEffect.java b/src/main/java/vswe/stevescarts/Upgrades/InterfaceEffect.java index 2f3a56ac..de73f22e 100644 --- a/src/main/java/vswe/stevescarts/Upgrades/InterfaceEffect.java +++ b/src/main/java/vswe/stevescarts/Upgrades/InterfaceEffect.java @@ -2,11 +2,11 @@ import net.minecraft.inventory.ICrafting; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Containers.ContainerUpgrade; import vswe.stevescarts.Interfaces.GuiUpgrade; import vswe.stevescarts.TileEntities.TileEntityUpgrade; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class InterfaceEffect extends BaseEffect { diff --git a/src/main/java/vswe/stevescarts/Upgrades/TankEffect.java b/src/main/java/vswe/stevescarts/Upgrades/TankEffect.java index 9d126c32..a2716e2b 100644 --- a/src/main/java/vswe/stevescarts/Upgrades/TankEffect.java +++ b/src/main/java/vswe/stevescarts/Upgrades/TankEffect.java @@ -6,6 +6,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vswe.stevescarts.Containers.ContainerUpgrade; import vswe.stevescarts.Helpers.ResourceHelper; import vswe.stevescarts.Helpers.Tank; @@ -13,8 +15,6 @@ import vswe.stevescarts.Slots.SlotLiquidOutput; import vswe.stevescarts.Slots.SlotLiquidUpgradeInput; import vswe.stevescarts.TileEntities.TileEntityUpgrade; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class TankEffect extends InventoryEffect {