diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java similarity index 98% rename from src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java rename to src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java index 5fcfbe69b..de86f0815 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.machine; +package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/BlockAutoCraftingTable.java b/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java similarity index 98% rename from src/main/java/techreborn/blocks/BlockAutoCraftingTable.java rename to src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java index b036fe66f..19c0b9a7c 100644 --- a/src/main/java/techreborn/blocks/BlockAutoCraftingTable.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks; +package techreborn.blocks.tier1; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/techreborn/blocks/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java similarity index 99% rename from src/main/java/techreborn/blocks/BlockPlayerDetector.java rename to src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java index 99474ee29..6b2c94e94 100644 --- a/src/main/java/techreborn/blocks/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks; +package techreborn.blocks.tier1; import com.google.common.collect.Lists; import net.minecraft.block.state.BlockStateContainer; diff --git a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java similarity index 98% rename from src/main/java/techreborn/blocks/machine/BlockRollingMachine.java rename to src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java index 9a6db1711..aa41ac473 100644 --- a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.machine; +package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java b/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java similarity index 98% rename from src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java rename to src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java index fb3741dfc..2ba08cd6c 100644 --- a/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java +++ b/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.machine; +package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/machine/BlockChargeOMat.java b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java similarity index 98% rename from src/main/java/techreborn/blocks/machine/BlockChargeOMat.java rename to src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java index 5743f7d39..be82b1d70 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChargeOMat.java +++ b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.machine; +package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java similarity index 96% rename from src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java rename to src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java index 7c8996724..eee18af5f 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.machine; +package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -40,7 +40,7 @@ public class BlockChemicalReactor extends BlockMachineBase { public BlockChemicalReactor() { super(); this.setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/BlockDigitalChest.java b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java similarity index 98% rename from src/main/java/techreborn/blocks/BlockDigitalChest.java rename to src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java index 0c0172fd3..92446ad98 100644 --- a/src/main/java/techreborn/blocks/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks; +package techreborn.blocks.tier2; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java similarity index 98% rename from src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java rename to src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java index 706e9a110..d3795478a 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.advanced_machine; +package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java similarity index 97% rename from src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java rename to src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java index a080c06ea..95d73c0f2 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.advanced_machine; +package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java similarity index 98% rename from src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java rename to src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java index 0cfe7814f..8a5b8512a 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.advanced_machine; +package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java similarity index 97% rename from src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java rename to src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java index ce118a5bf..4f017ecb0 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.advanced_machine; +package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java similarity index 96% rename from src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java rename to src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java index cdcff670b..1fc6f1c3a 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.advanced_machine; +package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -40,7 +40,7 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase { public BlockIndustrialElectrolyzer() { super(); this.setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java similarity index 97% rename from src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java rename to src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java index 978f6e60c..374a10107 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.advanced_machine; +package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java similarity index 97% rename from src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java rename to src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java index 89d9847fa..2afa4d932 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.advanced_machine; +package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java similarity index 98% rename from src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java rename to src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java index 0520f15a9..08d604c36 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.machine; +package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java similarity index 98% rename from src/main/java/techreborn/blocks/machine/BlockChunkLoader.java rename to src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java index cfe91a46d..b498b15e1 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.machine; +package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockFluidReplicator.java b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java similarity index 98% rename from src/main/java/techreborn/blocks/advanced_machine/BlockFluidReplicator.java rename to src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java index c336eea91..b21097d16 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockFluidReplicator.java +++ b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.advanced_machine; +package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java similarity index 98% rename from src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java rename to src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java index 8c2470377..a97a3b519 100644 --- a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.machine; +package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java similarity index 98% rename from src/main/java/techreborn/blocks/BlockQuantumChest.java rename to src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java index 3a24f37ba..d093b6ac0 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks; +package techreborn.blocks.tier3; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java similarity index 98% rename from src/main/java/techreborn/blocks/BlockQuantumTank.java rename to src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java index aa94609d3..c00b03b66 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks; +package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 0da754663..e7a6515db 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -37,15 +37,15 @@ import reborncore.common.util.OreUtil; import reborncore.common.util.StringUtils; import techreborn.Core; import techreborn.blocks.*; -import techreborn.blocks.advanced_machine.*; import techreborn.blocks.cable.BlockCable; import techreborn.blocks.generator.*; import techreborn.blocks.generator.solarpanel.BlockSolarPanel; import techreborn.blocks.lighting.BlockLamp; -import techreborn.blocks.machine.*; import techreborn.blocks.storage.*; import techreborn.blocks.tier0.*; import techreborn.blocks.tier1.*; +import techreborn.blocks.tier2.*; +import techreborn.blocks.tier3.*; import techreborn.blocks.transformers.BlockHVTransformer; import techreborn.blocks.transformers.BlockLVTransformer; import techreborn.blocks.transformers.BlockMVTransformer; diff --git a/src/main/java/techreborn/itemblocks/ItemBlockPlayerDetector.java b/src/main/java/techreborn/itemblocks/ItemBlockPlayerDetector.java index 637e0204a..247e9b585 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockPlayerDetector.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockPlayerDetector.java @@ -26,7 +26,7 @@ package techreborn.itemblocks; import net.minecraft.block.Block; import reborncore.common.itemblock.ItemBlockBase; -import techreborn.blocks.BlockPlayerDetector; +import techreborn.blocks.tier1.BlockPlayerDetector; import techreborn.init.ModBlocks; public class ItemBlockPlayerDetector extends ItemBlockBase {