From 2221a303ad2ec956230a3e452877f590bd2b6526 Mon Sep 17 00:00:00 2001 From: TheDoctorSoda Date: Mon, 7 Mar 2016 21:56:37 -0800 Subject: [PATCH] Move thermal generator TE to proper package --- .../generator/BlockThermalGenerator.java | 2 +- .../java/techreborn/client/GuiHandler.java | 27 ++----------------- .../container/ContainerThermalGenerator.java | 2 +- .../client/gui/GuiThermalGenerator.java | 2 +- src/main/java/techreborn/init/ModBlocks.java | 10 +------ .../{ => generator}/TileThermalGenerator.java | 2 +- 6 files changed, 7 insertions(+), 38 deletions(-) rename src/main/java/techreborn/tiles/{ => generator}/TileThermalGenerator.java (99%) diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index 36c51eed2..50f4f5a0a 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -9,7 +9,7 @@ import reborncore.common.blocks.IAdvancedRotationTexture; import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.TileThermalGenerator; +import techreborn.tiles.generator.TileThermalGenerator; public class BlockThermalGenerator extends BlockMachineBase implements IAdvancedRotationTexture { diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index 2bc060b16..ad821cda2 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -73,32 +73,9 @@ import techreborn.client.gui.GuiSemifluidGenerator; import techreborn.client.gui.GuiThermalGenerator; import techreborn.client.gui.GuiVacuumFreezer; import techreborn.manual.GuiManual; -import techreborn.tiles.TileAesu; -import techreborn.tiles.TileAlloyFurnace; -import techreborn.tiles.TileAlloySmelter; -import techreborn.tiles.TileAssemblingMachine; -import techreborn.tiles.TileBlastFurnace; -import techreborn.tiles.TileCentrifuge; -import techreborn.tiles.TileChargeBench; -import techreborn.tiles.TileChemicalReactor; -import techreborn.tiles.TileChunkLoader; -import techreborn.tiles.TileDigitalChest; -import techreborn.tiles.TileImplosionCompressor; -import techreborn.tiles.TileIndustrialElectrolyzer; -import techreborn.tiles.TileIndustrialGrinder; -import techreborn.tiles.TileIndustrialSawmill; -import techreborn.tiles.TileIronFurnace; -import techreborn.tiles.TileMatterFabricator; -import techreborn.tiles.TileQuantumChest; -import techreborn.tiles.TileQuantumTank; -import techreborn.tiles.TileRollingMachine; -import techreborn.tiles.TileThermalGenerator; -import techreborn.tiles.TileVacuumFreezer; +import techreborn.tiles.*; import techreborn.tiles.fusionReactor.TileEntityFusionController; -import techreborn.tiles.generator.TileDieselGenerator; -import techreborn.tiles.generator.TileGasTurbine; -import techreborn.tiles.generator.TileGenerator; -import techreborn.tiles.generator.TileSemifluidGenerator; +import techreborn.tiles.generator.*; import techreborn.tiles.idsu.TileIDSU; import techreborn.tiles.lesu.TileLesu; import techreborn.tiles.teir1.TileCompressor; diff --git a/src/main/java/techreborn/client/container/ContainerThermalGenerator.java b/src/main/java/techreborn/client/container/ContainerThermalGenerator.java index a1442d3af..0f35d2213 100644 --- a/src/main/java/techreborn/client/container/ContainerThermalGenerator.java +++ b/src/main/java/techreborn/client/container/ContainerThermalGenerator.java @@ -6,7 +6,7 @@ import reborncore.client.gui.SlotFake; import reborncore.client.gui.SlotFluid; import reborncore.client.gui.SlotOutput; import reborncore.common.container.RebornContainer; -import techreborn.tiles.TileThermalGenerator; +import techreborn.tiles.generator.TileThermalGenerator; public class ContainerThermalGenerator extends RebornContainer { public TileThermalGenerator tileThermalGenerator; diff --git a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java index 375b35a65..0870d4324 100644 --- a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import techreborn.client.container.ContainerThermalGenerator; -import techreborn.tiles.TileThermalGenerator; +import techreborn.tiles.generator.TileThermalGenerator; public class GuiThermalGenerator extends GuiContainer { diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 119609c46..07b3afc83 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -61,15 +61,7 @@ import techreborn.itemblocks.ItemBlockStorage; import techreborn.itemblocks.ItemBlockStorage2; import techreborn.tiles.*; import techreborn.tiles.fusionReactor.TileEntityFusionController; -import techreborn.tiles.generator.TileDieselGenerator; -import techreborn.tiles.generator.TileDragonEggSiphoner; -import techreborn.tiles.generator.TileGasTurbine; -import techreborn.tiles.generator.TileGenerator; -import techreborn.tiles.generator.TileHeatGenerator; -import techreborn.tiles.generator.TileSemifluidGenerator; -import techreborn.tiles.generator.TileSolarPanel; -import techreborn.tiles.generator.TileWaterMill; -import techreborn.tiles.generator.TileWindMill; +import techreborn.tiles.generator.*; import techreborn.tiles.idsu.TileIDSU; import techreborn.tiles.lesu.TileLesu; import techreborn.tiles.lesu.TileLesuStorage; diff --git a/src/main/java/techreborn/tiles/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java similarity index 99% rename from src/main/java/techreborn/tiles/TileThermalGenerator.java rename to src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index 8929cd003..2225836df 100644 --- a/src/main/java/techreborn/tiles/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -1,4 +1,4 @@ -package techreborn.tiles; +package techreborn.tiles.generator; import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer;