From b7ae806987af50d6c90bf9471c130e1b9d202ca7 Mon Sep 17 00:00:00 2001 From: Gig Date: Fri, 8 May 2015 00:39:17 +0100 Subject: [PATCH] Block clean up --- .../{ => generator}/BlockDieselGenerator.java | 3 +- .../BlockDragonEggSiphoner.java | 3 +- .../{ => generator}/BlockLightningRod.java | 3 +- .../BlockMagicEnergyAbsorber.java | 3 +- .../BlockMagicEnergyConverter.java | 3 +- .../{ => generator}/BlockPlasmaGenerator.java | 3 +- .../BlockSemiFluidGenerator.java | 3 +- .../BlockThermalGenerator.java | 3 +- .../{ => machine}/BlockAlloyFurnace.java | 3 +- .../{ => machine}/BlockAlloySmelter.java | 3 +- .../{ => machine}/BlockAssemblingMachine.java | 3 +- .../{ => machine}/BlockBlastFurnace.java | 3 +- .../blocks/{ => machine}/BlockCentrifuge.java | 3 +- .../{ => machine}/BlockChemicalReactor.java | 3 +- .../{ => machine}/BlockDistillationTower.java | 3 +- .../blocks/{ => machine}/BlockGrinder.java | 3 +- .../BlockImplosionCompressor.java | 3 +- .../BlockIndustrialElectrolyzer.java | 3 +- .../blocks/{ => machine}/BlockLathe.java | 3 +- .../{ => machine}/BlockMatterFabricator.java | 3 +- .../BlockPlateCuttingMachine.java | 3 +- .../{ => machine}/BlockRollingMachine.java | 3 +- .../{ => machine}/BlockVacuumFreezer.java | 3 +- .../blocks/{ => storage}/BlockAesu.java | 3 +- .../blocks/{ => storage}/BlockIDSU.java | 3 +- .../blocks/{ => storage}/BlockLesu.java | 3 +- .../{ => storage}/BlockLesuStorage.java | 3 +- src/main/java/techreborn/init/ModBlocks.java | 54 +++++++++---------- 28 files changed, 81 insertions(+), 54 deletions(-) rename src/main/java/techreborn/blocks/{ => generator}/BlockDieselGenerator.java (95%) rename src/main/java/techreborn/blocks/{ => generator}/BlockDragonEggSiphoner.java (95%) rename src/main/java/techreborn/blocks/{ => generator}/BlockLightningRod.java (95%) rename src/main/java/techreborn/blocks/{ => generator}/BlockMagicEnergyAbsorber.java (95%) rename src/main/java/techreborn/blocks/{ => generator}/BlockMagicEnergyConverter.java (96%) rename src/main/java/techreborn/blocks/{ => generator}/BlockPlasmaGenerator.java (95%) rename src/main/java/techreborn/blocks/{ => generator}/BlockSemiFluidGenerator.java (96%) rename src/main/java/techreborn/blocks/{ => generator}/BlockThermalGenerator.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockAlloyFurnace.java (95%) rename src/main/java/techreborn/blocks/{ => machine}/BlockAlloySmelter.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockAssemblingMachine.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockBlastFurnace.java (97%) rename src/main/java/techreborn/blocks/{ => machine}/BlockCentrifuge.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockChemicalReactor.java (95%) rename src/main/java/techreborn/blocks/{ => machine}/BlockDistillationTower.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockGrinder.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockImplosionCompressor.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockIndustrialElectrolyzer.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockLathe.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockMatterFabricator.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockPlateCuttingMachine.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockRollingMachine.java (96%) rename src/main/java/techreborn/blocks/{ => machine}/BlockVacuumFreezer.java (95%) rename src/main/java/techreborn/blocks/{ => storage}/BlockAesu.java (95%) rename src/main/java/techreborn/blocks/{ => storage}/BlockIDSU.java (95%) rename src/main/java/techreborn/blocks/{ => storage}/BlockLesu.java (95%) rename src/main/java/techreborn/blocks/{ => storage}/BlockLesuStorage.java (95%) diff --git a/src/main/java/techreborn/blocks/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockDieselGenerator.java rename to src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index df0b9a7e4..0503e9311 100644 --- a/src/main/java/techreborn/blocks/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.generator; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockDragonEggSiphoner.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockDragonEggSiphoner.java rename to src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java index fd683174a..157cdfa30 100644 --- a/src/main/java/techreborn/blocks/BlockDragonEggSiphoner.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.generator; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockLightningRod.java rename to src/main/java/techreborn/blocks/generator/BlockLightningRod.java index 34452f957..e0dfea763 100644 --- a/src/main/java/techreborn/blocks/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.generator; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockMagicEnergyAbsorber.java rename to src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index 4e1a02ae2..b05516a4d 100644 --- a/src/main/java/techreborn/blocks/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.generator; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java rename to src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 09a3b9c49..4a6589963 100644 --- a/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.generator; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockPlasmaGenerator.java rename to src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index bd4fb35b7..8ba6804e7 100644 --- a/src/main/java/techreborn/blocks/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.generator; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockSemiFluidGenerator.java rename to src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index d879bae12..b533cbaee 100644 --- a/src/main/java/techreborn/blocks/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.generator; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockThermalGenerator.java rename to src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index 28d6fa463..1503e17ac 100644 --- a/src/main/java/techreborn/blocks/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.generator; import java.util.Random; @@ -16,6 +16,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.TileThermalGenerator; diff --git a/src/main/java/techreborn/blocks/BlockAlloyFurnace.java b/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockAlloyFurnace.java rename to src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java index 3a20f3cff..944c541ca 100644 --- a/src/main/java/techreborn/blocks/BlockAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockAlloySmelter.java rename to src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java index b45f0295c..777588fae 100644 --- a/src/main/java/techreborn/blocks/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockAssemblingMachine.java rename to src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index c76b3657e..e4dc32b7b 100644 --- a/src/main/java/techreborn/blocks/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockBlastFurnace.java b/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java similarity index 97% rename from src/main/java/techreborn/blocks/BlockBlastFurnace.java rename to src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java index 76dc52bca..c3c43eb37 100644 --- a/src/main/java/techreborn/blocks/BlockBlastFurnace.java +++ b/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileBlastFurnace; diff --git a/src/main/java/techreborn/blocks/BlockCentrifuge.java b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockCentrifuge.java rename to src/main/java/techreborn/blocks/machine/BlockCentrifuge.java index 3fd89f7ae..3a00f3101 100644 --- a/src/main/java/techreborn/blocks/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -12,6 +12,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.tiles.TileCentrifuge; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/techreborn/blocks/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockChemicalReactor.java rename to src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index a902df1df..ce8c75f27 100644 --- a/src/main/java/techreborn/blocks/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockDistillationTower.java b/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockDistillationTower.java rename to src/main/java/techreborn/blocks/machine/BlockDistillationTower.java index 65b195aa1..ca306fc7e 100644 --- a/src/main/java/techreborn/blocks/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockGrinder.java b/src/main/java/techreborn/blocks/machine/BlockGrinder.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockGrinder.java rename to src/main/java/techreborn/blocks/machine/BlockGrinder.java index 0fff90219..50fb22b02 100644 --- a/src/main/java/techreborn/blocks/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/machine/BlockGrinder.java @@ -1,8 +1,9 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileGrinder; diff --git a/src/main/java/techreborn/blocks/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockImplosionCompressor.java rename to src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java index 22786b94b..332b69843 100644 --- a/src/main/java/techreborn/blocks/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java @@ -1,8 +1,9 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileImplosionCompressor; diff --git a/src/main/java/techreborn/blocks/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockIndustrialElectrolyzer.java rename to src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java index c47385d2f..8ad0aa2b1 100644 --- a/src/main/java/techreborn/blocks/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockLathe.java b/src/main/java/techreborn/blocks/machine/BlockLathe.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockLathe.java rename to src/main/java/techreborn/blocks/machine/BlockLathe.java index b9cadfde9..90d75186a 100644 --- a/src/main/java/techreborn/blocks/BlockLathe.java +++ b/src/main/java/techreborn/blocks/machine/BlockLathe.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockMatterFabricator.java rename to src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java index 3dfd0ce0f..10aa639cb 100644 --- a/src/main/java/techreborn/blocks/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java @@ -1,8 +1,9 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileMatterFabricator; diff --git a/src/main/java/techreborn/blocks/BlockPlateCuttingMachine.java b/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockPlateCuttingMachine.java rename to src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java index 97aadca81..620df51c9 100644 --- a/src/main/java/techreborn/blocks/BlockPlateCuttingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockRollingMachine.java b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockRollingMachine.java rename to src/main/java/techreborn/blocks/machine/BlockRollingMachine.java index dc477a510..a9821f4e4 100644 --- a/src/main/java/techreborn/blocks/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -12,6 +12,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileRollingMachine; diff --git a/src/main/java/techreborn/blocks/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockVacuumFreezer.java rename to src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index c74cc150d..17d9decb3 100644 --- a/src/main/java/techreborn/blocks/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockAesu.java b/src/main/java/techreborn/blocks/storage/BlockAesu.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockAesu.java rename to src/main/java/techreborn/blocks/storage/BlockAesu.java index e17ba8d11..98ef49703 100644 --- a/src/main/java/techreborn/blocks/BlockAesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockAesu.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.storage; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockIDSU.java b/src/main/java/techreborn/blocks/storage/BlockIDSU.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockIDSU.java rename to src/main/java/techreborn/blocks/storage/BlockIDSU.java index 3cfc58268..906a24e3a 100644 --- a/src/main/java/techreborn/blocks/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockIDSU.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.storage; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockLesu.java b/src/main/java/techreborn/blocks/storage/BlockLesu.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockLesu.java rename to src/main/java/techreborn/blocks/storage/BlockLesu.java index 8b86ebc2f..d5617f200 100644 --- a/src/main/java/techreborn/blocks/BlockLesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockLesu.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.storage; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/BlockLesuStorage.java b/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockLesuStorage.java rename to src/main/java/techreborn/blocks/storage/BlockLesuStorage.java index 40d19426b..5f2860327 100644 --- a/src/main/java/techreborn/blocks/BlockLesuStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.storage; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import techreborn.Core; +import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 7ea7d7beb..79f7aac9a 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -5,46 +5,46 @@ import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import techreborn.blocks.BlockAesu; -import techreborn.blocks.BlockAlloyFurnace; -import techreborn.blocks.BlockAlloySmelter; -import techreborn.blocks.BlockAssemblingMachine; -import techreborn.blocks.BlockBlastFurnace; -import techreborn.blocks.BlockCentrifuge; -import techreborn.blocks.BlockChemicalReactor; import techreborn.blocks.BlockChunkLoader; -import techreborn.blocks.BlockDieselGenerator; -import techreborn.blocks.BlockDistillationTower; -import techreborn.blocks.BlockDragonEggSiphoner; import techreborn.blocks.BlockElectricCraftingTable; import techreborn.blocks.BlockFusionCoil; import techreborn.blocks.BlockFusionControlComputer; -import techreborn.blocks.BlockGrinder; import techreborn.blocks.BlockHighlyAdvancedMachine; -import techreborn.blocks.BlockIDSU; -import techreborn.blocks.BlockImplosionCompressor; -import techreborn.blocks.BlockIndustrialElectrolyzer; -import techreborn.blocks.BlockLathe; -import techreborn.blocks.BlockLesu; -import techreborn.blocks.BlockLesuStorage; -import techreborn.blocks.BlockLightningRod; import techreborn.blocks.BlockMachineCasing; -import techreborn.blocks.BlockMagicEnergyAbsorber; -import techreborn.blocks.BlockMagicEnergyConverter; -import techreborn.blocks.BlockMatterFabricator; import techreborn.blocks.BlockMetalShelf; import techreborn.blocks.BlockOre; -import techreborn.blocks.BlockPlasmaGenerator; -import techreborn.blocks.BlockPlateCuttingMachine; import techreborn.blocks.BlockQuantumChest; import techreborn.blocks.BlockQuantumTank; -import techreborn.blocks.BlockRollingMachine; -import techreborn.blocks.BlockSemiFluidGenerator; import techreborn.blocks.BlockStorage; import techreborn.blocks.BlockSupercondensator; -import techreborn.blocks.BlockThermalGenerator; -import techreborn.blocks.BlockVacuumFreezer; import techreborn.blocks.BlockWoodenshelf; +import techreborn.blocks.generator.BlockDieselGenerator; +import techreborn.blocks.generator.BlockDragonEggSiphoner; +import techreborn.blocks.generator.BlockLightningRod; +import techreborn.blocks.generator.BlockMagicEnergyAbsorber; +import techreborn.blocks.generator.BlockMagicEnergyConverter; +import techreborn.blocks.generator.BlockPlasmaGenerator; +import techreborn.blocks.generator.BlockSemiFluidGenerator; +import techreborn.blocks.generator.BlockThermalGenerator; +import techreborn.blocks.machine.BlockAlloyFurnace; +import techreborn.blocks.machine.BlockAlloySmelter; +import techreborn.blocks.machine.BlockAssemblingMachine; +import techreborn.blocks.machine.BlockBlastFurnace; +import techreborn.blocks.machine.BlockCentrifuge; +import techreborn.blocks.machine.BlockChemicalReactor; +import techreborn.blocks.machine.BlockDistillationTower; +import techreborn.blocks.machine.BlockGrinder; +import techreborn.blocks.machine.BlockImplosionCompressor; +import techreborn.blocks.machine.BlockIndustrialElectrolyzer; +import techreborn.blocks.machine.BlockLathe; +import techreborn.blocks.machine.BlockMatterFabricator; +import techreborn.blocks.machine.BlockPlateCuttingMachine; +import techreborn.blocks.machine.BlockRollingMachine; +import techreborn.blocks.machine.BlockVacuumFreezer; +import techreborn.blocks.storage.BlockAesu; +import techreborn.blocks.storage.BlockIDSU; +import techreborn.blocks.storage.BlockLesu; +import techreborn.blocks.storage.BlockLesuStorage; import techreborn.client.TechRebornCreativeTab; import techreborn.itemblocks.ItemBlockMachineCasing; import techreborn.itemblocks.ItemBlockOre;