diff --git a/src/main/java/techreborn/blocks/BlockComputerCube.java b/src/main/java/techreborn/blocks/BlockComputerCube.java index f38ad8778..197f63559 100644 --- a/src/main/java/techreborn/blocks/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/BlockComputerCube.java @@ -27,7 +27,7 @@ public class BlockComputerCube extends BlockMachineBase implements IAdvancedRota return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/BlockDigitalChest.java b/src/main/java/techreborn/blocks/BlockDigitalChest.java index 61bb0b037..73b6b699b 100644 --- a/src/main/java/techreborn/blocks/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/BlockDigitalChest.java @@ -32,7 +32,7 @@ public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRota return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java index 307715333..7673ebab9 100644 --- a/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java +++ b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java @@ -15,7 +15,7 @@ public class BlockElectricCraftingTable extends BlockMachineBase implements IAdv setCreativeTab(TechRebornCreativeTab.instance); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/BlockFusionCoil.java b/src/main/java/techreborn/blocks/BlockFusionCoil.java index 24b61fbf9..f13379342 100644 --- a/src/main/java/techreborn/blocks/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/BlockFusionCoil.java @@ -16,7 +16,7 @@ public class BlockFusionCoil extends BlockMachineBase { } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) { diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index 778ec8d89..a751dda2a 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -48,7 +48,7 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv return new TileEntityFusionController(); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { @@ -57,16 +57,16 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv @Override public String getSide(boolean isActive) { - return prefix + "plasma_generator_side_off" ; + return prefix + "fusion_control_computer_side" ; } @Override public String getTop(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return prefix + "fusion_control_computer_top"; } @Override public String getBottom(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return prefix + "fusion_control_computer_bottom"; } } diff --git a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java index c129a5227..9c299d3ab 100644 --- a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java +++ b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java @@ -14,7 +14,7 @@ public class BlockHighlyAdvancedMachine extends BlockMachineBase { setCreativeTab(TechRebornCreativeTab.instance); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/machine_blocks/"; @Override diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 1d23863b3..a7780942b 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -100,8 +100,8 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured } @Override - public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) { - return "techreborn:blocks/machine/casing" + types[getMetaFromState(BlockStateContainer)] + "_full"; + public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { + return "techreborn:blocks/machine/machine_blocks/casing" + types[getMetaFromState(blockState)] + "_full"; } @Override diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index cd0b3467a..76d780c27 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -57,8 +57,8 @@ public class BlockMachineFrame extends BaseBlock implements ITexturedBlock { } @Override - public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) { - return "techreborn:blocks/machine/" + types[getMetaFromState(BlockStateContainer)] + "_machine_block"; + public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { + return "techreborn:blocks/machine/machine_blocks/" + types[getMetaFromState(blockState)] + "_machine_block"; } @Override diff --git a/src/main/java/techreborn/blocks/BlockNuke.java b/src/main/java/techreborn/blocks/BlockNuke.java index 65c9632ea..d71b9945f 100644 --- a/src/main/java/techreborn/blocks/BlockNuke.java +++ b/src/main/java/techreborn/blocks/BlockNuke.java @@ -53,8 +53,8 @@ public class BlockNuke extends BlockTNT implements ITexturedBlock { } @Override - public String getTextureNameFromState(IBlockState IBlockState, EnumFacing enumFacing) { - return "techreborn:blocks/machine/machine_bottom"; + public String getTextureNameFromState(IBlockState iBlockState, EnumFacing enumFacing) { + return "techreborn:blocks/machine/greg_machine/nuke"; } @Override diff --git a/src/main/java/techreborn/blocks/BlockOre2.java b/src/main/java/techreborn/blocks/BlockOre2.java index f29ac29ca..2f01051b2 100644 --- a/src/main/java/techreborn/blocks/BlockOre2.java +++ b/src/main/java/techreborn/blocks/BlockOre2.java @@ -62,8 +62,8 @@ public class BlockOre2 extends BaseBlock implements ITexturedBlock, IOreNameProv setUnlocalizedName("techreborn.ore2"); setCreativeTab(TechRebornCreativeTabMisc.instance); setHardness(2.0f); - setHarvestLevel("pickaxe", 2); - this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0)); + setHarvestLevel("pickaxe", 1); + this.setDefaultState(this.blockState.getBaseState().withProperty(METADATA, 0)); } @Override diff --git a/src/main/java/techreborn/blocks/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/BlockPlayerDetector.java index 0701d0ac9..60193f04c 100644 --- a/src/main/java/techreborn/blocks/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/BlockPlayerDetector.java @@ -124,8 +124,8 @@ public class BlockPlayerDetector extends BaseTileBlock implements ITexturedBlock } @Override - public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) { - return "techreborn:blocks/machine/player_detector_" + types[getMetaFromState(BlockStateContainer)]; + public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { + return "techreborn:blocks/machine/greg_machines/player_detector_" + types[getMetaFromState(blockState)]; } @Override diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index 8eed67ffd..a46c8be5c 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -37,7 +37,8 @@ public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRota return true; } - private final String prefix = "techreborn:blocks/machine/"; + + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/BlockQuantumTank.java index 5c71190e0..156f9edb7 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/BlockQuantumTank.java @@ -36,7 +36,7 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/BlockSupercondensator.java b/src/main/java/techreborn/blocks/BlockSupercondensator.java index 1c7043c94..2869fdbb8 100644 --- a/src/main/java/techreborn/blocks/BlockSupercondensator.java +++ b/src/main/java/techreborn/blocks/BlockSupercondensator.java @@ -14,7 +14,7 @@ public class BlockSupercondensator extends BlockMachineBase implements IAdvanced setCreativeTab(TechRebornCreativeTab.instance); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java b/src/main/java/techreborn/blocks/advanced_machine/BlockBlastFurnace.java similarity index 87% rename from src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java rename to src/main/java/techreborn/blocks/advanced_machine/BlockBlastFurnace.java index a5c5541d1..98c175447 100644 --- a/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockBlastFurnace.java @@ -1,4 +1,4 @@ -package techreborn.blocks.machine; +package techreborn.blocks.advanced_machine; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -36,7 +36,7 @@ public class BlockBlastFurnace extends BlockMachineBase implements IRotationText return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/advanced_machines/"; @Override public String getFrontOff() { @@ -55,11 +55,11 @@ public class BlockBlastFurnace extends BlockMachineBase implements IRotationText @Override public String getTop() { - return prefix + "advanced_machine_side"; + return prefix + "advanced_machine_top"; } @Override public String getBottom() { - return prefix + "assembling_machine_top"; + return prefix + "advanced_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java b/src/main/java/techreborn/blocks/advanced_machine/BlockCentrifuge.java similarity index 92% rename from src/main/java/techreborn/blocks/machine/BlockCentrifuge.java rename to src/main/java/techreborn/blocks/advanced_machine/BlockCentrifuge.java index 60d17eaa7..8ffd3a3b4 100644 --- a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockCentrifuge.java @@ -1,4 +1,4 @@ -package techreborn.blocks.machine; +package techreborn.blocks.advanced_machine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -31,7 +31,7 @@ public class BlockCentrifuge extends BlockMachineBase implements IRotationTextur return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/advanced_machines/"; @Override public String getFrontOff() { diff --git a/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java b/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java similarity index 89% rename from src/main/java/techreborn/blocks/machine/BlockDistillationTower.java rename to src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java index 41adef5ec..1adc3b48d 100644 --- a/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java @@ -1,4 +1,4 @@ -package techreborn.blocks.machine; +package techreborn.blocks.advanced_machine; import net.minecraft.block.material.Material; import reborncore.common.blocks.BlockMachineBase; @@ -13,7 +13,7 @@ public class BlockDistillationTower extends BlockMachineBase implements IRotatio setCreativeTab(TechRebornCreativeTab.instance); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/advanced_machines/"; @Override public String getFrontOff() { diff --git a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java similarity index 93% rename from src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java rename to src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java index 0567bcc39..a40ac2cdf 100644 --- a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java @@ -1,4 +1,4 @@ -package techreborn.blocks.machine; +package techreborn.blocks.advanced_machine; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -31,7 +31,7 @@ public class BlockImplosionCompressor extends BlockMachineBase implements IRotat return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/advanced_machines/"; @Override public String getFrontOff() { diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java similarity index 93% rename from src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java rename to src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java index fa80ff122..aca563760 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java @@ -1,4 +1,4 @@ -package techreborn.blocks.machine; +package techreborn.blocks.advanced_machine; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -31,7 +31,7 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase implements IRo return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/advanced_machines/"; @Override public String getFrontOff() { diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java similarity index 93% rename from src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java rename to src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java index 197505bec..3559fb142 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java @@ -1,4 +1,4 @@ -package techreborn.blocks.machine; +package techreborn.blocks.advanced_machine; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -35,7 +35,7 @@ public class BlockIndustrialGrinder extends BlockMachineBase implements IRotatio return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/advanced_machines/"; @Override public String getFrontOff() { diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java similarity index 93% rename from src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java rename to src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java index 6f1f85cea..c55606036 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java @@ -1,4 +1,4 @@ -package techreborn.blocks.machine; +package techreborn.blocks.advanced_machine; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -35,7 +35,7 @@ public class BlockIndustrialSawmill extends BlockMachineBase implements IRotatio return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/advanced_machines/"; @Override public String getFrontOff() { diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index f1ca43457..6633d3a4b 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -39,16 +39,16 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { - return prefix + "machine_side"; + return prefix + "generator_machine_side"; } @Override public String getSide(boolean isActive) { - return prefix + "machine_side" ; + return prefix + "generator_machine_side" ; } @Override @@ -58,7 +58,7 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR @Override public String getBottom(boolean isActive) { - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java index 4dc91a31d..6c7d94f36 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java @@ -24,7 +24,7 @@ public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvance return new TileDragonEggSiphoner(); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { @@ -43,7 +43,7 @@ public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvance @Override public String getBottom(boolean isActive) { - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index ebab36c01..1a0b94f90 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -38,16 +38,16 @@ public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotati return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { - return prefix + "machine_side"; + return prefix + "generator_machine_side"; } @Override public String getSide(boolean isActive) { - return prefix + "machine_side" ; + return prefix + "generator_machine_side" ; } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockGenerator.java b/src/main/java/techreborn/blocks/generator/BlockGenerator.java index 255b55569..4d90ea743 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockGenerator.java @@ -31,7 +31,7 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFrontOff() { @@ -45,16 +45,16 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture @Override public String getSide() { - return prefix + "machine_side" ; + return prefix + "generator_machine_side" ; } @Override public String getTop() { - return prefix + "machine_top"; + return prefix + "generator_machine_top"; } @Override public String getBottom() { - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java index 9121ca4c0..f20367b6d 100644 --- a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java @@ -24,7 +24,7 @@ public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRot return new TileHeatGenerator(); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index caeffbda4..1f25090b2 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -14,16 +14,16 @@ public class BlockLightningRod extends BlockMachineBase implements IAdvancedRota setCreativeTab(TechRebornCreativeTab.instance); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { - return prefix + "idsu_front"; + return prefix + "lightning_rod_side"; } @Override public String getSide(boolean isActive) { - return prefix + "idsu_front" ; + return prefix + "lightning_rod_side" ; } @Override @@ -33,7 +33,7 @@ public class BlockLightningRod extends BlockMachineBase implements IAdvancedRota @Override public String getBottom(boolean isActive) { - return prefix + "extreme_voltage_machine_side"; + return prefix + "lightning_rod_bottom"; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index e4960fbf0..c875db2c1 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -14,7 +14,7 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase implements IAdvan } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 54a4746a7..31417b778 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -14,7 +14,7 @@ public class BlockMagicEnergyConverter extends BlockMachineBase implements IAdva } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index 22b3475e7..677b28f8e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -15,7 +15,7 @@ public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedR setCreativeTab(TechRebornCreativeTab.instance); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { @@ -29,12 +29,12 @@ public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedR @Override public String getTop(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return prefix + "plasma_generator_bottom"; } @Override public String getBottom(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return prefix + "plasma_generator_bottom"; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index 517e6a863..37556f5e0 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -39,7 +39,7 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { @@ -53,12 +53,12 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc @Override public String getTop(boolean isActive) { - return prefix + "machine_top"; + return prefix + "generator_machine_top"; } @Override public String getBottom(boolean isActive) { - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index fb8aa6902..0335fab5f 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -46,7 +46,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock { return new TileSolarPanel(); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getTextureNameFromState(IBlockState state, EnumFacing side) { @@ -54,7 +54,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock { if(side == EnumFacing.UP){ return prefix + "solar_panel_top_" + (isActive ? "on" : "off"); } else if(side==EnumFacing.DOWN){ - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } return prefix + "solar_panel_side_" + (isActive ? "on" : "off"); } diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index ecdf8d6eb..90c908665 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -38,7 +38,7 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override @@ -58,6 +58,6 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced @Override public String getBottom(boolean isActive) { - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java similarity index 88% rename from src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java rename to src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java index d5ea8fbb2..595facfbb 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java @@ -1,4 +1,4 @@ -package techreborn.blocks.machine; +package techreborn.blocks.iron_machines; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -45,7 +45,7 @@ public class BlockAlloyFurnace extends BlockMachineBase implements IRotationText return items; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/iron_machines/"; @Override public String getFrontOff() { @@ -59,16 +59,16 @@ public class BlockAlloyFurnace extends BlockMachineBase implements IRotationText @Override public String getSide() { - return prefix + "alloy_furnace_side"; + return prefix + "iron_machine_side"; } @Override public String getTop() { - return prefix + "alloy_furnace_top"; + return prefix + "iron_machine_top"; } @Override public String getBottom() { - return prefix + "machine_bottom"; + return prefix + "iron_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/BlockIronFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java similarity index 93% rename from src/main/java/techreborn/blocks/BlockIronFurnace.java rename to src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java index ad6795a72..43318cc84 100644 --- a/src/main/java/techreborn/blocks/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.iron_machines; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -83,7 +83,7 @@ public class BlockIronFurnace extends BlockMachineBase implements IRotationTextu } } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/iron_machines/"; @Override public String getFrontOff() { @@ -97,16 +97,16 @@ public class BlockIronFurnace extends BlockMachineBase implements IRotationTextu @Override public String getSide() { - return prefix + "iron_furnace_side"; + return prefix + "iron_machine_side"; } @Override public String getTop() { - return prefix + "iron_furnace_top"; + return prefix + "iron_machine_top"; } @Override public String getBottom() { - return prefix + "iron_furnace_bottom"; + return prefix + "iron_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index 477eb1049..31f3357b4 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -32,7 +32,7 @@ public class BlockAssemblingMachine extends BlockMachineBase implements IRotatio return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFrontOff() { diff --git a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java index 4d3d9de09..fb56b6e35 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java +++ b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java @@ -31,7 +31,7 @@ public class BlockChargeBench extends BlockMachineBase implements IRotationTextu return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFrontOff() { diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index c9f409f12..a5bd15b51 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -32,7 +32,7 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFrontOff() { @@ -51,11 +51,11 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT @Override public String getTop() { - return prefix + "industrial_centrifuge_top_off"; + return prefix + "chemical_reactor_top"; } @Override public String getBottom() { - return prefix + "industrial_centrifuge_bottom"; + return prefix + "chemical_reactor_bottom"; } } diff --git a/src/main/java/techreborn/blocks/BlockChunkLoader.java b/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java similarity index 93% rename from src/main/java/techreborn/blocks/BlockChunkLoader.java rename to src/main/java/techreborn/blocks/machine/BlockChunkLoader.java index ebfada4d5..c0faae1fc 100644 --- a/src/main/java/techreborn/blocks/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java @@ -1,4 +1,4 @@ -package techreborn.blocks; +package techreborn.blocks.machine; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -34,7 +34,7 @@ public class BlockChunkLoader extends BlockMachineBase implements IAdvancedRotat return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java index 744315cfd..0ce91a44c 100644 --- a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java @@ -31,7 +31,7 @@ public class BlockMatterFabricator extends BlockMachineBase implements IAdvanced return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public boolean isAdvanced() { diff --git a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java index 9f186fb5e..727241532 100644 --- a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java @@ -31,7 +31,7 @@ public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRo return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/teir1/BlockGrinder.java b/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java similarity index 60% rename from src/main/java/techreborn/blocks/teir1/BlockGrinder.java rename to src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java index 6f5bc1aa7..b0cc8b2b4 100644 --- a/src/main/java/techreborn/blocks/teir1/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java @@ -1,4 +1,4 @@ -package techreborn.blocks.teir1; +package techreborn.blocks.machine; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -9,39 +9,40 @@ import reborncore.common.blocks.IRotationTexture; import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.teir1.TileGrinder; +import techreborn.tiles.TileScrapboxinator; +import techreborn.tiles.teir1.TileRecycler; -public class BlockGrinder extends BlockMachineBase implements IRotationTexture{ +public class BlockScrapboxinator extends BlockMachineBase implements IRotationTexture{ - public BlockGrinder(Material material) { + public BlockScrapboxinator(Material material) { super(); - setUnlocalizedName("techreborn.grinder"); + setUnlocalizedName("techreborn.scrapboxinator"); setCreativeTab(TechRebornCreativeTab.instance); } @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileGrinder(); + return new TileScrapboxinator(); } @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!player.isSneaking()){ - player.openGui(Core.INSTANCE, GuiHandler.grinderID, world, x, y, z); + player.openGui(Core.INSTANCE, GuiHandler.scrapboxinatorID, world, x, y, z); } return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFrontOff() { - return prefix + "industrial_grinder_front_off"; + return prefix + "scrapboxinator_front_off"; } @Override public String getFrontOn() { - return prefix + "industrial_grinder_front_on"; + return prefix + "scrapboxinator_front_on"; } @Override @@ -51,11 +52,11 @@ public class BlockGrinder extends BlockMachineBase implements IRotationTexture{ @Override public String getTop() { - return prefix + "industrial_grinder_top_off"; + return prefix + "machine_top"; } @Override public String getBottom() { - return prefix + "industrial_centrifuge_bottom"; + return prefix + "machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index c00d3ec49..93e88e3fc 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -34,7 +34,7 @@ public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRot return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/storage/BlockAesu.java b/src/main/java/techreborn/blocks/storage/BlockAESU.java similarity index 85% rename from src/main/java/techreborn/blocks/storage/BlockAesu.java rename to src/main/java/techreborn/blocks/storage/BlockAESU.java index 40bdf836f..1c78d39b7 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockAESU.java @@ -11,11 +11,9 @@ import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAesu; -public class BlockAesu extends BlockMachineBase implements IRotationTexture { +public class BlockAESU extends BlockMachineBase implements IRotationTexture { - - - public BlockAesu(Material material) { + public BlockAESU(Material material) { super(); setUnlocalizedName("techreborn.aesu"); setCreativeTab(TechRebornCreativeTab.instance); @@ -35,7 +33,7 @@ public class BlockAesu extends BlockMachineBase implements IRotationTexture { return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/storage/"; @Override public String getFrontOff() { @@ -54,12 +52,12 @@ public class BlockAesu extends BlockMachineBase implements IRotationTexture { @Override public String getTop() { - return prefix + "aesu_side"; + return prefix + "aesu_top"; } @Override public String getBottom() { - return prefix + "aesu_side"; + return prefix + "aesu_bottom"; } } diff --git a/src/main/java/techreborn/blocks/storage/BlockBatBox.java b/src/main/java/techreborn/blocks/storage/BlockBatBox.java new file mode 100644 index 000000000..99b629a98 --- /dev/null +++ b/src/main/java/techreborn/blocks/storage/BlockBatBox.java @@ -0,0 +1,55 @@ +package techreborn.blocks.storage; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import reborncore.common.blocks.BlockMachineBase; +import reborncore.common.blocks.IRotationTexture; +import techreborn.client.TechRebornCreativeTab; +import techreborn.tiles.storage.TileBatBox; + +/** + * Created by modmuss50 on 14/03/2016. + */ +public class BlockBatBox extends BlockMachineBase implements IRotationTexture { + + public BlockBatBox() { + super(); + setUnlocalizedName("techreborn.batBox"); + setCreativeTab(TechRebornCreativeTab.instance); + } + + @Override + public TileEntity createNewTileEntity(World world, int p_149915_2_) { + return new TileBatBox(); + } + + protected final String prefix = "techreborn:blocks/machine/storage/"; + + @Override + public String getFrontOff() { + return prefix + "batbox_front"; + } + + @Override + public String getFrontOn() { + return prefix + "batbox_front"; + } + + @Override + public String getSide() { + return prefix + "batbox_side"; + } + + @Override + public String getTop() { + return prefix + "batbox_top"; + } + + @Override + public String getBottom() { + return prefix + "batbox_bottom"; + } + +} \ No newline at end of file diff --git a/src/main/java/techreborn/blocks/storage/BlockIDSU.java b/src/main/java/techreborn/blocks/storage/BlockIDSU.java index 53178728e..86782a4cd 100644 --- a/src/main/java/techreborn/blocks/storage/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockIDSU.java @@ -48,7 +48,7 @@ public class BlockIDSU extends BlockMachineBase implements IAdvancedRotationText } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/storage/"; @Override @@ -63,12 +63,12 @@ public class BlockIDSU extends BlockMachineBase implements IAdvancedRotationText @Override public String getTop(boolean isActive) { - return prefix + "idsu_side"; + return prefix + "idsu_top"; } @Override public String getBottom(boolean isActive) { - return prefix + "idsu_side"; + return prefix + "idsu_bottom"; } } diff --git a/src/main/java/techreborn/blocks/storage/BlockLesu.java b/src/main/java/techreborn/blocks/storage/BlockLESU.java similarity index 85% rename from src/main/java/techreborn/blocks/storage/BlockLesu.java rename to src/main/java/techreborn/blocks/storage/BlockLESU.java index a53a05cf5..3f23d4457 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockLESU.java @@ -11,10 +11,10 @@ import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.lesu.TileLesu; -public class BlockLesu extends BlockMachineBase implements IAdvancedRotationTexture { +public class BlockLESU extends BlockMachineBase implements IAdvancedRotationTexture { - public BlockLesu(Material material) { + public BlockLESU(Material material) { super(); setUnlocalizedName("techreborn.lesu"); setCreativeTab(TechRebornCreativeTab.instance); @@ -35,7 +35,7 @@ public class BlockLesu extends BlockMachineBase implements IAdvancedRotationText return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/storage/"; @Override @@ -50,12 +50,12 @@ public class BlockLesu extends BlockMachineBase implements IAdvancedRotationText @Override public String getTop(boolean isActive) { - return prefix + "lesu_side"; + return prefix + "lesu_top"; } @Override public String getBottom(boolean isActive) { - return prefix + "lesu_side"; + return prefix + "lesu_bottom"; } } diff --git a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java b/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java similarity index 92% rename from src/main/java/techreborn/blocks/storage/BlockLesuStorage.java rename to src/main/java/techreborn/blocks/storage/BlockLESUStorage.java index f98d8ec96..4fd805849 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java @@ -13,9 +13,9 @@ import reborncore.common.blocks.IAdvancedRotationTexture; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.lesu.TileLesuStorage; -public class BlockLesuStorage extends BlockMachineBase implements IAdvancedRotationTexture { +public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotationTexture { - public BlockLesuStorage(Material material) { + public BlockLESUStorage(Material material) { super(); setUnlocalizedName("techreborn.lesustorage"); setCreativeTab(TechRebornCreativeTab.instance); @@ -48,7 +48,7 @@ public class BlockLesuStorage extends BlockMachineBase implements IAdvancedRotat return block == (Block) this; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/storage/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/storage/BlockMFE.java b/src/main/java/techreborn/blocks/storage/BlockMFE.java new file mode 100644 index 000000000..edd6bae17 --- /dev/null +++ b/src/main/java/techreborn/blocks/storage/BlockMFE.java @@ -0,0 +1,48 @@ +package techreborn.blocks.storage; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import techreborn.client.TechRebornCreativeTab; +import techreborn.tiles.storage.TileMFE; + +/** + * Created by modmuss50 on 14/03/2016. + */ +public class BlockMFE extends BlockBatBox { + + public BlockMFE() { + super(); + setUnlocalizedName("techreborn.mfe"); + setCreativeTab(TechRebornCreativeTab.instance); + } + + @Override + public TileEntity createNewTileEntity(World world, int p_149915_2_) { + return new TileMFE(); + } + + @Override + public String getFrontOff() { + return prefix + "mfe_front"; + } + + @Override + public String getFrontOn() { + return prefix + "mfe_front"; + } + + @Override + public String getSide() { + return prefix + "mfe_side"; + } + + @Override + public String getTop() { + return prefix + "mfe_top"; + } + + @Override + public String getBottom() { + return prefix + "mfe_bottom"; + } +} diff --git a/src/main/java/techreborn/blocks/storage/BlockMFSU.java b/src/main/java/techreborn/blocks/storage/BlockMFSU.java new file mode 100644 index 000000000..96bfe9fb8 --- /dev/null +++ b/src/main/java/techreborn/blocks/storage/BlockMFSU.java @@ -0,0 +1,48 @@ +package techreborn.blocks.storage; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import techreborn.client.TechRebornCreativeTab; +import techreborn.tiles.storage.TileMFSU; + +/** + * Created by modmuss50 on 14/03/2016. + */ +public class BlockMFSU extends BlockBatBox { + + public BlockMFSU() { + super(); + setUnlocalizedName("techreborn.mfsu"); + setCreativeTab(TechRebornCreativeTab.instance); + } + + @Override + public TileEntity createNewTileEntity(World world, int p_149915_2_) { + return new TileMFSU(); + } + + @Override + public String getFrontOff() { + return prefix + "mfsu_front"; + } + + @Override + public String getFrontOn() { + return prefix + "mfsu_front"; + } + + @Override + public String getSide() { + return prefix + "mfsu_side"; + } + + @Override + public String getTop() { + return prefix + "mfsu_top"; + } + + @Override + public String getBottom() { + return prefix + "mfsu_bottom"; + } +} diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java similarity index 85% rename from src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java rename to src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java index 46cf1764c..32b9c1c04 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java @@ -1,4 +1,4 @@ -package techreborn.blocks.machine; +package techreborn.blocks.tier1; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -31,7 +31,7 @@ public class BlockAlloySmelter extends BlockMachineBase implements IRotationText return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/tier1_machines/"; @Override public String getFrontOff() { @@ -45,16 +45,16 @@ public class BlockAlloySmelter extends BlockMachineBase implements IRotationText @Override public String getSide() { - return prefix + "machine_side"; + return prefix + "tier1_machine_side"; } @Override public String getTop() { - return prefix + "machine_top"; + return prefix + "tier1_machine_top"; } @Override public String getBottom() { - return prefix + "machine_bottom"; + return prefix + "tier1_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/teir1/BlockCompressor.java b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java similarity index 85% rename from src/main/java/techreborn/blocks/teir1/BlockCompressor.java rename to src/main/java/techreborn/blocks/tier1/BlockCompressor.java index ad7fc1c96..4baf139e7 100644 --- a/src/main/java/techreborn/blocks/teir1/BlockCompressor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java @@ -1,4 +1,4 @@ -package techreborn.blocks.teir1; +package techreborn.blocks.tier1; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -32,7 +32,7 @@ public class BlockCompressor extends BlockMachineBase implements IRotationTextur return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/tier1_machines/"; @Override public String getFrontOff() { @@ -46,16 +46,16 @@ public class BlockCompressor extends BlockMachineBase implements IRotationTextur @Override public String getSide() { - return prefix + "machine_side"; + return prefix + "tier1_machine_side"; } @Override public String getTop() { - return prefix + "machine_top"; + return prefix + "tier1_machine_top"; } @Override public String getBottom() { - return prefix + "machine_bottom"; + return prefix + "tier1_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/teir1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java similarity index 85% rename from src/main/java/techreborn/blocks/teir1/BlockElectricFurnace.java rename to src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java index f4bd8d44d..528791efa 100644 --- a/src/main/java/techreborn/blocks/teir1/BlockElectricFurnace.java +++ b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java @@ -1,4 +1,4 @@ -package techreborn.blocks.teir1; +package techreborn.blocks.tier1; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -32,7 +32,7 @@ public class BlockElectricFurnace extends BlockMachineBase implements IRotationT return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/tier1_machines/"; @Override public String getFrontOff() { @@ -46,16 +46,16 @@ public class BlockElectricFurnace extends BlockMachineBase implements IRotationT @Override public String getSide() { - return prefix + "machine_side" ; + return prefix + "tier1_machine_side" ; } @Override public String getTop() { - return prefix + "machine_top"; + return prefix + "tier1_machine_top"; } @Override public String getBottom() { - return prefix + "machine_bottom"; + return prefix + "tier1_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/teir1/BlockExtractor.java b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java similarity index 85% rename from src/main/java/techreborn/blocks/teir1/BlockExtractor.java rename to src/main/java/techreborn/blocks/tier1/BlockExtractor.java index 9bcfc5962..c620d5599 100644 --- a/src/main/java/techreborn/blocks/teir1/BlockExtractor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java @@ -1,4 +1,4 @@ -package techreborn.blocks.teir1; +package techreborn.blocks.tier1; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -32,7 +32,7 @@ public class BlockExtractor extends BlockMachineBase implements IRotationTexture return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/tier1_machines/"; @Override public String getFrontOff() { @@ -46,16 +46,16 @@ public class BlockExtractor extends BlockMachineBase implements IRotationTexture @Override public String getSide() { - return prefix + "machine_side"; + return prefix + "tier1_machine_side"; } @Override public String getTop() { - return prefix + "machine_top"; + return prefix + "tier1_machine_top"; } @Override public String getBottom() { - return prefix + "machine_bottom"; + return prefix + "tier1_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java new file mode 100644 index 000000000..fe40f878e --- /dev/null +++ b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java @@ -0,0 +1,56 @@ +package techreborn.blocks.tier1; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import reborncore.common.blocks.BlockMachineBase; +import reborncore.common.blocks.IAdvancedRotationTexture; +import techreborn.Core; +import techreborn.client.GuiHandler; +import techreborn.client.TechRebornCreativeTab; +import techreborn.tiles.teir1.TileGrinder; + +public class BlockGrinder extends BlockMachineBase implements IAdvancedRotationTexture{ + + public BlockGrinder(Material material) { + super(); + setUnlocalizedName("techreborn.grinder"); + setCreativeTab(TechRebornCreativeTab.instance); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileGrinder(); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + if (!player.isSneaking()){ + player.openGui(Core.INSTANCE, GuiHandler.grinderID, world, x, y, z); + } + return true; + } + + private final String prefix = "techreborn:blocks/machine/tier1_machines/"; + + @Override + public String getFront(boolean isActive) { + return isActive ? prefix + "grinder_front_on" : prefix + "grinder_front_off"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "tier1_machine_side"; + } + + @Override + public String getTop(boolean isActive) { + return isActive ? prefix + "grinder_top_on" : prefix + "grinder_top_off"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "tier1_machine_bottom"; + } +} diff --git a/src/main/java/techreborn/blocks/teir1/BlockRecycler.java b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java similarity index 85% rename from src/main/java/techreborn/blocks/teir1/BlockRecycler.java rename to src/main/java/techreborn/blocks/tier1/BlockRecycler.java index e90c23f76..f001fd3e2 100644 --- a/src/main/java/techreborn/blocks/teir1/BlockRecycler.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java @@ -1,4 +1,4 @@ -package techreborn.blocks.teir1; +package techreborn.blocks.tier1; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -32,7 +32,7 @@ public class BlockRecycler extends BlockMachineBase implements IRotationTexture{ return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/tier1_machines/"; @Override public String getFrontOff() { @@ -46,16 +46,16 @@ public class BlockRecycler extends BlockMachineBase implements IRotationTexture{ @Override public String getSide() { - return prefix + "machine_side"; + return prefix + "tier1_machine_side"; } @Override public String getTop() { - return prefix + "machine_top"; + return prefix + "tier1_machine_top"; } @Override public String getBottom() { - return prefix + "machine_bottom"; + return prefix + "tier1_machine_bottom"; } } diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index ab48f0148..0ab51d5b0 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -4,108 +4,15 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; -import techreborn.client.container.ContainerAesu; -import techreborn.client.container.ContainerAlloyFurnace; -import techreborn.client.container.ContainerAlloySmelter; -import techreborn.client.container.ContainerAssemblingMachine; -import techreborn.client.container.ContainerBlastFurnace; -import techreborn.client.container.ContainerCentrifuge; -import techreborn.client.container.ContainerChargeBench; -import techreborn.client.container.ContainerChemicalReactor; -import techreborn.client.container.ContainerChunkloader; -import techreborn.client.container.ContainerCompressor; -import techreborn.client.container.ContainerDestructoPack; -import techreborn.client.container.ContainerDieselGenerator; -import techreborn.client.container.ContainerDigitalChest; -import techreborn.client.container.ContainerElectricFurnace; -import techreborn.client.container.ContainerExtractor; -import techreborn.client.container.ContainerFusionReactor; -import techreborn.client.container.ContainerGasTurbine; -import techreborn.client.container.ContainerGenerator; -import techreborn.client.container.ContainerGrinder; -import techreborn.client.container.ContainerIDSU; -import techreborn.client.container.ContainerImplosionCompressor; -import techreborn.client.container.ContainerIndustrialElectrolyzer; -import techreborn.client.container.ContainerIndustrialGrinder; -import techreborn.client.container.ContainerIndustrialSawmill; -import techreborn.client.container.ContainerIronFurnace; -import techreborn.client.container.ContainerLesu; -import techreborn.client.container.ContainerMatterFabricator; -import techreborn.client.container.ContainerQuantumChest; -import techreborn.client.container.ContainerQuantumTank; -import techreborn.client.container.ContainerRecycler; -import techreborn.client.container.ContainerRollingMachine; -import techreborn.client.container.ContainerSemifluidGenerator; -import techreborn.client.container.ContainerThermalGenerator; -import techreborn.client.container.ContainerVacuumFreezer; -import techreborn.client.gui.GuiAesu; -import techreborn.client.gui.GuiAlloyFurnace; -import techreborn.client.gui.GuiAlloySmelter; -import techreborn.client.gui.GuiAssemblingMachine; -import techreborn.client.gui.GuiBlastFurnace; -import techreborn.client.gui.GuiCentrifuge; -import techreborn.client.gui.GuiChargeBench; -import techreborn.client.gui.GuiChemicalReactor; -import techreborn.client.gui.GuiChunkLoader; -import techreborn.client.gui.GuiCompressor; -import techreborn.client.gui.GuiDestructoPack; -import techreborn.client.gui.GuiDieselGenerator; -import techreborn.client.gui.GuiDigitalChest; -import techreborn.client.gui.GuiElectricFurnace; -import techreborn.client.gui.GuiExtractor; -import techreborn.client.gui.GuiFusionReactor; -import techreborn.client.gui.GuiGasTurbine; -import techreborn.client.gui.GuiGenerator; -import techreborn.client.gui.GuiGrinder; -import techreborn.client.gui.GuiIDSU; -import techreborn.client.gui.GuiImplosionCompressor; -import techreborn.client.gui.GuiIndustrialElectrolyzer; -import techreborn.client.gui.GuiIndustrialGrinder; -import techreborn.client.gui.GuiIndustrialSawmill; -import techreborn.client.gui.GuiIronFurnace; -import techreborn.client.gui.GuiLesu; -import techreborn.client.gui.GuiMatterFabricator; -import techreborn.client.gui.GuiQuantumChest; -import techreborn.client.gui.GuiQuantumTank; -import techreborn.client.gui.GuiRecycler; -import techreborn.client.gui.GuiRollingMachine; -import techreborn.client.gui.GuiSemifluidGenerator; -import techreborn.client.gui.GuiThermalGenerator; -import techreborn.client.gui.GuiVacuumFreezer; +import techreborn.client.container.*; +import techreborn.client.gui.*; 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.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.TileThermalGenerator; +import techreborn.tiles.generator.*; import techreborn.tiles.idsu.TileIDSU; import techreborn.tiles.lesu.TileLesu; -import techreborn.tiles.teir1.TileCompressor; -import techreborn.tiles.teir1.TileElectricFurnace; -import techreborn.tiles.teir1.TileExtractor; -import techreborn.tiles.teir1.TileGrinder; -import techreborn.tiles.teir1.TileRecycler; +import techreborn.tiles.teir1.*; public class GuiHandler implements IGuiHandler { @@ -144,6 +51,7 @@ public class GuiHandler implements IGuiHandler { public static final int electricFurnaceID = 35; public static final int ironFurnace = 36; public static final int recyclerID = 37; + public static final int scrapboxinatorID = 38; @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { @@ -238,6 +146,8 @@ public class GuiHandler implements IGuiHandler { return new ContainerIronFurnace((TileIronFurnace) world.getTileEntity(new BlockPos(x, y, z)), player); }else if (ID == recyclerID) { return new ContainerRecycler((TileRecycler) world.getTileEntity(new BlockPos(x, y, z)), player); + }else if (ID == scrapboxinatorID) { + return new ContainerScrapboxinator((TileScrapboxinator) world.getTileEntity(new BlockPos(x, y, z)), player); } return null; } @@ -336,6 +246,8 @@ public class GuiHandler implements IGuiHandler { return new GuiIronFurnace(player, (TileIronFurnace) world.getTileEntity(new BlockPos(x, y, z))); }else if (ID == recyclerID) { return new GuiRecycler(player, (TileRecycler) world.getTileEntity(new BlockPos(x, y, z))); + } else if (ID == scrapboxinatorID) { + return new GuiScrapboxinator(player, (TileScrapboxinator) world.getTileEntity(new BlockPos(x, y, z))); } return null; } diff --git a/src/main/java/techreborn/client/container/ContainerScrapboxinator.java b/src/main/java/techreborn/client/container/ContainerScrapboxinator.java new file mode 100644 index 000000000..13c6f76ca --- /dev/null +++ b/src/main/java/techreborn/client/container/ContainerScrapboxinator.java @@ -0,0 +1,63 @@ +package techreborn.client.container; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.client.gui.SlotOutput; +import reborncore.common.container.RebornContainer; +import techreborn.api.SlotUpgrade; +import techreborn.tiles.TileScrapboxinator; + +public class ContainerScrapboxinator extends RebornContainer { + + EntityPlayer player; + + TileScrapboxinator tile; + + public int connectionStatus; + + public ContainerScrapboxinator(TileScrapboxinator tileScrapboxinator, EntityPlayer player) { + super(); + tile = tileScrapboxinator; + this.player = player; + + // input + this.addSlotToContainer(new SlotScrapbox(tileScrapboxinator.inventory, 0, 56, 34)); + this.addSlotToContainer(new SlotOutput(tileScrapboxinator.inventory, 1, 116, 34)); + + + // upgrades + this.addSlotToContainer(new SlotUpgrade(tileScrapboxinator.inventory, 2, 152, 8)); + this.addSlotToContainer(new SlotUpgrade(tileScrapboxinator.inventory, 3, 152, 26)); + this.addSlotToContainer(new SlotUpgrade(tileScrapboxinator.inventory, 4, 152, 44)); + this.addSlotToContainer(new SlotUpgrade(tileScrapboxinator.inventory, 5, 152, 62)); + + int i; + + for (i = 0; i < 3; ++i) { + for (int j = 0; j < 9; ++j) { + this.addSlotToContainer(new Slot(player.inventory, j + i * 9 + + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for (i = 0; i < 9; ++i) { + this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, + 142)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer p_75145_1_) { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void updateProgressBar(int id, int value) { + if (id == 10) { + this.connectionStatus = value; + } + } +} diff --git a/src/main/java/techreborn/client/container/SlotScrapbox.java b/src/main/java/techreborn/client/container/SlotScrapbox.java new file mode 100644 index 000000000..04b0bfd69 --- /dev/null +++ b/src/main/java/techreborn/client/container/SlotScrapbox.java @@ -0,0 +1,24 @@ +package techreborn.client.container; + +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import techreborn.init.ModItems; + +public class SlotScrapbox extends Slot { + + public SlotScrapbox(IInventory par1iInventory, int par2, int par3, int par4) { + super(par1iInventory, par2, par3, par4); + } + + public boolean isItemValid(ItemStack par1ItemStack) { + if(par1ItemStack.getItem()==ModItems.scrapBox){ + return true; + } + return false; + } + + public int getSlotStackLimit() { + return 64; + } +} \ No newline at end of file diff --git a/src/main/java/techreborn/client/gui/GuiScrapboxinator.java b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java new file mode 100644 index 000000000..03fa03681 --- /dev/null +++ b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java @@ -0,0 +1,53 @@ +package techreborn.client.gui; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; +import techreborn.client.container.ContainerScrapboxinator; +import techreborn.tiles.TileScrapboxinator; + +public class GuiScrapboxinator extends GuiContainer { + + public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/scrapboxinator.png"); + + TileScrapboxinator tile; + ContainerScrapboxinator containerScrapboxinator; + + public GuiScrapboxinator(EntityPlayer player, TileScrapboxinator tileScrapboxinator) { + super(new ContainerScrapboxinator(tileScrapboxinator, player)); + this.xSize = 176; + this.ySize = 167; + tile = tileScrapboxinator; + containerScrapboxinator = (ContainerScrapboxinator) this.inventorySlots; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + this.mc.getTextureManager().bindTexture(texture); + int k = (this.width - this.xSize) / 2; + int l = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + + int j = 0; + + j = tile.gaugeProgressScaled(24); +// System.out.println(compressor.gaugeProgressScaled(10)); + if (j > 0) { + this.drawTexturedModalRect(k + 78, l + 35, 176, 14, j + 1, 16); + } + + j = tile.getEnergyScaled(12); + if (j > 0) { + this.drawTexturedModalRect(k + 24, l + 36 + 12 - j, 176, 12 - j, 14, j + 2); + } + } + + protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { + String name = net.minecraft.util.text.translation.I18n.translateToLocal("tile.techreborn.scrapboxinator.name"); + this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); + } +} diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index ea1353d83..b16ed6350 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -8,122 +8,25 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import reborncore.common.tile.TileMachineBase; import techreborn.Core; -import techreborn.blocks.BlockChunkLoader; -import techreborn.blocks.BlockComputerCube; -import techreborn.blocks.BlockDigitalChest; -import techreborn.blocks.BlockElectricCraftingTable; -import techreborn.blocks.BlockFusionCoil; -import techreborn.blocks.BlockFusionControlComputer; -import techreborn.blocks.BlockHighlyAdvancedMachine; -import techreborn.blocks.BlockIronFence; -import techreborn.blocks.BlockIronFurnace; -import techreborn.blocks.BlockMachineCasing; -import techreborn.blocks.BlockMachineFrame; -import techreborn.blocks.BlockNuke; -import techreborn.blocks.BlockOre; -import techreborn.blocks.BlockOre2; -import techreborn.blocks.BlockPlayerDetector; -import techreborn.blocks.BlockQuantumChest; -import techreborn.blocks.BlockQuantumTank; -import techreborn.blocks.BlockReinforcedGlass; -import techreborn.blocks.BlockRubberLeaves; -import techreborn.blocks.BlockRubberLog; -import techreborn.blocks.BlockRubberPlank; -import techreborn.blocks.BlockRubberSapling; -import techreborn.blocks.BlockStorage; -import techreborn.blocks.BlockStorage2; -import techreborn.blocks.BlockSupercondensator; -import techreborn.blocks.generator.BlockDieselGenerator; -import techreborn.blocks.generator.BlockDragonEggSiphoner; -import techreborn.blocks.generator.BlockGasTurbine; -import techreborn.blocks.generator.BlockGenerator; -import techreborn.blocks.generator.BlockHeatGenerator; -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.BlockSolarPanel; -import techreborn.blocks.generator.BlockThermalGenerator; -import techreborn.blocks.generator.BlockWaterMill; -import techreborn.blocks.generator.BlockWindMill; -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.BlockChargeBench; -import techreborn.blocks.machine.BlockChemicalReactor; -import techreborn.blocks.machine.BlockDistillationTower; -import techreborn.blocks.machine.BlockImplosionCompressor; -import techreborn.blocks.machine.BlockIndustrialElectrolyzer; -import techreborn.blocks.machine.BlockIndustrialGrinder; -import techreborn.blocks.machine.BlockIndustrialSawmill; -import techreborn.blocks.machine.BlockMatterFabricator; -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.blocks.teir1.BlockCompressor; -import techreborn.blocks.teir1.BlockElectricFurnace; -import techreborn.blocks.teir1.BlockExtractor; -import techreborn.blocks.teir1.BlockGrinder; -import techreborn.blocks.teir1.BlockRecycler; -import techreborn.itemblocks.ItemBlockAesu; -import techreborn.itemblocks.ItemBlockDigitalChest; -import techreborn.itemblocks.ItemBlockMachineCasing; -import techreborn.itemblocks.ItemBlockMachineFrame; -import techreborn.itemblocks.ItemBlockOre; -import techreborn.itemblocks.ItemBlockOre2; -import techreborn.itemblocks.ItemBlockPlayerDetector; -import techreborn.itemblocks.ItemBlockQuantumChest; -import techreborn.itemblocks.ItemBlockQuantumTank; -import techreborn.itemblocks.ItemBlockRubberSapling; -import techreborn.itemblocks.ItemBlockStorage; -import techreborn.itemblocks.ItemBlockStorage2; -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.TileMachineCasing; -import techreborn.tiles.TileMatterFabricator; -import techreborn.tiles.TilePlayerDectector; -import techreborn.tiles.TileQuantumChest; -import techreborn.tiles.TileQuantumTank; -import techreborn.tiles.TileRollingMachine; -import techreborn.tiles.TileVacuumFreezer; +import techreborn.blocks.*; +import techreborn.blocks.advanced_machine.*; +import techreborn.blocks.generator.*; +import techreborn.blocks.iron_machines.BlockAlloyFurnace; +import techreborn.blocks.iron_machines.BlockIronFurnace; +import techreborn.blocks.machine.*; +import techreborn.blocks.storage.*; +import techreborn.blocks.tier1.*; +import techreborn.itemblocks.*; +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.TileThermalGenerator; -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; -import techreborn.tiles.teir1.TileCompressor; -import techreborn.tiles.teir1.TileElectricFurnace; -import techreborn.tiles.teir1.TileExtractor; -import techreborn.tiles.teir1.TileGrinder; -import techreborn.tiles.teir1.TileRecycler; +import techreborn.tiles.storage.TileBatBox; +import techreborn.tiles.storage.TileMFE; +import techreborn.tiles.storage.TileMFSU; +import techreborn.tiles.teir1.*; public class ModBlocks { @@ -177,6 +80,10 @@ public class ModBlocks { public static Block waterMill; public static Block windMill; public static Block recycler; + public static Block batBox; + public static Block mfe; + public static Block mfsu; + public static Block scrapboxinator; public static BlockOre ore; public static BlockOre2 ore2; @@ -312,18 +219,18 @@ public class ModBlocks { GameRegistry.registerBlock(Idsu, "idsu"); GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR"); - Aesu = new BlockAesu(Material.rock); + Aesu = new BlockAESU(Material.rock); GameRegistry.registerBlock(Aesu, ItemBlockAesu.class, "aesu"); GameRegistry.registerTileEntity(TileAesu.class, "TileAesuTR"); - Lesu = new BlockLesu(Material.rock); + Lesu = new BlockLESU(Material.rock); GameRegistry.registerBlock(Lesu, "lesu"); GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR"); Supercondensator = new BlockSupercondensator(Material.rock); GameRegistry.registerBlock(Supercondensator, "supercondensator"); - LesuStorage = new BlockLesuStorage(Material.rock); + LesuStorage = new BlockLESUStorage(Material.rock); GameRegistry.registerBlock(LesuStorage, "lesustorage"); GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR"); @@ -419,6 +326,18 @@ public class ModBlocks { recycler = new BlockRecycler(Material.iron); GameRegistry.registerBlock(recycler, "recycler"); GameRegistry.registerTileEntity(TileRecycler.class, "TileRecyclerTR"); + + batBox = new BlockBatBox(); + GameRegistry.registerBlock(batBox, "batBox"); + GameRegistry.registerTileEntity(TileBatBox.class, "TileBatBox"); + + mfe = new BlockMFE(); + GameRegistry.registerBlock(mfe, "mfe"); + GameRegistry.registerTileEntity(TileMFE.class, "TileMFE"); + + mfsu = new BlockMFSU(); + GameRegistry.registerBlock(mfsu, "mfsu"); + GameRegistry.registerTileEntity(TileMFSU.class, "TileMFSU"); ironFurnace = new BlockIronFurnace(); GameRegistry.registerBlock(ironFurnace, "ironfurnace"); @@ -426,6 +345,10 @@ public class ModBlocks { nuke = new BlockNuke(); GameRegistry.registerBlock(nuke, "nuke"); + + scrapboxinator = new BlockScrapboxinator(Material.iron); + GameRegistry.registerBlock(scrapboxinator, "scrapboxinator"); + GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR"); registerOreDict(); Core.logHelper.info("TechReborns Blocks Loaded"); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index bc73e45b8..3d89a8dd4 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -694,6 +694,8 @@ public class ModRecipes { GameRegistry.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.gold_ingot), 1F); GameRegistry.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F); GameRegistry.addSmelting(new ItemStack(Items.iron_ingot), ItemIngots.getIngotByName("refinediron"), 1F); + GameRegistry.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F); + GameRegistry.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F); Core.logHelper.info("Smelting Recipes Added"); } diff --git a/src/main/java/techreborn/tiles/TileScrapboxinator.java b/src/main/java/techreborn/tiles/TileScrapboxinator.java new file mode 100644 index 000000000..d55bad0ab --- /dev/null +++ b/src/main/java/techreborn/tiles/TileScrapboxinator.java @@ -0,0 +1,294 @@ +package techreborn.tiles; + +import java.util.Random; + +import ic2.api.tile.IWrenchable; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.text.ITextComponent; +import reborncore.api.power.EnumPowerTier; +import reborncore.common.blocks.BlockMachineBase; +import reborncore.common.powerSystem.TilePowerAcceptor; +import reborncore.common.util.Inventory; +import techreborn.api.ScrapboxList; +import techreborn.init.ModBlocks; +import techreborn.init.ModItems; +import techreborn.items.ItemParts; + +public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory { + + public Inventory inventory = new Inventory(6, "TileScrapboxinator", 64, this); + public int capacity = 1000; + public int cost = 20; + public int progress; + public int time = 200; + public int chance = 4; + public int random; + public int input1 = 0; + public int output = 1; + + public TileScrapboxinator() { + super(1); + } + + public int gaugeProgressScaled(int scale) { + return (progress * scale) / time; + } + + @Override + public void updateEntity() { + boolean burning = isBurning(); + boolean updateInventory = false; + if (getEnergy() <= cost && canOpen()) { + if (getEnergy() > cost) { + updateInventory = true; + } + } + if (isBurning() && canOpen()) { + updateState(); + + progress++; + if (progress >= time) { + progress = 0; + recycleItems(); + updateInventory = true; + } + } else { + progress = 0; + updateState(); + } + if (burning != isBurning()) { + updateInventory = true; + } + if (updateInventory) { + markDirty(); + } + } + + public void recycleItems() { + if (this.canOpen() && !worldObj.isRemote) { + int random = new Random().nextInt(ScrapboxList.stacks.size()); + ItemStack out = ScrapboxList.stacks.get(random).copy(); + if (getStackInSlot(output) == null) { + useEnergy(cost); + setInventorySlotContents(output, out); + } + + if (getStackInSlot(input1).stackSize > 1) { + useEnergy(cost); + this.decrStackSize(input1, 1); + } else { + useEnergy(cost); + setInventorySlotContents(input1, null); + } + } + } + + public boolean canOpen() { + if (getStackInSlot(input1) != null && getStackInSlot(output) == null) { + return true; + } + return false; + } + + public boolean isBurning() { + return getEnergy() > cost; + } + + public void updateState() { + IBlockState blockState = worldObj.getBlockState(pos); + if (blockState.getBlock() instanceof BlockMachineBase) { + BlockMachineBase blockMachineBase = (BlockMachineBase) blockState.getBlock(); + if (blockState.getValue(BlockMachineBase.ACTIVE) != progress > 0) + blockMachineBase.setActive(progress > 0, worldObj, pos); + } + } + + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) { + return false; + } + + @Override + public EnumFacing getFacing() { + return getFacingEnum(); + } + + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + if (entityPlayer.isSneaking()) { + return true; + } + return false; + } + + @Override + public float getWrenchDropRate() { + return 1.0F; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(ModBlocks.scrapboxinator, 1); + } + + public boolean isComplete() { + return false; + } + + @Override + public void readFromNBT(NBTTagCompound tagCompound) { + super.readFromNBT(tagCompound); + inventory.readFromNBT(tagCompound); + } + + @Override + public void writeToNBT(NBTTagCompound tagCompound) { + super.writeToNBT(tagCompound); + inventory.writeToNBT(tagCompound); + } + + @Override + public int getSizeInventory() { + return inventory.getSizeInventory(); + } + + @Override + public ItemStack getStackInSlot(int slot) { + return inventory.getStackInSlot(slot); + } + + @Override + public ItemStack decrStackSize(int slot, int amount) { + return inventory.decrStackSize(slot, amount); + } + + @Override + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + inventory.setInventorySlotContents(slot, stack); + } + + @Override + public int getInventoryStackLimit() { + return inventory.getInventoryStackLimit(); + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return inventory.isUseableByPlayer(player); + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return inventory.isItemValidForSlot(slot, stack); + } + + // ISidedInventory + @Override + public int[] getSlotsForFace(EnumFacing side) { + return side == EnumFacing.DOWN ? new int[] { 0, 1, 2 } : new int[] { 0, 1, 2 }; + } + + @Override + public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) { + if (slotIndex == 2) + return false; + if (slotIndex == 1) { + if (itemStack.getItem() == ModItems.scrapBox) { + return true; + } + } + return isItemValidForSlot(slotIndex, itemStack); + } + + @Override + public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) { + return slotIndex == 2; + } + + @Override + public double getMaxPower() { + return capacity; + } + + @Override + public boolean canAcceptEnergy(EnumFacing direction) { + return true; + } + + @Override + public boolean canProvideEnergy(EnumFacing direction) { + return false; + } + + @Override + public double getMaxOutput() { + return 0; + } + + @Override + public double getMaxInput() { + return 32; + } + + @Override + public EnumPowerTier getTier() { + return EnumPowerTier.MEDIUM; + } + + @Override + public void openInventory(EntityPlayer player) { + inventory.openInventory(player); + } + + @Override + public void closeInventory(EntityPlayer player) { + inventory.closeInventory(player); + } + + @Override + public int getField(int id) { + return inventory.getField(id); + } + + @Override + public void setField(int id, int value) { + inventory.setField(id, value); + } + + @Override + public int getFieldCount() { + return inventory.getFieldCount(); + } + + @Override + public void clear() { + inventory.clear(); + } + + @Override + public String getName() { + return inventory.getName(); + } + + @Override + public boolean hasCustomName() { + return inventory.hasCustomName(); + } + + @Override + public ITextComponent getDisplayName() { + return inventory.getDisplayName(); + } +} diff --git a/src/main/java/techreborn/tiles/storage/TileBatBox.java b/src/main/java/techreborn/tiles/storage/TileBatBox.java new file mode 100644 index 000000000..14172227d --- /dev/null +++ b/src/main/java/techreborn/tiles/storage/TileBatBox.java @@ -0,0 +1,81 @@ +package techreborn.tiles.storage; + +import ic2.api.tile.IWrenchable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import reborncore.api.power.EnumPowerTier; +import reborncore.common.powerSystem.TilePowerAcceptor; +import techreborn.init.ModBlocks; + +/** + * Created by modmuss50 on 14/03/2016. + */ +public class TileBatBox extends TilePowerAcceptor implements IWrenchable { + + public TileBatBox() { + super(1); + } + + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) { + return false; + } + + @Override + public EnumFacing getFacing() { + return getFacingEnum(); + } + + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + if (entityPlayer.isSneaking()) { + return true; + } + return false; + } + + @Override + public float getWrenchDropRate() { + return 1.0F; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(ModBlocks.batBox); + } + + public boolean isComplete() { + return false; + } + + @Override + public double getMaxPower() { + return 40000; + } + + @Override + public boolean canAcceptEnergy(EnumFacing direction) { + return getFacingEnum() != direction; + } + + @Override + public boolean canProvideEnergy(EnumFacing direction) { + return getFacingEnum() == direction; + } + + @Override + public double getMaxOutput() { + return 32; + } + + @Override + public double getMaxInput() { + return 32; + } + + @Override + public EnumPowerTier getTier() { + return EnumPowerTier.LOW; + } +} \ No newline at end of file diff --git a/src/main/java/techreborn/tiles/storage/TileMFE.java b/src/main/java/techreborn/tiles/storage/TileMFE.java new file mode 100644 index 000000000..4b486a5f5 --- /dev/null +++ b/src/main/java/techreborn/tiles/storage/TileMFE.java @@ -0,0 +1,37 @@ +package techreborn.tiles.storage; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import reborncore.api.power.EnumPowerTier; +import techreborn.init.ModBlocks; + +/** + * Created by modmuss50 on 14/03/2016. + */ +public class TileMFE extends TileBatBox { + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(ModBlocks.mfe); + } + + @Override + public double getMaxPower() { + return 4000000; + } + + @Override + public double getMaxOutput() { + return 512; + } + + @Override + public double getMaxInput() { + return 512; + } + + @Override + public EnumPowerTier getTier() { + return EnumPowerTier.MEDIUM; + } +} diff --git a/src/main/java/techreborn/tiles/storage/TileMFSU.java b/src/main/java/techreborn/tiles/storage/TileMFSU.java new file mode 100644 index 000000000..efb69112f --- /dev/null +++ b/src/main/java/techreborn/tiles/storage/TileMFSU.java @@ -0,0 +1,37 @@ +package techreborn.tiles.storage; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import reborncore.api.power.EnumPowerTier; +import techreborn.init.ModBlocks; + +/** + * Created by modmuss50 on 14/03/2016. + */ +public class TileMFSU extends TileBatBox { + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(ModBlocks.mfsu); + } + + @Override + public double getMaxPower() { + return 40000000; + } + + @Override + public double getMaxOutput() { + return 2048; + } + + @Override + public double getMaxInput() { + return 2048; + } + + @Override + public EnumPowerTier getTier() { + return EnumPowerTier.HIGH; + } +} diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 3c6ac2fdd..2984e3614 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -1,3 +1,9 @@ + +item.missingRecipe.name=Missing Recipe Placeholder + + + + itemGroup.techreborn=Tech Reborn #machines @@ -69,6 +75,12 @@ tile.techreborn.watermill.name=Water Mill tile.techreborn.windmill.name=Wind Mill tile.techreborn.ironfurnace.name=Iron Furnace tile.techreborn.recycler.name=Recycler +tile.techreborn.scrapboxinator.name=Scrapbox-inator +tile.techreborn.batBox.name=Battery Box +tile.techreborn.mfe.name=MFE +tile.techreborn.mfsu.name=MFSU +tile.techreborn.reinforcedglass.name=Reinforced Glass +tile.techreborn.nuke.name=Nuke #Blocks tile.techreborn.rubberlog.name=Rubber Wood @@ -270,6 +282,7 @@ item.techreborn.dust.zinc.name=Zinc Dust item.techreborn.dust.galena.name=Galena Dust item.techreborn.dust.greenSapphire.name=Green Sapphire Dust item.techreborn.dust.sawDust.name=Saw Dust +item.techreborn.dust.olivine.name=Olivine Dust item.techreborn.lapotroncrystal.name=Lapotron Crystal item.techreborn.energycrystal.name=Energy Crystal item.techreborn.ingot.refinediron.name=Refined Iron Ingot @@ -375,6 +388,7 @@ item.techreborn.dustsmall.Voidstone.name=Small Pile of Voidstone Dust item.techreborn.dustsmall.YellowGarnet.name=Small Pile of Yellow Garnet Dust item.techreborn.dustsmall.Zinc.name=Small Pile of Zinc Dust item.techreborn.dustsmall.Galena.name=Small Pile of Galena Dust +item.techreborn.dustsmall.Olivine.name=Small Pile of Olivine Dust #Cells item.techreborn.cell.Berylium.name=Berylium Cell @@ -415,7 +429,9 @@ item.techreborn.cell.empty.name=Empty Cell item.techreborn.cell.water.name=Water Cell item.techreborn.cell.lava.name=Lava Cell item.techreborn.rebattery.name=Battery -item.techreborn.treetap.name=Tree Tap +item.techreborn.lithiumBattery.name=Lithium Battery +item.techreborn.treetap.name=Treetap +item.techreborn.nanosaber.name=Nanosaber #Gems item.techreborn.gem.ruby.name=Ruby @@ -607,9 +623,6 @@ item.techreborn.part.advancedCircuit.name=Advanced Electronic Circuit item.techreborn.part.pump.name=Pump item.techreborn.part.teleporter.name=Teleporter item.techreborn.part.advancedAlloy.name=Advanced Alloy -item.techreborn.part.lvTransformer.name=LV Transformer -item.techreborn.part.mvTransformer.name=MV Transformer -item.techreborn.part.hvTransformer.name=HV Transformer #Tools item.techreborn.rockcutter.name=Rockcutter diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_other.png b/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_other.png deleted file mode 100644 index cfdd5b094..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_other.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_top.png deleted file mode 100644 index e45e0c1d1..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/advanced_machine_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/machine_bottom.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/advanced_machine_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/advanced_machine_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machine_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/advanced_machine_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/advanced_machine_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/machine_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/advanced_machine_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/distillation_tower_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/distillation_tower_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/distillation_tower_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/distillation_tower_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/implosion_compressor_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_bottom.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/implosion_compressor_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/implosion_compressor_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/implosion_compressor_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/implosion_compressor_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/implosion_compressor_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_blast_furnace_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_blast_furnace_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_blast_furnace_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_blast_furnace_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_bottom.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_side_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_side_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_centrifuge_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_electrolyzer_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_electrolyzer_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_electrolyzer_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_electrolyzer_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_grinder_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_grinder_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_grinder_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_grinder_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_grinder_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_grinder_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_grinder_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_grinder_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_grinder_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_grinder_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_sawmill_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_sawmill_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_sawmill_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_sawmill_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_sawmill_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/industrial_sawmill_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/machine_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/machine_bottom.png new file mode 100644 index 000000000..73e829527 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/machine_bottom.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/machine_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/machine_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/machine_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/machine_top.png new file mode 100644 index 000000000..d5fadf931 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machines/machine_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_front.png deleted file mode 100644 index 93da5ca99..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_front.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_side.png deleted file mode 100644 index 3898e5f5e..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/diesel_generator_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/diesel_generator_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/diesel_generator_top_on.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/diesel_generator_top_on.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/diesel_generator_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/diesel_generator_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/dragon_egg_energy_siphon_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/dragon_egg_energy_siphon_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/dragon_egg_energy_siphon_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/dragon_egg_energy_siphon_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/dragon_egg_energy_siphon_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/dragon_egg_energy_siphon_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/gas_generator_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_bottom.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/gas_generator_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/gas_generator_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/gas_generator_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_machine_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_machine_bottom.png new file mode 100644 index 000000000..73e829527 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_machine_bottom.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_machine_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/machine_machine_block.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_machine_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_machine_top.png new file mode 100644 index 000000000..d5fadf931 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/generator_machine_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/heat_generator_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_bottom.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/heat_generator_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/heat_generator_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/heat_generator_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/heat_generator_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/heat_generator_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lightning_rod_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/lightning_rod_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_absorber_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_bottom.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_absorber_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_absorber_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_absorber_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_absorber_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_absorber_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_converter_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_bottom.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_converter_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_converter_front on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_converter_front on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_converter_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_converter_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_converter_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_converter_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_converter_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/magic_energy_converter_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/plasma_generator_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_front.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/plasma_generator_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/plasma_generator_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/plasma_generator_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/plasma_generator_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/plasma_generator_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/semifluid_generator_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/semifluid_generator_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/semifluid_generator_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/semifluid_generator_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/solar_panel_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_side_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/solar_panel_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/solar_panel_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_side_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/solar_panel_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/solar_panel_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_top_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/solar_panel_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/solar_panel_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_top_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/solar_panel_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/assembling_machine_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/assembling_machine_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/assembling_machine_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/assembling_machine_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/assembling_machine_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/assembling_machine_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/centrifuge_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/centrifuge_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/chargeBench_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/chargeBench_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/chargeBench_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/chargeBench_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/chemical_reactor_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/chemical_reactor_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/chemical_reactor_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/chemical_reactor_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/computer_cube.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/computer_cube.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/computer_cube.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/computer_cube.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/electric_crafting_table_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_front.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/electric_crafting_table_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/electric_crafting_table_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/electric_crafting_table_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/extreme_voltage_machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/extreme_voltage_machine_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/extreme_voltage_machine_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/extreme_voltage_machine_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_coil.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/fusion_coil.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/fusion_coil.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/fusion_coil.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/fusion_control_computer_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/fusion_control_computer_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/fusion_control_computer_front.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/fusion_control_computer_front.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_chunk_loader_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/industrial_chunk_loader_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_chunk_loader_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/industrial_chunk_loader_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/lathe_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/lathe_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/lathe_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/lathe_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/machine_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/machine_bottom.png new file mode 100644 index 000000000..73e829527 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/machine_bottom.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/machine_side.png new file mode 100644 index 000000000..537ab32cd Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/machine_side.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/machine_top.png new file mode 100644 index 000000000..d5fadf931 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/machine_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/matter_fabricator_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/matter_fabricator_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/matter_fabricator_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/matter_fabricator_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/matterfab_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/matterfab_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/matterfab_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/matterfab_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/plate_cutting_machine_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/plate_cutting_machine_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/plate_cutting_machine_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/plate_cutting_machine_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_all.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/player_detector_all.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_all.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/player_detector_all.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_others.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/player_detector_others.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_others.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/player_detector_others.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_you.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/player_detector_you.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_you.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/player_detector_you.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/qchest_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/qchest_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/qchest_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/qchest_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/quantum_chest.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/quantum_chest.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/quantum_chest.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/quantum_chest.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/quantum_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/quantum_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/quantum_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/quantum_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/rolling_machine_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/rolling_machine_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/rolling_machine_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/rolling_machine_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/scrapboxinator_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/scrapboxinator_front_off.png new file mode 100644 index 000000000..0e6bdac87 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/scrapboxinator_front_off.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/scrapboxinator_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/scrapboxinator_front_on.png new file mode 100644 index 000000000..b91faa13d Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/scrapboxinator_front_on.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/scrapboxinator_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/scrapboxinator_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/supercondensator_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_front.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/supercondensator_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/supercondensator_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/supercondensator_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_front.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_front.png deleted file mode 100644 index 9b8d19b9c..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_front.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png deleted file mode 100644 index 7fc5c2c0d..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_bottom.png deleted file mode 100644 index 9e19b1412..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_side.png deleted file mode 100644 index 24a1625aa..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_top.png deleted file mode 100644 index 66085310c..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/alloy_furnace_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/alloy_furnace_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/alloy_furnace_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/alloy_furnace_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/alloy_furnace_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/alloy_furnace_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_furnace_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_furnace_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_furnace_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_furnace_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_furnace_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_furnace_front_on.png.mcmeta new file mode 100644 index 000000000..4f0718ac9 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_furnace_front_on.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_bottom.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_side.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_top.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_block.png deleted file mode 100644 index 4b044bf0a..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_block.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_front.png deleted file mode 100644 index 4835a79ed..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_front.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_side.png deleted file mode 100644 index b1e09dc1f..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/advancedMachine_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/advancedMachine_machine_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/advancedMachine_machine_block.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/advancedMachine_machine_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/aluminum_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/aluminum_machine_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/aluminum_machine_block.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/aluminum_machine_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/brass_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/brass_machine_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/brass_machine_block.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/brass_machine_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/bronze_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/bronze_machine_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/bronze_machine_block.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/bronze_machine_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced_edge.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced_edge.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced_edge.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced_edge.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced_full.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced_full.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced_full.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced_full.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced_edge.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced_edge.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced_edge.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced_edge.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced_full.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced_full.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced_full.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced_full.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard_edge.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard_edge.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard_edge.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard_edge.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard_full.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard_full.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard_full.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard_full.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/highlyadvancedmachine.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/highlyadvancedmachine.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/highlyadvancedmachine.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/highlyadvancedmachine.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/iron_machine_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/iron_machine_block.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/iron_machine_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/machine_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/machine_machine_block.png new file mode 100644 index 000000000..537ab32cd Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/machine_machine_block.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/steel_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/steel_machine_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/steel_machine_block.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/steel_machine_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/titanium_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/titanium_machine_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/titanium_machine_block.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_blocks/titanium_machine_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_bottom.png new file mode 100644 index 000000000..9b514b382 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_bottom.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_front.png new file mode 100644 index 000000000..1603d1b74 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_front.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_side.png new file mode 100644 index 000000000..d058ecccb Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_side.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_top.png new file mode 100644 index 000000000..c1a81e596 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/aesu_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_bottom.png new file mode 100644 index 000000000..be93cb2e3 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_bottom.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_front.png new file mode 100644 index 000000000..33173a11e Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_front.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_side.png new file mode 100644 index 000000000..be93cb2e3 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_side.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_top.png new file mode 100644 index 000000000..be93cb2e3 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/batbox_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_bottom.png new file mode 100644 index 000000000..c66f5bc0b Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_bottom.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_front.png new file mode 100644 index 000000000..e4a84e4be Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_front.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_side.png new file mode 100644 index 000000000..f7c1490a1 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_side.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_side.png.mcmeta similarity index 55% rename from src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_side.png.mcmeta index 60af67825..dfae8cae1 100644 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_side.png.mcmeta @@ -1,5 +1,5 @@ { "animation":{ - "frametime":4 + "frametime":1 } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_top.png new file mode 100644 index 000000000..5bfa7dac6 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/idsu_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_block.png new file mode 100644 index 000000000..403b2ec92 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_block.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_bottom.png new file mode 100644 index 000000000..f73b214b5 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_bottom.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_front.png new file mode 100644 index 000000000..8f861a1b8 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_front.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_side.png new file mode 100644 index 000000000..9e7dcbd7e Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_side.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_top.png new file mode 100644 index 000000000..e325d19bc Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/lesu_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_bottom.png new file mode 100644 index 000000000..28966be2b Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_bottom.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_front.png new file mode 100644 index 000000000..d3eaa1bf2 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_front.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_side.png new file mode 100644 index 000000000..2dab0c284 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_side.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_top.png new file mode 100644 index 000000000..05c0756b4 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfe_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_bottom.png new file mode 100644 index 000000000..8bb39cbb4 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_bottom.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_front.png new file mode 100644 index 000000000..07f65052a Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_front.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_side.png new file mode 100644 index 000000000..ac22463c1 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_side.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_top.png new file mode 100644 index 000000000..19311bcfd Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/storage/mfsu_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_alloy_furnace_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_alloy_furnace_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_alloy_furnace_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_alloy_furnace_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/electric_furnace_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/electric_furnace_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_off.png new file mode 100644 index 000000000..beb9a487c Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_off.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_on.png new file mode 100644 index 000000000..c70fcd4a5 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_on.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_on.png.mcmeta new file mode 100644 index 000000000..97596ba81 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_on.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_off.png new file mode 100644 index 000000000..32d548f4b Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_off.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_on.png new file mode 100644 index 000000000..55c5ad5c9 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_on.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_on.png.mcmeta new file mode 100644 index 000000000..97596ba81 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_on.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_off.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_on.png rename to src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_on.png.mcmeta new file mode 100644 index 000000000..97596ba81 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_on.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_bottom.png new file mode 100644 index 000000000..73e829527 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_bottom.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png new file mode 100644 index 000000000..537ab32cd Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_top.png new file mode 100644 index 000000000..d5fadf931 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_books.png b/src/main/resources/assets/techreborn/textures/blocks/metal_shelf_books.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_books.png rename to src/main/resources/assets/techreborn/textures/blocks/metal_shelf_books.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_cans.png b/src/main/resources/assets/techreborn/textures/blocks/metal_shelf_cans.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_cans.png rename to src/main/resources/assets/techreborn/textures/blocks/metal_shelf_cans.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_empty.png b/src/main/resources/assets/techreborn/textures/blocks/metal_shelf_empty.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_empty.png rename to src/main/resources/assets/techreborn/textures/blocks/metal_shelf_empty.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_paper.png b/src/main/resources/assets/techreborn/textures/blocks/metal_shelf_paper.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_paper.png rename to src/main/resources/assets/techreborn/textures/blocks/metal_shelf_paper.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/reinforcedglass.png b/src/main/resources/assets/techreborn/textures/blocks/reinforcedglass.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/reinforcedglass.png rename to src/main/resources/assets/techreborn/textures/blocks/reinforcedglass.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_books.png b/src/main/resources/assets/techreborn/textures/blocks/wood_shelf_books.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_books.png rename to src/main/resources/assets/techreborn/textures/blocks/wood_shelf_books.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_cans.png b/src/main/resources/assets/techreborn/textures/blocks/wood_shelf_cans.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_cans.png rename to src/main/resources/assets/techreborn/textures/blocks/wood_shelf_cans.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_empty.png b/src/main/resources/assets/techreborn/textures/blocks/wood_shelf_empty.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_empty.png rename to src/main/resources/assets/techreborn/textures/blocks/wood_shelf_empty.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_paper.png b/src/main/resources/assets/techreborn/textures/blocks/wood_shelf_paper.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_paper.png rename to src/main/resources/assets/techreborn/textures/blocks/wood_shelf_paper.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_side.png b/src/main/resources/assets/techreborn/textures/blocks/wood_shelf_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_side.png rename to src/main/resources/assets/techreborn/textures/blocks/wood_shelf_side.png diff --git a/src/main/resources/assets/techreborn/textures/gui/aesu.png b/src/main/resources/assets/techreborn/textures/gui/aesu.png index 502160ae2..a45d9e509 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/aesu.png and b/src/main/resources/assets/techreborn/textures/gui/aesu.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/alloy_furnace.png b/src/main/resources/assets/techreborn/textures/gui/alloy_furnace.png index d78f22edb..6bb0f4c78 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/alloy_furnace.png and b/src/main/resources/assets/techreborn/textures/gui/alloy_furnace.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/assembling_machine.png b/src/main/resources/assets/techreborn/textures/gui/assembling_machine.png index c6a912b3a..cb5f36e0c 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/assembling_machine.png and b/src/main/resources/assets/techreborn/textures/gui/assembling_machine.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/autocraftingtable.png b/src/main/resources/assets/techreborn/textures/gui/autocraftingtable.png index 90201b9c1..25ab6c785 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/autocraftingtable.png and b/src/main/resources/assets/techreborn/textures/gui/autocraftingtable.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/batbox.png b/src/main/resources/assets/techreborn/textures/gui/batbox.png new file mode 100644 index 000000000..6e17e9349 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/gui/batbox.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/centrifuge.png b/src/main/resources/assets/techreborn/textures/gui/centrifuge.png index 7a01059af..6b9dd5c4b 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/centrifuge.png and b/src/main/resources/assets/techreborn/textures/gui/centrifuge.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/chargebench.png b/src/main/resources/assets/techreborn/textures/gui/chargebench.png index 07daefcdb..14ade7d6b 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/chargebench.png and b/src/main/resources/assets/techreborn/textures/gui/chargebench.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/chemical_reactor.png b/src/main/resources/assets/techreborn/textures/gui/chemical_reactor.png index 835b1ae16..ea11ef9f7 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/chemical_reactor.png and b/src/main/resources/assets/techreborn/textures/gui/chemical_reactor.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/compressor.png b/src/main/resources/assets/techreborn/textures/gui/compressor.png index 1c4222ba4..81bdc49ac 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/compressor.png and b/src/main/resources/assets/techreborn/textures/gui/compressor.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/destructopack.png b/src/main/resources/assets/techreborn/textures/gui/destructopack.png index 597fadb58..0fb0d0b24 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/destructopack.png and b/src/main/resources/assets/techreborn/textures/gui/destructopack.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/diesel_generator - Copy.png b/src/main/resources/assets/techreborn/textures/gui/diesel_generator - Copy.png deleted file mode 100644 index c554141a8..000000000 Binary files a/src/main/resources/assets/techreborn/textures/gui/diesel_generator - Copy.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/gui/distillation_tower.png b/src/main/resources/assets/techreborn/textures/gui/distillation_tower.png index b4bf0a2f9..cdd751ea3 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/distillation_tower.png and b/src/main/resources/assets/techreborn/textures/gui/distillation_tower.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/electric_alloy_furnace.png b/src/main/resources/assets/techreborn/textures/gui/electric_alloy_furnace.png index 67dbfe532..068df814e 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/electric_alloy_furnace.png and b/src/main/resources/assets/techreborn/textures/gui/electric_alloy_furnace.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/electric_crafting_table.png b/src/main/resources/assets/techreborn/textures/gui/electric_crafting_table.png index 8b5e39dea..8c1a0aa9c 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/electric_crafting_table.png and b/src/main/resources/assets/techreborn/textures/gui/electric_crafting_table.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/gas_generator.png b/src/main/resources/assets/techreborn/textures/gui/gas_generator.png index c554141a8..bd4c6dce5 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/gas_generator.png and b/src/main/resources/assets/techreborn/textures/gui/gas_generator.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/generator.png b/src/main/resources/assets/techreborn/textures/gui/generator.png index d05e312b6..11193eac7 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/generator.png and b/src/main/resources/assets/techreborn/textures/gui/generator.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/grinder.png b/src/main/resources/assets/techreborn/textures/gui/grinder.png index d1d3ddea3..573afcc32 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/grinder.png and b/src/main/resources/assets/techreborn/textures/gui/grinder.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/idsu.png b/src/main/resources/assets/techreborn/textures/gui/idsu.png index 0c9687cf6..16d3dc253 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/idsu.png and b/src/main/resources/assets/techreborn/textures/gui/idsu.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/implosion_compressor.png b/src/main/resources/assets/techreborn/textures/gui/implosion_compressor.png index 2a5221a4f..bf58d8974 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/implosion_compressor.png and b/src/main/resources/assets/techreborn/textures/gui/implosion_compressor.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/industrial_blast_furnace.png b/src/main/resources/assets/techreborn/textures/gui/industrial_blast_furnace.png index 5a7b5d70b..5817adcf9 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/industrial_blast_furnace.png and b/src/main/resources/assets/techreborn/textures/gui/industrial_blast_furnace.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/industrial_centrifuge.png b/src/main/resources/assets/techreborn/textures/gui/industrial_centrifuge.png index cea02fc9a..f586c81cd 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/industrial_centrifuge.png and b/src/main/resources/assets/techreborn/textures/gui/industrial_centrifuge.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/industrial_electrolyzer.png b/src/main/resources/assets/techreborn/textures/gui/industrial_electrolyzer.png index 3a4a3f2e9..0f0b29734 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/industrial_electrolyzer.png and b/src/main/resources/assets/techreborn/textures/gui/industrial_electrolyzer.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/industrial_grinder.png b/src/main/resources/assets/techreborn/textures/gui/industrial_grinder.png index 6f6cfaef8..6ca2bb867 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/industrial_grinder.png and b/src/main/resources/assets/techreborn/textures/gui/industrial_grinder.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/industrial_sawmill.png b/src/main/resources/assets/techreborn/textures/gui/industrial_sawmill.png index 39428a4c8..3bb8a58da 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/industrial_sawmill.png and b/src/main/resources/assets/techreborn/textures/gui/industrial_sawmill.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/lathe.png b/src/main/resources/assets/techreborn/textures/gui/lathe.png index af8841320..67190ab58 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/lathe.png and b/src/main/resources/assets/techreborn/textures/gui/lathe.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/lesu.png b/src/main/resources/assets/techreborn/textures/gui/lesu.png index 0c9687cf6..42a4f1634 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/lesu.png and b/src/main/resources/assets/techreborn/textures/gui/lesu.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/matterfabricator.png b/src/main/resources/assets/techreborn/textures/gui/matterfabricator.png index c3f7e2571..947734fab 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/matterfabricator.png and b/src/main/resources/assets/techreborn/textures/gui/matterfabricator.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/mfe.png b/src/main/resources/assets/techreborn/textures/gui/mfe.png new file mode 100644 index 000000000..4b459a407 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/gui/mfe.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/mfsu.png b/src/main/resources/assets/techreborn/textures/gui/mfsu.png new file mode 100644 index 000000000..53c2e8a18 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/gui/mfsu.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/plate_cutting_machine.png b/src/main/resources/assets/techreborn/textures/gui/plate_cutting_machine.png index b0a59f817..5da80ac63 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/plate_cutting_machine.png and b/src/main/resources/assets/techreborn/textures/gui/plate_cutting_machine.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/rolling_machine.png b/src/main/resources/assets/techreborn/textures/gui/rolling_machine.png index 54e082989..f3be8bd13 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/rolling_machine.png and b/src/main/resources/assets/techreborn/textures/gui/rolling_machine.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/rollingmachine.png b/src/main/resources/assets/techreborn/textures/gui/rollingmachine.png index 90201b9c1..25ab6c785 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/rollingmachine.png and b/src/main/resources/assets/techreborn/textures/gui/rollingmachine.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/scrapboxinator.png b/src/main/resources/assets/techreborn/textures/gui/scrapboxinator.png new file mode 100644 index 000000000..13a4f0670 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/gui/scrapboxinator.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png b/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png index c554141a8..bd4c6dce5 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png and b/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/thermal_generator.png b/src/main/resources/assets/techreborn/textures/gui/thermal_generator.png index f49945065..b30960025 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/thermal_generator.png and b/src/main/resources/assets/techreborn/textures/gui/thermal_generator.png differ diff --git a/src/main/resources/assets/techreborn/textures/gui/vacuum_freezer.png b/src/main/resources/assets/techreborn/textures/gui/vacuum_freezer.png index d1d3ddea3..573afcc32 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/vacuum_freezer.png and b/src/main/resources/assets/techreborn/textures/gui/vacuum_freezer.png differ