From bf7f7ba8710fcb3d654053dd6d99d516dbd94055 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Sun, 23 Sep 2018 23:21:19 +0300 Subject: [PATCH] Renamed ModBlocks to TRBlocks --- src/main/java/techreborn/TechReborn.java | 4 +- .../techreborn/blocks/BlockComputerCube.java | 4 +- .../techreborn/blocks/BlockFusionCoil.java | 4 +- .../blocks/BlockFusionControlComputer.java | 6 +- .../techreborn/blocks/BlockRubberLeaves.java | 4 +- .../blocks/storage/BlockAdjustableSU.java | 4 +- .../blocks/storage/BlockHighVoltageSU.java | 4 +- .../storage/BlockInterdimensionalSU.java | 4 +- .../blocks/storage/BlockLSUStorage.java | 4 +- .../blocks/storage/BlockLapotronicSU.java | 4 +- .../blocks/storage/BlockMediumVoltageSU.java | 4 +- .../blocks/tier1/BlockPlayerDetector.java | 4 +- .../transformers/BlockHVTransformer.java | 4 +- .../transformers/BlockMVTransformer.java | 4 +- .../techreborn/client/RegisterItemJsons.java | 6 +- .../client/gui/GuiBlastFurnace.java | 72 +++++------ .../client/gui/GuiDistillationTower.java | 6 +- .../client/gui/GuiFluidReplicator.java | 4 +- .../client/gui/GuiFusionReactor.java | 4 +- .../client/gui/GuiImplosionCompressor.java | 4 +- .../client/gui/GuiIndustrialGrinder.java | 6 +- .../client/gui/GuiIndustrialSawmill.java | 6 +- .../client/gui/GuiVacuumFreezer.java | 4 +- .../render/entitys/RenderNukePrimed.java | 6 +- src/main/java/techreborn/init/OreDict.java | 42 ++++--- .../init/{ModBlocks.java => TRBlocks.java} | 8 +- src/main/java/techreborn/init/TRContent.java | 7 +- src/main/java/techreborn/init/TRItems.java | 4 +- ...dTileEntities.java => TRTileEntities.java} | 8 +- .../init/recipes/CraftingTableRecipes.java | 114 +++++++++--------- .../init/recipes/ScrapboxRecipes.java | 4 +- .../itemblocks/ItemBlockAdjustableSU.java | 4 +- .../itemblocks/ItemBlockPlayerDetector.java | 4 +- .../java/techreborn/proxies/ClientProxy.java | 4 +- src/main/java/techreborn/tiles/TileAlarm.java | 4 +- .../java/techreborn/tiles/TileChargeOMat.java | 4 +- .../techreborn/tiles/TileChunkLoader.java | 4 +- .../tiles/TileIndustrialCentrifuge.java | 4 +- .../tiles/TileMatterFabricator.java | 4 +- .../techreborn/tiles/TileQuantumTank.java | 4 +- .../TileFusionControlComputer.java | 6 +- .../tiles/generator/TileLightningRod.java | 4 +- .../tiles/generator/TilePlasmaGenerator.java | 4 +- .../advanced/TileDieselGenerator.java | 4 +- .../advanced/TileDragonEggSyphon.java | 4 +- .../generator/advanced/TileGasTurbine.java | 4 +- .../advanced/TileSemiFluidGenerator.java | 4 +- .../advanced/TileThermalGenerator.java | 4 +- .../basic/TileSolidFuelGenerator.java | 4 +- .../tiles/generator/basic/TileWaterMill.java | 4 +- .../tiles/generator/basic/TileWindMill.java | 4 +- .../machine/iron/TileIronAlloyFurnace.java | 4 +- .../machine/multiblock/MultiblockChecker.java | 10 +- .../multiblock/TileDistillationTower.java | 4 +- .../multiblock/TileFluidReplicator.java | 4 +- .../multiblock/TileImplosionCompressor.java | 4 +- .../TileIndustrialBlastFurnace.java | 4 +- .../multiblock/TileIndustrialGrinder.java | 4 +- .../multiblock/TileIndustrialSawmill.java | 4 +- .../machine/multiblock/TileVacuumFreezer.java | 4 +- .../tiles/machine/tier1/TileAlloySmelter.java | 4 +- .../machine/tier1/TileAssemblingMachine.java | 4 +- .../machine/tier1/TileAutoCraftingTable.java | 4 +- .../machine/tier1/TileChemicalReactor.java | 4 +- .../tiles/machine/tier1/TileCompressor.java | 4 +- .../machine/tier1/TileElectricFurnace.java | 4 +- .../tiles/machine/tier1/TileExtractor.java | 4 +- .../tiles/machine/tier1/TileGrinder.java | 4 +- .../tier1/TileIndustrialElectrolyzer.java | 4 +- .../machine/tier1/TilePlayerDectector.java | 4 +- .../tiles/machine/tier1/TileRecycler.java | 4 +- .../machine/tier1/TileRollingMachine.java | 4 +- .../machine/tier1/TileScrapboxinator.java | 4 +- .../tiles/storage/TileAdjustableSU.java | 6 +- .../tiles/storage/TileHighVoltageSU.java | 4 +- .../tiles/storage/TileLowVoltageSU.java | 4 +- .../tiles/storage/TileMediumVoltageSU.java | 4 +- .../storage/idsu/TileInterdimensionalSU.java | 4 +- .../tiles/storage/lesu/TileLSUStorage.java | 4 +- .../tiles/storage/lesu/TileLapotronicSU.java | 4 +- .../tiles/transformers/TileHVTransformer.java | 4 +- .../tiles/transformers/TileLVTransformer.java | 4 +- .../tiles/transformers/TileMVTransformer.java | 4 +- .../techreborn/utils/StackWIPHandler.java | 8 +- .../techreborn/world/RubberTreeGenerator.java | 10 +- .../VillageComponentRubberPlantaion.java | 6 +- 86 files changed, 307 insertions(+), 298 deletions(-) rename src/main/java/techreborn/init/{ModBlocks.java => TRBlocks.java} (97%) rename src/main/java/techreborn/init/{ModTileEntities.java => TRTileEntities.java} (96%) diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index 1eec45b63..228c7dfbb 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -121,8 +121,8 @@ public class TechReborn { CommonProxy.isChiselAround = Loader.isModLoaded("ctm"); TechRebornAPI.subItemRetriever = new SubItemRetriever(); // Registration - ModBlocks.init(); - ModTileEntities.init(); + TRBlocks.init(); + TRTileEntities.init(); ModFluids.init(); TRItems.init(); diff --git a/src/main/java/techreborn/blocks/BlockComputerCube.java b/src/main/java/techreborn/blocks/BlockComputerCube.java index 442903179..8cce5fbbe 100644 --- a/src/main/java/techreborn/blocks/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/BlockComputerCube.java @@ -39,7 +39,7 @@ import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.TechReborn; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.init.ModSounds; import techreborn.utils.TechRebornCreativeTab; @@ -65,7 +65,7 @@ public class BlockComputerCube extends BlockMachineBase { if (!tool.isEmpty() && ToolManager.INSTANCE.canHandleTool(tool)) { if (ToolManager.INSTANCE.handleTool(tool, pos, worldIn, playerIn, side, false)) { if (playerIn.isSneaking()) { - ItemStack drop = new ItemStack(ModBlocks.COMPUTER_CUBE, 1); + ItemStack drop = new ItemStack(TRBlocks.COMPUTER_CUBE, 1); spawnAsEntity(worldIn, pos, drop); worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, ModSounds.BLOCK_DISMANTLE, SoundCategory.BLOCKS, 0.6F, 1F); diff --git a/src/main/java/techreborn/blocks/BlockFusionCoil.java b/src/main/java/techreborn/blocks/BlockFusionCoil.java index 1c17a0108..3e25caa7c 100644 --- a/src/main/java/techreborn/blocks/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/BlockFusionCoil.java @@ -43,7 +43,7 @@ import reborncore.api.ToolManager; import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import techreborn.TechReborn; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.init.ModSounds; import techreborn.utils.TechRebornCreativeTab; @@ -68,7 +68,7 @@ public class BlockFusionCoil extends Block { if (!tool.isEmpty() && ToolManager.INSTANCE.canHandleTool(tool)) { if (ToolManager.INSTANCE.handleTool(tool, pos, worldIn, playerIn, side, false)) { if (playerIn.isSneaking()) { - ItemStack drop = new ItemStack(ModBlocks.FUSION_COIL, 1); + ItemStack drop = new ItemStack(TRBlocks.FUSION_COIL, 1); spawnAsEntity(worldIn, pos, drop); worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, ModSounds.BLOCK_DISMANTLE, SoundCategory.BLOCKS, 0.6F, 1F); diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index e87afa2aa..151463046 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -40,7 +40,7 @@ import reborncore.common.blocks.BlockMachineBase; import reborncore.common.util.Torus; import techreborn.TechReborn; import techreborn.client.EGui; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.fusionReactor.TileFusionControlComputer; import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.damageSources.FusionDamageSource; @@ -60,7 +60,7 @@ public class BlockFusionControlComputer extends BlockMachineBase { final EntityPlayer player, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ) { final TileFusionControlComputer tileFusionControlComputer = (TileFusionControlComputer) world.getTileEntity(pos); - if(!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == Item.getItemFromBlock(ModBlocks.FUSION_COIL)){ + if(!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == Item.getItemFromBlock(TRBlocks.FUSION_COIL)){ List coils = Torus.generate(tileFusionControlComputer.getPos(), tileFusionControlComputer.size); boolean placed = false; for(BlockPos coil : coils){ @@ -68,7 +68,7 @@ public class BlockFusionControlComputer extends BlockMachineBase { return true; } if(world.isAirBlock(coil) && !tileFusionControlComputer.isCoil(coil)){ - world.setBlockState(coil, ModBlocks.FUSION_COIL.getDefaultState()); + world.setBlockState(coil, TRBlocks.FUSION_COIL.getDefaultState()); if(!player.isCreative()){ player.getHeldItem(hand).shrink(1); } diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index 35f96a83a..8197daaaf 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -41,7 +41,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import techreborn.TechReborn; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.utils.TechRebornCreativeTab; import java.util.List; @@ -126,7 +126,7 @@ public class BlockRubberLeaves extends BlockLeaves { @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(ModBlocks.RUBBER_SAPLING); + return Item.getItemFromBlock(TRBlocks.RUBBER_SAPLING); } @Override diff --git a/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java b/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java index 8c6af4200..eb311df80 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockAdjustableSU.java @@ -33,7 +33,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.client.EGui; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.tiles.storage.TileAdjustableSU; public class BlockAdjustableSU extends BlockEnergyStorage { @@ -50,7 +50,7 @@ public class BlockAdjustableSU extends BlockEnergyStorage { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE)); + drops.add(new ItemStack(TRContent.MachineBlocks.INDUSTRIAL.getFrame())); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java b/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java index 3be609e7c..7b3b80ca3 100644 --- a/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockHighVoltageSU.java @@ -33,7 +33,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.client.EGui; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.tiles.storage.TileHighVoltageSU; /** @@ -53,7 +53,7 @@ public class BlockHighVoltageSU extends BlockEnergyStorage { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); + drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame())); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java b/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java index a1cf1e05b..ea620aa5e 100644 --- a/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockInterdimensionalSU.java @@ -35,7 +35,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.client.EGui; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.tiles.storage.idsu.TileInterdimensionalSU; public class BlockInterdimensionalSU extends BlockEnergyStorage { @@ -71,7 +71,7 @@ public class BlockInterdimensionalSU extends BlockEnergyStorage { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); + drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame())); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java index 135c38937..be8fcb55c 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java @@ -45,7 +45,7 @@ import reborncore.common.RebornCoreConfig; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.items.WrenchHelper; import techreborn.TechReborn; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.tiles.storage.lesu.TileLSUStorage; import techreborn.utils.TechRebornCreativeTab; @@ -113,7 +113,7 @@ public class BlockLSUStorage extends BaseTileBlock { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC)); + drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame())); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java b/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java index d6ff1d678..b42f3344a 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockLapotronicSU.java @@ -33,7 +33,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.client.EGui; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.tiles.storage.lesu.TileLapotronicSU; public class BlockLapotronicSU extends BlockEnergyStorage { @@ -50,7 +50,7 @@ public class BlockLapotronicSU extends BlockEnergyStorage { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); + drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame())); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java b/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java index 95b1be1e4..f6914e4e1 100644 --- a/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockMediumVoltageSU.java @@ -33,7 +33,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; import techreborn.client.EGui; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.tiles.storage.TileMediumVoltageSU; /** @@ -53,7 +53,7 @@ public class BlockMediumVoltageSU extends BlockEnergyStorage { @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { if (RebornCoreConfig.wrenchRequired) { - drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC)); + drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame())); } else { super.getDrops(drops, world, pos, state, fortune); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java index 6541fdb0a..fc003a10e 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java @@ -57,7 +57,7 @@ import reborncore.common.util.ArrayUtils; import reborncore.common.util.ChatUtils; import reborncore.common.util.StringUtils; import techreborn.TechReborn; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.utils.MessageIDs; import techreborn.tiles.machine.tier1.TilePlayerDectector; import techreborn.utils.TechRebornCreativeTab; @@ -176,7 +176,7 @@ public class BlockPlayerDetector extends BlockMachineBase { // Block @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(ModBlocks.PLAYER_DETECTOR, 1, typeNamesList.indexOf(state.getValue(TYPE))); + return new ItemStack(TRBlocks.PLAYER_DETECTOR, 1, typeNamesList.indexOf(state.getValue(TYPE))); } @Override diff --git a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java index 5a2333b4b..0a5bed3f6 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockHVTransformer.java @@ -32,7 +32,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.tiles.transformers.TileHVTransformer; /** @@ -52,7 +52,7 @@ public class BlockHVTransformer extends BlockTransformer { @Override public void getDrops(NonNullList drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) { if (RebornCoreConfig.wrenchRequired){ - drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); + drops.add(new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame())); } else { drops.add(new ItemStack(this)); diff --git a/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java index 9361afbf0..48272ac67 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockMVTransformer.java @@ -32,7 +32,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import reborncore.common.RebornCoreConfig; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.tiles.transformers.TileMVTransformer; /** @@ -52,7 +52,7 @@ public class BlockMVTransformer extends BlockTransformer { @Override public void getDrops(NonNullList drops, final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) { if (RebornCoreConfig.wrenchRequired){ - drops.add(new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC)); + drops.add(new ItemStack(TRContent.MachineBlocks.BASIC.getFrame())); } else { drops.add(new ItemStack(this)); diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index c942dc542..9fdc164a5 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -31,7 +31,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import techreborn.TechReborn; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.init.TRContent; import techreborn.init.TRItems; @@ -120,11 +120,11 @@ public class RegisterItemJsons { registerBlockstateMultiItem(TRItems.BRONZE_HOE, "bronze_hoe", "items/tool"); } - register(ModBlocks.RUBBER_SAPLING, "misc/rubber_sapling"); + register(TRBlocks.RUBBER_SAPLING, "misc/rubber_sapling"); } private static void registerBlocks() { - register(ModBlocks.REFINED_IRON_FENCE, "iron_fence"); + register(TRBlocks.REFINED_IRON_FENCE, "iron_fence"); } private static void register(Item item, int meta, String name) { diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 356adee1f..90d63c726 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -34,7 +34,7 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.client.gui.widget.GuiButtonHologram; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.proxies.ClientProxy; import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace; @@ -112,43 +112,45 @@ public class GuiBlastFurnace extends GuiBase { { // This code here makes a basic multiblock and then sets to the selected one. final Multiblock multiblock = new Multiblock(); - this.addComponent(0, 0, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(1, 0, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(0, 0, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 0, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(0, 0, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 0, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 0, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(1, 0, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(1, 0, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); + IBlockState standardCasing = TRContent.MachineBlocks.BASIC.getCasing().getDefaultState(); + + this.addComponent(0, 0, 0, standardCasing, multiblock); + this.addComponent(1, 0, 0, standardCasing, multiblock); + this.addComponent(0, 0, 1, standardCasing, multiblock); + this.addComponent(-1, 0, 0, standardCasing, multiblock); + this.addComponent(0, 0, -1, standardCasing, multiblock); + this.addComponent(-1, 0, -1, standardCasing, multiblock); + this.addComponent(-1, 0, 1, standardCasing, multiblock); + this.addComponent(1, 0, -1, standardCasing, multiblock); + this.addComponent(1, 0, 1, standardCasing, multiblock); - this.addComponent(1, 1, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(0, 1, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 1, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(0, 1, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 1, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 1, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(1, 1, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(1, 1, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); + this.addComponent(1, 1, 0, standardCasing, multiblock); + this.addComponent(0, 1, 1, standardCasing, multiblock); + this.addComponent(-1, 1, 0, standardCasing, multiblock); + this.addComponent(0, 1, -1, standardCasing, multiblock); + this.addComponent(-1, 1, -1, standardCasing, multiblock); + this.addComponent(-1, 1, 1, standardCasing, multiblock); + this.addComponent(1, 1, -1, standardCasing, multiblock); + this.addComponent(1, 1, 1, standardCasing, multiblock); - this.addComponent(1, 2, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(0, 2, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 2, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(0, 2, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 2, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 2, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(1, 2, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(1, 2, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); + this.addComponent(1, 2, 0, standardCasing, multiblock); + this.addComponent(0, 2, 1, standardCasing, multiblock); + this.addComponent(-1, 2, 0, standardCasing, multiblock); + this.addComponent(0, 2, -1, standardCasing, multiblock); + this.addComponent(-1, 2, -1, standardCasing, multiblock); + this.addComponent(-1, 2, 1, standardCasing, multiblock); + this.addComponent(1, 2, -1, standardCasing, multiblock); + this.addComponent(1, 2, 1, standardCasing, multiblock); - this.addComponent(0, 3, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(1, 3, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(0, 3, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 3, 0, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(0, 3, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 3, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(-1, 3, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(1, 3, -1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); - this.addComponent(1, 3, 1, ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(), multiblock); + this.addComponent(0, 3, 0, standardCasing, multiblock); + this.addComponent(1, 3, 0, standardCasing, multiblock); + this.addComponent(0, 3, 1, standardCasing, multiblock); + this.addComponent(-1, 3, 0, standardCasing, multiblock); + this.addComponent(0, 3, -1, standardCasing, multiblock); + this.addComponent(-1, 3, -1, standardCasing, multiblock); + this.addComponent(-1, 3, 1, standardCasing, multiblock); + this.addComponent(1, 3, -1, standardCasing, multiblock); + this.addComponent(1, 3, 1, standardCasing, multiblock); final MultiblockSet set = new MultiblockSet(multiblock); ClientProxy.multiblockRenderEvent.setMultiblock(set); diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index d26f80efd..379dcfae0 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -34,7 +34,7 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.client.gui.widget.GuiButtonHologram; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.proxies.ClientProxy; import techreborn.tiles.machine.multiblock.TileDistillationTower; @@ -107,8 +107,8 @@ public class GuiDistillationTower extends GuiBase { { // This code here makes a basic multiblock and then sets to the selected one. final Multiblock multiblock = new Multiblock(); - IBlockState advancedCasing = ModBlocks.MACHINE_CASINGS_ADVANCED.getDefaultState(); - IBlockState standardCasing = ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(); + IBlockState advancedCasing = TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState(); + IBlockState standardCasing = TRContent.MachineBlocks.BASIC.getCasing().getDefaultState(); this.addComponent(0, 0, 0, standardCasing, multiblock); this.addComponent(1, 0, 0, standardCasing, multiblock); diff --git a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java index fff38930f..92cebbd40 100644 --- a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java @@ -33,7 +33,7 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.client.gui.widget.GuiButtonHologram; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.proxies.ClientProxy; import techreborn.tiles.machine.multiblock.TileFluidReplicator; @@ -116,7 +116,7 @@ public class GuiFluidReplicator extends GuiBase { { // This code here makes a basic multiblock and then sets to the selected one. final Multiblock multiblock = new Multiblock(); - final IBlockState reinforcedCasing = ModBlocks.MACHINE_CASINGS_REINFORCED.getDefaultState(); + final IBlockState reinforcedCasing = TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState(); addComponent(1, 0, 0, reinforcedCasing, multiblock); addComponent(0, 0, 1, reinforcedCasing, multiblock); diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index ec44d2ed0..94185410c 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -37,7 +37,7 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.Torus; import techreborn.client.gui.widget.GuiButtonHologram; import techreborn.client.gui.widget.GuiButtonUpDown; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.packets.PacketFusionControlSize; import techreborn.proxies.ClientProxy; import techreborn.tiles.fusionReactor.TileFusionControlComputer; @@ -150,7 +150,7 @@ public class GuiFusionReactor extends GuiBase { private void updateMultiBlockRender(){ final Multiblock multiblock = new Multiblock(); - IBlockState coil = ModBlocks.FUSION_COIL.getDefaultState(); + IBlockState coil = TRBlocks.FUSION_COIL.getDefaultState(); List coils = Torus.generate(new BlockPos(0, 0, 0), tile.size); coils.forEach(pos -> addComponent(pos.getX(), pos.getY(), pos.getZ(), coil, multiblock)); diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 6076bed05..1ed80245b 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -33,7 +33,7 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.client.gui.widget.GuiButtonHologram; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.proxies.ClientProxy; import techreborn.tiles.machine.multiblock.TileImplosionCompressor; @@ -113,7 +113,7 @@ public class GuiImplosionCompressor extends GuiBase { for (int y = -4; y <= -2; y++) { for (int z = -1; z <= 1; z++) { if (!((x == 0) && (y == -3) && (z == 0))) { - this.addComponent(x, y, z, ModBlocks.MACHINE_CASINGS_REINFORCED.getDefaultState(), multiblock); + this.addComponent(x, y, z, TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState(), multiblock); } } } diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index c9f384afd..81fb85983 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -34,7 +34,7 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.client.gui.widget.GuiButtonHologram; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.proxies.ClientProxy; import techreborn.tiles.machine.multiblock.TileIndustrialGrinder; @@ -113,8 +113,8 @@ public class GuiIndustrialGrinder extends GuiBase { { // This code here makes a basic multiblock and then sets to the selected one. final Multiblock multiblock = new Multiblock(); - IBlockState standardCasing = ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(); - IBlockState reinforcedCasing = ModBlocks.MACHINE_CASINGS_REINFORCED.getDefaultState(); + IBlockState standardCasing = TRContent.MachineBlocks.BASIC.getCasing().getDefaultState(); + IBlockState reinforcedCasing = TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState(); this.addComponent(0, -1, 0, standardCasing, multiblock); this.addComponent(1, -1, 0, standardCasing, multiblock); diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index b0a6d39ff..a150488eb 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -34,7 +34,7 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.client.gui.widget.GuiButtonHologram; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.proxies.ClientProxy; import techreborn.tiles.machine.multiblock.TileIndustrialSawmill; @@ -112,8 +112,8 @@ public class GuiIndustrialSawmill extends GuiBase { { // This code here makes a basic multiblock and then sets to the selected one. final Multiblock multiblock = new Multiblock(); - IBlockState standardCasing = ModBlocks.MACHINE_CASINGS_STANDARD.getDefaultState(); - IBlockState reinforcedCasing = ModBlocks.MACHINE_CASINGS_REINFORCED.getDefaultState(); + IBlockState standardCasing = TRContent.MachineBlocks.BASIC.getCasing().getDefaultState(); + IBlockState reinforcedCasing = TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState(); this.addComponent(0, -1, 0, standardCasing, multiblock); this.addComponent(1, -1, 0, standardCasing, multiblock); diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index 4bfd37fef..40433f8b3 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -32,7 +32,7 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.client.gui.widget.GuiButtonHologram; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; import techreborn.proxies.ClientProxy; import techreborn.tiles.machine.multiblock.TileVacuumFreezer; @@ -104,7 +104,7 @@ public class GuiVacuumFreezer extends GuiBase { { // This code here makes a basic multiblock and then sets to the selected one. final Multiblock multiblock = new Multiblock(); - IBlockState reinforcedCasing = ModBlocks.MACHINE_CASINGS_REINFORCED.getDefaultState(); + IBlockState reinforcedCasing = TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState(); this.addComponent(0, -1, 0, reinforcedCasing, multiblock); this.addComponent(1, -1, 0, reinforcedCasing, multiblock); diff --git a/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java b/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java index e2a6454fb..bb7a8d8b7 100644 --- a/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java +++ b/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java @@ -34,7 +34,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import techreborn.blocks.BlockNuke; import techreborn.entities.EntityNukePrimed; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; /** * Created by Mark on 13/03/2016. @@ -61,7 +61,7 @@ public class RenderNukePrimed extends Render { } this.bindEntityTexture(entity); GlStateManager.translate(-0.5F, -0.5F, 0.5F); - blockrendererdispatcher.renderBlockBrightness(ModBlocks.NUKE.getDefaultState(), + blockrendererdispatcher.renderBlockBrightness(TRBlocks.NUKE.getDefaultState(), entity.getBrightness()); GlStateManager.translate(0.0F, 0.0F, 1.0F); if (entity.getFuse() / 5 % 2 == 0) { @@ -72,7 +72,7 @@ public class RenderNukePrimed extends Render { GlStateManager.doPolygonOffset(-3.0F, -3.0F); GlStateManager.enablePolygonOffset(); blockrendererdispatcher.renderBlockBrightness( - ModBlocks.NUKE.getDefaultState().withProperty(BlockNuke.OVERLAY, true), 1.0F); + TRBlocks.NUKE.getDefaultState().withProperty(BlockNuke.OVERLAY, true), 1.0F); GlStateManager.doPolygonOffset(0.0F, 0.0F); GlStateManager.disablePolygonOffset(); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index 2e4a8c14b..e996c42bb 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -24,11 +24,15 @@ package techreborn.init; +import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableList; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import reborncore.common.util.OreUtil; +import reborncore.common.util.StringUtils; +import techreborn.init.TRContent.Dusts; +import techreborn.init.TRContent.Ores; public class OreDict { @@ -43,11 +47,11 @@ public class OreDict { */ public static void init() { // Blocks - OreUtil.registerOre("fenceIron", ModBlocks.REFINED_IRON_FENCE); - OreUtil.registerOre("woodRubber", ModBlocks.RUBBER_LOG); - OreUtil.registerOre("glassReinforced", ModBlocks.REINFORCED_GLASS); - OreUtil.registerOre("treeSapling", ModBlocks.RUBBER_SAPLING); - OreUtil.registerOre("saplingRubber", ModBlocks.RUBBER_SAPLING); + OreUtil.registerOre("fenceIron", TRBlocks.REFINED_IRON_FENCE); + OreUtil.registerOre("woodRubber", TRBlocks.RUBBER_LOG); + OreUtil.registerOre("glassReinforced", TRBlocks.REINFORCED_GLASS); + OreUtil.registerOre("treeSapling", TRBlocks.RUBBER_SAPLING); + OreUtil.registerOre("saplingRubber", TRBlocks.RUBBER_SAPLING); // OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); // OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); @@ -72,10 +76,10 @@ public class OreDict { OreUtil.registerOre("itemRubber", TRContent.Parts.RUBBER.getStack()); // Frames - OreUtil.registerOre("machineBasic", new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC)); - OreUtil.registerOre("machineBlockBasic", new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC)); - OreUtil.registerOre("machineBlockAdvanced", new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED)); - OreUtil.registerOre("machineBlockElite", new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE)); + OreUtil.registerOre("machineBasic", new ItemStack(TRContent.MachineBlocks.BASIC.getFrame())); + OreUtil.registerOre("machineBlockBasic", new ItemStack(TRContent.MachineBlocks.BASIC.getFrame())); + OreUtil.registerOre("machineBlockAdvanced", new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame())); + OreUtil.registerOre("machineBlockElite", new ItemStack(TRContent.MachineBlocks.INDUSTRIAL.getFrame())); // Tools&Armor OreUtil.registerOre("reBattery", TRItems.RED_CELL_BATTERY); @@ -91,17 +95,23 @@ public class OreDict { OreUtil.registerOre("crafterWood", Blocks.CRAFTING_TABLE); OreUtil.registerOre("craftingIndustrialDiamond", Items.DIAMOND); OreUtil.registerOre("fertilizer", new ItemStack(Items.DYE, 1, 15)); - //OreUtil.registerOre("insulatedGoldCableItem", BlockCable.getCableByName("insulatedgold")); + OreUtil.registerOre("insulatedGoldCableItem", TRContent.Cables.INSULATED_GOLD.asItem()); OreUtil.registerOre("pulpWood", TRContent.Dusts.SAW.getStack()); //OreUtil.registerOre("uran235", nothing); //OreUtil.registerOre("uran238", nothing); //OreUtil.registerOre("smallUran235", nothing); + + for (Ores ore : TRContent.Ores.values()) { + OreUtil.registerOre("ore" + StringUtils.toFirstCapital(ore.name), new ItemStack(ore.block)); + } + + for (Dusts dust : TRContent.Dusts.values()) { + OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + dust.name), dust.getStack()); + } - // for (String ore : BlockOre.ores) { - // OreUtil.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore)); - // } - + + // OreUtil.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver")); // OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum")); // OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum")); @@ -152,9 +162,7 @@ public class OreDict { // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type)); // } - // for (String type : ItemDusts.types) { - // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type)); - // } + // // for (String type : ItemDustsSmall.types) { // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type)); diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/TRBlocks.java similarity index 97% rename from src/main/java/techreborn/init/ModBlocks.java rename to src/main/java/techreborn/init/TRBlocks.java index d80090709..1bdbd4ea6 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/TRBlocks.java @@ -48,17 +48,11 @@ import techreborn.itemblocks.*; /** * Registers all TR blocks */ -public class ModBlocks { +public class TRBlocks { // Misc Blocks public static Block COMPUTER_CUBE; public static Block FLARE; - public static Block MACHINE_CASINGS_ADVANCED; - public static Block MACHINE_CASINGS_REINFORCED; - public static Block MACHINE_CASINGS_STANDARD; - public static Block MACHINE_BLOCK_ADVANCED; - public static Block MACHINE_BLOCK_BASIC; - public static Block MACHINE_BLOCK_ELITE; public static Block NUKE; public static Block REFINED_IRON_FENCE; public static Block REINFORCED_GLASS; diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index a301e414e..2506f0afd 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -184,7 +184,7 @@ public class TRContent { } - public static enum Cables { + public static enum Cables implements IItemProvider { COPPER(128, 12.0, true, EnumPowerTier.MEDIUM), TIN(32, 12.0, true, EnumPowerTier.LOW), GOLD(512, 12.0, true, EnumPowerTier.HIGH), @@ -216,6 +216,11 @@ public class TRContent { this.block = new BlockCable(this); InitUtils.setup(block, name + "_cable"); } + + @Override + public Item asItem() { + return Item.getItemFromBlock(block); + } } public static enum Ores implements IItemProvider { diff --git a/src/main/java/techreborn/init/TRItems.java b/src/main/java/techreborn/init/TRItems.java index e01a2de02..5241cce1d 100644 --- a/src/main/java/techreborn/init/TRItems.java +++ b/src/main/java/techreborn/init/TRItems.java @@ -273,8 +273,8 @@ public class TRItems { MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); // TODO: do we need this at all? - BlockMachineBase.advancedFrameStack = new ItemStack(ModBlocks.MACHINE_BLOCK_ADVANCED); - BlockMachineBase.basicFrameStack = new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC); + BlockMachineBase.advancedFrameStack = new ItemStack(TRContent.MachineBlocks.ADVANCED.getFrame()); + BlockMachineBase.basicFrameStack = new ItemStack(TRContent.MachineBlocks.BASIC.getFrame()); } public static void registerItem(Item item) { diff --git a/src/main/java/techreborn/init/ModTileEntities.java b/src/main/java/techreborn/init/TRTileEntities.java similarity index 96% rename from src/main/java/techreborn/init/ModTileEntities.java rename to src/main/java/techreborn/init/TRTileEntities.java index 764838fef..bf008b2cd 100644 --- a/src/main/java/techreborn/init/ModTileEntities.java +++ b/src/main/java/techreborn/init/TRTileEntities.java @@ -55,7 +55,7 @@ import techreborn.tiles.transformers.TileMVTransformer; import java.util.Arrays; -public enum ModTileEntities { +public enum TRTileEntities { THERMAL_GEN(TileThermalGenerator.class, "thermal_generator"), QUANTUM_TANK(TileQuantumTank.class, "quantum_tank"), @@ -119,17 +119,17 @@ public enum ModTileEntities { public Class tileClass; public ResourceLocation name; - ModTileEntities(Class tileClass, ResourceLocation name) { + TRTileEntities(Class tileClass, ResourceLocation name) { this.tileClass = tileClass; this.name = name; } - ModTileEntities(Class tileClass, String name) { + TRTileEntities(Class tileClass, String name) { this(tileClass, new ResourceLocation(TechReborn.MOD_ID, name)); } public static void init(){ - Arrays.stream(ModTileEntities.values()) + Arrays.stream(TRTileEntities.values()) .forEach(modTileEntities -> GameRegistry.registerTileEntity(modTileEntities.tileClass, modTileEntities.name)); } diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index 57a2a596d..c8d2d59a4 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -32,7 +32,7 @@ import net.minecraftforge.oredict.OreDictionary; import reborncore.common.util.RebornCraftingHelper; import techreborn.TechReborn; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.init.TRContent; import techreborn.init.TRItems; import techreborn.items.*; @@ -49,11 +49,11 @@ public class CraftingTableRecipes extends RecipeMethods { // registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "stone", "plateIridiumAlloy"); // registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("tungstensteel", 1), "plateIridium"); // registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "ingotTungstensteel"); - registerShapeless(getStack(ModBlocks.RUBBER_PLANKS, 4), getStack(ModBlocks.RUBBER_LOG)); + registerShapeless(getStack(TRBlocks.RUBBER_PLANKS, 4), getStack(TRBlocks.RUBBER_LOG)); registerShaped(DynamicCell.getEmptyCell(16), " T ", "T T", " T ", 'T', "ingotTin"); - registerShaped(getStack(ModBlocks.REFINED_IRON_FENCE), "RRR", "RRR", 'R', "ingotRefinedIron"); - registerShaped(getStack(ModBlocks.REINFORCED_GLASS, 7), "GAG", "GGG", "GAG", 'A', "plateAdvancedAlloy", 'G', "blockGlass"); - registerShaped(getStack(ModBlocks.REINFORCED_GLASS, 7), "GGG", "AGA", "GGG", 'A', "plateAdvancedAlloy", 'G', "blockGlass"); + registerShaped(getStack(TRBlocks.REFINED_IRON_FENCE), "RRR", "RRR", 'R', "ingotRefinedIron"); + registerShaped(getStack(TRBlocks.REINFORCED_GLASS, 7), "GAG", "GGG", "GAG", 'A', "plateAdvancedAlloy", 'G', "blockGlass"); + registerShaped(getStack(TRBlocks.REINFORCED_GLASS, 7), "GGG", "AGA", "GGG", 'A', "plateAdvancedAlloy", 'G', "blockGlass"); // registerShaped(getMaterial("iridium_alloy", Type.INGOT), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', "dustDiamond", 'A', "plateAdvancedAlloy"); // Tools and devices @@ -99,47 +99,47 @@ public class CraftingTableRecipes extends RecipeMethods { // registerShaped(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G', "blockGlass", 'W', EnumCableType.IGOLD.getStack(), 'C', "circuitBasic", 'T', getStack(ModBlocks.MV_TRANSFORMER)); //Machines - registerShapeless(getStack(ModBlocks.SOLID_FUEL_GENEREATOR), "reBattery", "machineBlockBasic", getStack(Blocks.FURNACE)); - registerShaped(getStack(ModBlocks.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(ModBlocks.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateAluminum", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(ModBlocks.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "ingotRefinedIron", 'C', "circuitBasic", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(ModBlocks.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "plateAluminum", 'C', "circuitBasic", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(ModBlocks.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateInvar", 'A', "circuitAdvanced", 'W', getStack(ModBlocks.WIND_MILL), 'G', "glassReinforced"); - registerShaped(getStack(ModBlocks.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateAluminum", 'A', "circuitAdvanced", 'W', getStack(ModBlocks.WIND_MILL), 'G', "glassReinforced"); - registerShaped(getStack(ModBlocks.THERMAL_GENERATOR), "III", "IRI", "CGC", 'I', "plateInvar", 'R', "glassReinforced", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic"); - registerShaped(getStack(ModBlocks.WIND_MILL), " I ", " G ", " I ", 'I', "plateMagnalium", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(ModBlocks.WIND_MILL), "IGI", 'I', "plateMagnalium", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(ModBlocks.WATER_MILL), "SWS", "WGW", "SWS", 'S', "stickWood", 'W', "plankWood", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR)); + registerShapeless(getStack(TRBlocks.SOLID_FUEL_GENEREATOR), "reBattery", "machineBlockBasic", getStack(Blocks.FURNACE)); + registerShaped(getStack(TRBlocks.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); + registerShaped(getStack(TRBlocks.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateAluminum", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); + registerShaped(getStack(TRBlocks.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "ingotRefinedIron", 'C', "circuitBasic", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); + registerShaped(getStack(TRBlocks.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "plateAluminum", 'C', "circuitBasic", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); + registerShaped(getStack(TRBlocks.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateInvar", 'A', "circuitAdvanced", 'W', getStack(TRBlocks.WIND_MILL), 'G', "glassReinforced"); + registerShaped(getStack(TRBlocks.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateAluminum", 'A', "circuitAdvanced", 'W', getStack(TRBlocks.WIND_MILL), 'G', "glassReinforced"); + registerShaped(getStack(TRBlocks.THERMAL_GENERATOR), "III", "IRI", "CGC", 'I', "plateInvar", 'R', "glassReinforced", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic"); + registerShaped(getStack(TRBlocks.WIND_MILL), " I ", " G ", " I ", 'I', "plateMagnalium", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); + registerShaped(getStack(TRBlocks.WIND_MILL), "IGI", 'I', "plateMagnalium", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); + registerShaped(getStack(TRBlocks.WATER_MILL), "SWS", "WGW", "SWS", 'S', "stickWood", 'W', "plankWood", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); // registerShaped(getStack(ModBlocks.LIGHTNING_ROD), "CAC", "ACA", "CAC", 'A', getStack(ModBlocks.MACHINE_CASINGS, 1, 2), 'C', "circuitMaster"); - registerShaped(getStack(ModBlocks.IRON_ALLOY_FURNACE), "III", "F F", "III", 'I', "ingotRefinedIron", 'F', getStack(ModBlocks.IRON_FURNACE)); - registerShaped(getStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), "RER", "CFC", "RER", 'R', "plateIron", 'E', getStack(ModBlocks.EXTRACTOR), 'C', "circuitAdvanced", 'F', "machineBlockAdvanced"); - registerShaped(getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "ingotRefinedIron", 'E', getStack(ModBlocks.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced"); - registerShaped(getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "plateAluminum", 'E', getStack(ModBlocks.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced"); - registerShaped(getStack(ModBlocks.INDUSTRIAL_SAWMILL), "PAP", "SSS", "ACA", 'P', "ingotRefinedIron", 'A', "circuitAdvanced", 'S', TRContent.Parts.DIAMOND_SAW_BLADE.getStack(), 'C', "machineBlockAdvanced"); - registerShaped(getStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), "CHC", "HBH", "FHF", 'H', getMaterial("cupronickelHeatingCoil", Type.PART), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'F', getStack(ModBlocks.ELECTRIC_FURNACE)); - registerShaped(getStack(ModBlocks.INDUSTRIAL_GRINDER), "ECG", "HHH", "CBC", 'E', getStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), 'H', "craftingDiamondGrinder", 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'G', getStack(ModBlocks.GRINDER)); + registerShaped(getStack(TRBlocks.IRON_ALLOY_FURNACE), "III", "F F", "III", 'I', "ingotRefinedIron", 'F', getStack(TRBlocks.IRON_FURNACE)); + registerShaped(getStack(TRBlocks.INDUSTRIAL_ELECTROLYZER), "RER", "CFC", "RER", 'R', "plateIron", 'E', getStack(TRBlocks.EXTRACTOR), 'C', "circuitAdvanced", 'F', "machineBlockAdvanced"); + registerShaped(getStack(TRBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "ingotRefinedIron", 'E', getStack(TRBlocks.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced"); + registerShaped(getStack(TRBlocks.INDUSTRIAL_CENTRIFUGE), "RCR", "AEA", "RCR", 'R', "plateAluminum", 'E', getStack(TRBlocks.EXTRACTOR), 'A', "machineBlockAdvanced", 'C', "circuitAdvanced"); + registerShaped(getStack(TRBlocks.INDUSTRIAL_SAWMILL), "PAP", "SSS", "ACA", 'P', "ingotRefinedIron", 'A', "circuitAdvanced", 'S', TRContent.Parts.DIAMOND_SAW_BLADE.getStack(), 'C', "machineBlockAdvanced"); + registerShaped(getStack(TRBlocks.INDUSTRIAL_BLAST_FURNACE), "CHC", "HBH", "FHF", 'H', getMaterial("cupronickelHeatingCoil", Type.PART), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'F', getStack(TRBlocks.ELECTRIC_FURNACE)); + registerShaped(getStack(TRBlocks.INDUSTRIAL_GRINDER), "ECG", "HHH", "CBC", 'E', getStack(TRBlocks.INDUSTRIAL_ELECTROLYZER), 'H', "craftingDiamondGrinder", 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'G', getStack(TRBlocks.GRINDER)); // registerShaped(getStack(ModBlocks.IMPLOSION_COMPRESSOR), "ABA", "CPC", "ABA", 'A', getMaterialObject("advancedAlloy", Type.INGOT), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'P', getStack(ModBlocks.COMPRESSOR)); - registerShaped(getStack(ModBlocks.VACUUM_FREEZER), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', "glassReinforced", 'P', getStack(ModBlocks.EXTRACTOR)); - registerShaped(getStack(ModBlocks.DISTILLATION_TOWER), "CMC", "PBP", "EME", 'E', getStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), 'M', "circuitMaster", 'B', "machineBlockElite", 'C', getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), 'P', getStack(ModBlocks.EXTRACTOR)); - registerShaped(getStack(ModBlocks.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(ModBlocks.EXTRACTOR), 'P', getStack(ModBlocks.COMPRESSOR), 'E', getStack(ModBlocks.EXTRACTOR)); - registerShaped(getStack(ModBlocks.ROLLING_MACHINE), "PCP", "MBM", "PCP", 'P', getStack(Blocks.PISTON), 'C', "circuitAdvanced", 'M', getStack(ModBlocks.COMPRESSOR), 'B', "machineBlockBasic"); - registerShaped(getStack(ModBlocks.AUTO_CRAFTING_TABLE), "MPM", "PCP", "MPM", 'M', "circuitAdvanced", 'C', "workbench", 'P', "plateIron"); - registerShaped(getStack(ModBlocks.CHARGE_O_MAT), "ETE", "COC", "EAE", 'E', "circuitMaster", 'T', "energyCrystal", 'C', "chest", 'O', getStack(TRItems.LAPOTRONIC_ORB), 'A', "machineBlockAdvanced"); - registerShaped(getStack(ModBlocks.ALLOY_SMELTER), " C ", "FMF", " ", 'C', "circuitBasic", 'F', getStack(ModBlocks.ELECTRIC_FURNACE), 'M', "machineBlockBasic"); - registerShaped(getStack(ModBlocks.INTERDIMENSIONAL_SU), "PAP", "ACA", "PAP", 'P', "plateIridiumAlloy", 'C', "chestEnder", 'A', getStack(ModBlocks.ADJUSTABLE_SU)); - registerShaped(getStack(ModBlocks.ADJUSTABLE_SU), "LLL", "LCL", "LLL", 'L', getStack(TRItems.LAPOTRONIC_ORB), 'C', "energyCrystal"); - registerShaped(getStack(ModBlocks.LAPOTRONIC_SU), " L ", "CBC", " M ", 'L', getStack(ModBlocks.LV_TRANSFORMER), 'C', "circuitAdvanced", 'M', getStack(ModBlocks.MV_TRANSFORMER), 'B', getStack(ModBlocks.LSU_STORAGE)); - registerShaped(getStack(ModBlocks.LSU_STORAGE), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C', "circuitBasic"); - registerShaped(getStack(ModBlocks.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(TRItems.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt"); - registerShaped(getStack(ModBlocks.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(ModBlocks.FUSION_COIL), 'C', "circuitMaster"); + registerShaped(getStack(TRBlocks.VACUUM_FREEZER), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', "glassReinforced", 'P', getStack(TRBlocks.EXTRACTOR)); + registerShaped(getStack(TRBlocks.DISTILLATION_TOWER), "CMC", "PBP", "EME", 'E', getStack(TRBlocks.INDUSTRIAL_ELECTROLYZER), 'M', "circuitMaster", 'B', "machineBlockElite", 'C', getStack(TRBlocks.INDUSTRIAL_CENTRIFUGE), 'P', getStack(TRBlocks.EXTRACTOR)); + registerShaped(getStack(TRBlocks.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(TRBlocks.EXTRACTOR), 'P', getStack(TRBlocks.COMPRESSOR), 'E', getStack(TRBlocks.EXTRACTOR)); + registerShaped(getStack(TRBlocks.ROLLING_MACHINE), "PCP", "MBM", "PCP", 'P', getStack(Blocks.PISTON), 'C', "circuitAdvanced", 'M', getStack(TRBlocks.COMPRESSOR), 'B', "machineBlockBasic"); + registerShaped(getStack(TRBlocks.AUTO_CRAFTING_TABLE), "MPM", "PCP", "MPM", 'M', "circuitAdvanced", 'C', "workbench", 'P', "plateIron"); + registerShaped(getStack(TRBlocks.CHARGE_O_MAT), "ETE", "COC", "EAE", 'E', "circuitMaster", 'T', "energyCrystal", 'C', "chest", 'O', getStack(TRItems.LAPOTRONIC_ORB), 'A', "machineBlockAdvanced"); + registerShaped(getStack(TRBlocks.ALLOY_SMELTER), " C ", "FMF", " ", 'C', "circuitBasic", 'F', getStack(TRBlocks.ELECTRIC_FURNACE), 'M', "machineBlockBasic"); + registerShaped(getStack(TRBlocks.INTERDIMENSIONAL_SU), "PAP", "ACA", "PAP", 'P', "plateIridiumAlloy", 'C', "chestEnder", 'A', getStack(TRBlocks.ADJUSTABLE_SU)); + registerShaped(getStack(TRBlocks.ADJUSTABLE_SU), "LLL", "LCL", "LLL", 'L', getStack(TRItems.LAPOTRONIC_ORB), 'C', "energyCrystal"); + registerShaped(getStack(TRBlocks.LAPOTRONIC_SU), " L ", "CBC", " M ", 'L', getStack(TRBlocks.LV_TRANSFORMER), 'C', "circuitAdvanced", 'M', getStack(TRBlocks.MV_TRANSFORMER), 'B', getStack(TRBlocks.LSU_STORAGE)); + registerShaped(getStack(TRBlocks.LSU_STORAGE), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C', "circuitBasic"); + registerShaped(getStack(TRBlocks.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(TRItems.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt"); + registerShaped(getStack(TRBlocks.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(TRBlocks.FUSION_COIL), 'C', "circuitMaster"); // registerShaped(getStack(ModBlocks.FUSION_COIL), "CSC", "NAN", "CRC", 'A', getStack(ModBlocks.MACHINE_CASINGS, 1, 2), 'N', getMaterial("nichromeHeatingCoil", Type.PART), 'C', "circuitMaster", 'S', "craftingSuperconductor", 'R', getMaterial("iridiumNeutronReflector", Type.PART)); - registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack()); - registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack()); - registerShaped(getStack(ModBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(ModBlocks.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(TRItems.LAPOTRONIC_ORB)); - registerShaped(getStack(ModBlocks.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'M', TRContent.Parts.DIGITAL_DISPLAY.getStack(), 'C', "circuitMaster", 'F', "machineBlockAdvanced"); - registerShaped(getStack(ModBlocks.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(ModBlocks.COMPUTER_CUBE)); - registerShaped(getStack(ModBlocks.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(ModBlocks.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(TRItems.LAPOTRONIC_ORB)); - registerShaped(getStack(ModBlocks.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(ModBlocks.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR)); + registerShaped(getStack(TRBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack()); + registerShaped(getStack(TRBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack()); + registerShaped(getStack(TRBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(TRBlocks.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(TRItems.LAPOTRONIC_ORB)); + registerShaped(getStack(TRBlocks.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'M', TRContent.Parts.DIGITAL_DISPLAY.getStack(), 'C', "circuitMaster", 'F', "machineBlockAdvanced"); + registerShaped(getStack(TRBlocks.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(TRBlocks.COMPUTER_CUBE)); + registerShaped(getStack(TRBlocks.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(TRBlocks.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(TRItems.LAPOTRONIC_ORB)); + registerShaped(getStack(TRBlocks.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(TRBlocks.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(TRBlocks.SOLID_FUEL_GENEREATOR)); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 0), "DLD", "LDL", "CGC", 'D', "dustCoal", 'L', "paneGlass", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic"); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 1), "DLD", "LDL", "CPC", 'D', "dustCoal", 'L', "blockGlass", 'C', "circuitAdvanced", 'P', getStack(ModBlocks.SOLAR_PANEL, 1, 0)); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 1), "DLD", "LDL", "CPC", 'D', "dustCoal", 'L', "blockGlass", 'C', "circuitAdvanced", 'P', "machineBlockBasic"); @@ -150,24 +150,24 @@ public class CraftingTableRecipes extends RecipeMethods { // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 4), "DLD", "LDL", "CPC", 'D', "dustDiamond", 'L', "glassReinforced", 'C', "circuitMaster", 'P', getStack(ModBlocks.SOLAR_PANEL, 1, 3)); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 4), "DLD", "LDL", "CPC", 'D', "dustDiamond", 'L', "glassReinforced", 'C', "circuitMaster", 'P', "machineBlockElite"); // registerShaped(getStack(ModBlocks.ALARM, 1, 0), "ICI", "SRS", "ICI", 'I', "ingotIron", 'C', getMaterial("copper", Type.CABLE), 'S', getMaterial("insulatedcopper", Type.CABLE), 'R', "blockRedstone" ); - registerShaped(getStack(ModBlocks.FLUID_REPLICATOR), "PCP", "CFC", "ESR", 'P', "plateTungstensteel", 'F', "machineBlockElite", 'C', "circuitMaster", 'E', getStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), 'S', "craftingSuperconductor",'R', getStack(ModBlocks.CHEMICAL_REACTOR)); + registerShaped(getStack(TRBlocks.FLUID_REPLICATOR), "PCP", "CFC", "ESR", 'P', "plateTungstensteel", 'F', "machineBlockElite", 'C', "circuitMaster", 'E', getStack(TRBlocks.INDUSTRIAL_ELECTROLYZER), 'S', "craftingSuperconductor",'R', getStack(TRBlocks.CHEMICAL_REACTOR)); // registerShaped(getStack(ModBlocks.HV_TRANSFORMER), " H ", " M ", " H ", 'M', getStack(ModBlocks.MV_TRANSFORMER), 'H', EnumCableType.IHV.getStack()); // registerShaped(getStack(ModBlocks.MV_TRANSFORMER), " G ", " M ", " G ", 'M', "machineBlockBasic", 'G', EnumCableType.IGOLD.getStack()); // registerShaped(getStack(ModBlocks.LV_TRANSFORMER), "PWP", "CCC", "PPP", 'P', "plankWood", 'C', "ingotCopper", 'W', EnumCableType.ICOPPER.getStack()); // registerShaped(getStack(ModBlocks.LOW_VOLTAGE_SU), "WCW", "BBB", "WWW", 'W', "plankWood", 'B', "reBattery", 'C', EnumCableType.ICOPPER.getStack()); // registerShaped(getStack(ModBlocks.MEDIUM_VOLTAGE_SU), "GEG", "EME", "GEG", 'M', "machineBlockBasic", 'E', "energyCrystal", 'G', EnumCableType.IGOLD.getStack()); // registerShaped(getStack(ModBlocks.HIGH_VOLTAGE_SU), "LAL", "LML", "LOL", 'A', "circuitAdvanced", 'L', "lapotronCrystal", 'M', getStack(ModBlocks.MEDIUM_VOLTAGE_SU), 'O', "machineBlockAdvanced"); - registerShaped(getStack(ModBlocks.COMPRESSOR), "S S", "SCS", "SMS", 'C', "circuitBasic", 'M', "machineBlockBasic", 'S', "stone"); - registerShaped(getStack(ModBlocks.ELECTRIC_FURNACE), " C ", "RFR", " ", 'C', "circuitBasic", 'F', getStack(ModBlocks.IRON_FURNACE), 'R', "dustRedstone"); - registerShaped(getStack(ModBlocks.RECYCLER), " E ", "DCD", "GDG", 'D', "dirt", 'C', getStack(ModBlocks.COMPRESSOR), 'G', "dustGlowstone", 'E', "circuitBasic"); - registerShaped(getStack(ModBlocks.IRON_FURNACE), "III", "I I", "III", 'I', "ingotIron"); - registerShaped(getStack(ModBlocks.IRON_FURNACE), " I ", "I I", "IFI", 'I', "ingotIron", 'F', getStack(Blocks.FURNACE)); - registerShaped(getStack(ModBlocks.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(TRItems.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic"); - registerShaped(getStack(ModBlocks.GRINDER), "FFF", "SMS", " C ", 'F', Items.FLINT, 'S', getStack(Blocks.COBBLESTONE), 'M', "machineBlockBasic", 'C', "circuitBasic"); - registerShaped(getStack(ModBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack(), 'A', "machineBlockElite", 'Q', getStack(ModBlocks.DIGITAL_CHEST), 'T', getStack(ModBlocks.COMPRESSOR)); - registerShaped(getStack(ModBlocks.QUANTUM_TANK), "EPE", "PCP", "EPE", 'P', "platePlatinum", 'E', "circuitAdvanced", 'C', getStack(ModBlocks.QUANTUM_CHEST)); - registerShaped(getStack(ModBlocks.LAMP_INCANDESCENT), "GGG", "TCT", "GGG", 'G', "paneGlass", 'T', getMaterial("copper", Type.CABLE), 'C', TRContent.Parts.CARBON_FIBER.getStack()); - registerShaped(getStack(ModBlocks.LAMP_LED), "GGG", "TLT", "GGG", 'G', "paneGlass", 'T', getMaterial("tin", Type.CABLE), 'L', "dustGlowstone"); + registerShaped(getStack(TRBlocks.COMPRESSOR), "S S", "SCS", "SMS", 'C', "circuitBasic", 'M', "machineBlockBasic", 'S', "stone"); + registerShaped(getStack(TRBlocks.ELECTRIC_FURNACE), " C ", "RFR", " ", 'C', "circuitBasic", 'F', getStack(TRBlocks.IRON_FURNACE), 'R', "dustRedstone"); + registerShaped(getStack(TRBlocks.RECYCLER), " E ", "DCD", "GDG", 'D', "dirt", 'C', getStack(TRBlocks.COMPRESSOR), 'G', "dustGlowstone", 'E', "circuitBasic"); + registerShaped(getStack(TRBlocks.IRON_FURNACE), "III", "I I", "III", 'I', "ingotIron"); + registerShaped(getStack(TRBlocks.IRON_FURNACE), " I ", "I I", "IFI", 'I', "ingotIron", 'F', getStack(Blocks.FURNACE)); + registerShaped(getStack(TRBlocks.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(TRItems.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic"); + registerShaped(getStack(TRBlocks.GRINDER), "FFF", "SMS", " C ", 'F', Items.FLINT, 'S', getStack(Blocks.COBBLESTONE), 'M', "machineBlockBasic", 'C', "circuitBasic"); + registerShaped(getStack(TRBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack(), 'A', "machineBlockElite", 'Q', getStack(TRBlocks.DIGITAL_CHEST), 'T', getStack(TRBlocks.COMPRESSOR)); + registerShaped(getStack(TRBlocks.QUANTUM_TANK), "EPE", "PCP", "EPE", 'P', "platePlatinum", 'E', "circuitAdvanced", 'C', getStack(TRBlocks.QUANTUM_CHEST)); + registerShaped(getStack(TRBlocks.LAMP_INCANDESCENT), "GGG", "TCT", "GGG", 'G', "paneGlass", 'T', getMaterial("copper", Type.CABLE), 'C', TRContent.Parts.CARBON_FIBER.getStack()); + registerShaped(getStack(TRBlocks.LAMP_LED), "GGG", "TLT", "GGG", 'G', "paneGlass", 'T', getMaterial("tin", Type.CABLE), 'L', "dustGlowstone"); // Machine Frames @@ -280,8 +280,8 @@ public class CraftingTableRecipes extends RecipeMethods { // } // } - registerShaped(new ItemStack(ModBlocks.RUBBER_LOG_SLAB_HALF), "WWW", 'W', new ItemStack(ModBlocks.RUBBER_PLANKS)); - registerShaped(new ItemStack(ModBlocks.RUBBER_LOG_STAIR), "W ", "WW ", "WWW", 'W', new ItemStack(ModBlocks.RUBBER_PLANKS)); + registerShaped(new ItemStack(TRBlocks.RUBBER_LOG_SLAB_HALF), "WWW", 'W', new ItemStack(TRBlocks.RUBBER_PLANKS)); + registerShaped(new ItemStack(TRBlocks.RUBBER_LOG_STAIR), "W ", "WW ", "WWW", 'W', new ItemStack(TRBlocks.RUBBER_PLANKS)); RebornCraftingHelper.addShapelessOreRecipe(new ItemStack(TRItems.MANUAL), "ingotRefinedIron", Items.BOOK); diff --git a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java index abbbabdf6..7c8f6d6f0 100644 --- a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java +++ b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java @@ -32,7 +32,7 @@ import net.minecraft.item.ItemStack; import reborncore.api.recipe.RecipeHandler; import techreborn.api.Reference; import techreborn.api.recipe.machines.ScrapboxRecipe; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.items.DynamicCell; import techreborn.utils.StackWIPHandler; @@ -185,7 +185,7 @@ public class ScrapboxRecipes extends RecipeMethods { register(getStack(Blocks.LEAVES2, 1, 0)); register(getStack(Blocks.LEAVES2, 1, 1)); - register(getStack(ModBlocks.RUBBER_SAPLING)); + register(getStack(TRBlocks.RUBBER_SAPLING)); // for (String i : ItemDusts.types) { // register(ItemDusts.getDustByName(i)); diff --git a/src/main/java/techreborn/itemblocks/ItemBlockAdjustableSU.java b/src/main/java/techreborn/itemblocks/ItemBlockAdjustableSU.java index 66e48e202..acd32ba45 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockAdjustableSU.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockAdjustableSU.java @@ -40,7 +40,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.common.powerSystem.PowerSystem; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.storage.TileAdjustableSU; import java.util.List; @@ -85,7 +85,7 @@ public class ItemBlockAdjustableSU extends ItemBlock { public ItemStack getDropWithNBT(double energy) { NBTTagCompound tileEntity = new NBTTagCompound(); - ItemStack dropStack = new ItemStack(ModBlocks.ADJUSTABLE_SU, 1); + ItemStack dropStack = new ItemStack(TRBlocks.ADJUSTABLE_SU, 1); writeToNBTWithoutCoords(tileEntity, energy); dropStack.setTagCompound(new NBTTagCompound()); dropStack.getTagCompound().setTag("tileEntity", tileEntity); diff --git a/src/main/java/techreborn/itemblocks/ItemBlockPlayerDetector.java b/src/main/java/techreborn/itemblocks/ItemBlockPlayerDetector.java index 247e9b585..431265ca8 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockPlayerDetector.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockPlayerDetector.java @@ -27,10 +27,10 @@ package techreborn.itemblocks; import net.minecraft.block.Block; import reborncore.common.itemblock.ItemBlockBase; import techreborn.blocks.tier1.BlockPlayerDetector; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; public class ItemBlockPlayerDetector extends ItemBlockBase { public ItemBlockPlayerDetector(Block block) { - super(ModBlocks.PLAYER_DETECTOR, ModBlocks.PLAYER_DETECTOR, BlockPlayerDetector.types); + super(TRBlocks.PLAYER_DETECTOR, TRBlocks.PLAYER_DETECTOR, BlockPlayerDetector.types); } } diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index 08036fbd9..8832004ce 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -55,7 +55,7 @@ import techreborn.client.render.entitys.RenderNukePrimed; import techreborn.entities.EntityNukePrimed; import techreborn.events.FluidBlockModelHandler; import techreborn.events.StackToolTipEvent; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.items.ItemFrequencyTransmitter; public class ClientProxy extends CommonProxy { @@ -86,7 +86,7 @@ public class ClientProxy extends CommonProxy { // TODO FIX ME ClientRegistry.registerKeyBinding(KeyBindings.config); StateMap rubberLeavesStateMap = new StateMap.Builder().ignore(BlockRubberLeaves.CHECK_DECAY, BlockRubberLeaves.DECAYABLE).build(); - ModelLoader.setCustomStateMapper(ModBlocks.RUBBER_LEAVES, rubberLeavesStateMap); + ModelLoader.setCustomStateMapper(TRBlocks.RUBBER_LEAVES, rubberLeavesStateMap); } @Override diff --git a/src/main/java/techreborn/tiles/TileAlarm.java b/src/main/java/techreborn/tiles/TileAlarm.java index 05684ab18..b4e52ea45 100644 --- a/src/main/java/techreborn/tiles/TileAlarm.java +++ b/src/main/java/techreborn/tiles/TileAlarm.java @@ -39,7 +39,7 @@ import net.minecraft.world.World; import reborncore.api.IToolDrop; import reborncore.common.util.ChatUtils; import techreborn.blocks.BlockAlarm; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.init.ModSounds; import techreborn.utils.MessageIDs; @@ -106,6 +106,6 @@ public class TileAlarm extends TileEntity // IToolDrop @Override public ItemStack getToolDrop(final EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.ALARM, 1); + return new ItemStack(TRBlocks.ALARM, 1); } } diff --git a/src/main/java/techreborn/tiles/TileChargeOMat.java b/src/main/java/techreborn/tiles/TileChargeOMat.java index a20c6bb3e..f2da606fe 100644 --- a/src/main/java/techreborn/tiles/TileChargeOMat.java +++ b/src/main/java/techreborn/tiles/TileChargeOMat.java @@ -40,7 +40,7 @@ import techreborn.TechReborn; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; @RebornRegister(modID = TechReborn.MOD_ID) public class TileChargeOMat extends TilePowerAcceptor @@ -114,7 +114,7 @@ public class TileChargeOMat extends TilePowerAcceptor // IToolDrop @Override public ItemStack getToolDrop(final EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.CHARGE_O_MAT, 1); + return new ItemStack(TRBlocks.CHARGE_O_MAT, 1); } // ItemHandlerProvider diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/TileChunkLoader.java index 8202c3105..435bd3ca6 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/TileChunkLoader.java @@ -37,7 +37,7 @@ import techreborn.TechReborn; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; @RebornRegister(modID = TechReborn.MOD_ID) public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider, IContainerProvider { @@ -60,7 +60,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, Ite @Override public ItemStack getToolDrop(final EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.CHUNK_LOADER, 1); + return new ItemStack(TRBlocks.CHUNK_LOADER, 1); } public boolean isComplete() { diff --git a/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java b/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java index 5de0d213b..08120b8d2 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java @@ -36,7 +36,7 @@ import techreborn.api.Reference; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.items.DynamicCell; import java.util.List; @@ -50,7 +50,7 @@ public class TileIndustrialCentrifuge extends TileGenericMachine implements ICon public static int maxEnergy = 10_000; public TileIndustrialCentrifuge() { - super("IndustrialCentrifuge", maxInput, maxEnergy, ModBlocks.INDUSTRIAL_CENTRIFUGE, 6); + super("IndustrialCentrifuge", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_CENTRIFUGE, 6); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] { 2, 3, 4, 5 }; this.inventory = new Inventory<>(7, "TileIndustrialCentrifuge", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 992dd4234..c77a7b2a2 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -38,7 +38,7 @@ import techreborn.TechReborn; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.init.TRContent; import techreborn.init.TRItems; @@ -198,7 +198,7 @@ public class TileMatterFabricator extends TilePowerAcceptor // IToolDrop @Override public ItemStack getToolDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.MATTER_FABRICATOR, 1); + return new ItemStack(TRBlocks.MATTER_FABRICATOR, 1); } // ItemHandlerProvider diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index bd877d997..20e82209c 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -42,7 +42,7 @@ import techreborn.TechReborn; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import javax.annotation.Nullable; import java.util.List; @@ -68,7 +68,7 @@ public class TileQuantumTank extends TileMachineBase public ItemStack getDropWithNBT() { final NBTTagCompound tileEntity = new NBTTagCompound(); - final ItemStack dropStack = new ItemStack(ModBlocks.QUANTUM_TANK, 1); + final ItemStack dropStack = new ItemStack(TRBlocks.QUANTUM_TANK, 1); this.writeToNBTWithoutCoords(tileEntity); dropStack.setTagCompound(new NBTTagCompound()); dropStack.getTagCompound().setTag("tileEntity", tileEntity); diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java index 81d52af9c..e3211db2f 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java @@ -44,7 +44,7 @@ import techreborn.api.reactor.FusionReactorRecipeHelper; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import java.util.List; @@ -105,7 +105,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor * @return boolean Returns true if block is fusion coil */ public boolean isCoil(BlockPos pos) { - return world.getBlockState(pos).getBlock() == ModBlocks.FUSION_COIL; + return world.getBlockState(pos).getBlock() == TRBlocks.FUSION_COIL; } /** @@ -359,7 +359,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor // IToolDrop @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(ModBlocks.FUSION_CONTROL_COMPUTER, 1); + return new ItemStack(TRBlocks.FUSION_CONTROL_COMPUTER, 1); } // ItemHandlerProvider diff --git a/src/main/java/techreborn/tiles/generator/TileLightningRod.java b/src/main/java/techreborn/tiles/generator/TileLightningRod.java index a6ae55919..a501a2853 100644 --- a/src/main/java/techreborn/tiles/generator/TileLightningRod.java +++ b/src/main/java/techreborn/tiles/generator/TileLightningRod.java @@ -37,7 +37,7 @@ import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.impl.ConfigRegistry; import techreborn.TechReborn; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; @RebornRegister(modID = TechReborn.MOD_ID) public class TileLightningRod extends TilePowerAcceptor implements IToolDrop { @@ -145,6 +145,6 @@ public class TileLightningRod extends TilePowerAcceptor implements IToolDrop { @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(ModBlocks.LIGHTNING_ROD); + return new ItemStack(TRBlocks.LIGHTNING_ROD); } } diff --git a/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java b/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java index 1c17a0307..263d57cb7 100644 --- a/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java @@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; @RebornRegister(modID = TechReborn.MOD_ID) public class TilePlasmaGenerator extends TileBaseFluidGenerator implements IContainerProvider { @@ -53,7 +53,7 @@ public class TilePlasmaGenerator extends TileBaseFluidGenerator implements ICont @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(ModBlocks.PLASMA_GENERATOR, 1); + return new ItemStack(TRBlocks.PLASMA_GENERATOR, 1); } @Override diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java index a52d7d6b9..237a27d9b 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java @@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.generator.TileBaseFluidGenerator; @RebornRegister(modID = TechReborn.MOD_ID) @@ -54,7 +54,7 @@ public class TileDieselGenerator extends TileBaseFluidGenerator implements ICont @Override public ItemStack getToolDrop(final EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.DIESEL_GENERATOR, 1); + return new ItemStack(TRBlocks.DIESEL_GENERATOR, 1); } @Override diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java b/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java index ba95fc769..787f9ae93 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java @@ -37,7 +37,7 @@ import reborncore.common.registration.RebornRegister; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; @RebornRegister(modID = TechReborn.MOD_ID) public class TileDragonEggSyphon extends TilePowerAcceptor @@ -116,7 +116,7 @@ public class TileDragonEggSyphon extends TilePowerAcceptor // IToolDrop @Override public ItemStack getToolDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.DRAGON_EGG_SYPHON, 1); + return new ItemStack(TRBlocks.DRAGON_EGG_SYPHON, 1); } // ItemHandlerProvider diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java index 7b5265beb..d1f2df5e9 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java @@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.generator.TileBaseFluidGenerator; @RebornRegister(modID = TechReborn.MOD_ID) @@ -54,7 +54,7 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer @Override public ItemStack getToolDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.GAS_TURBINE, 1); + return new ItemStack(TRBlocks.GAS_TURBINE, 1); } @Override diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java index 67e122f24..eed2031af 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java @@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.generator.TileBaseFluidGenerator; @RebornRegister(modID = TechReborn.MOD_ID) @@ -54,7 +54,7 @@ public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IC @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR, 1); + return new ItemStack(TRBlocks.SEMI_FLUID_GENERATOR, 1); } @Override diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java index 43d8f399f..0a2e0c925 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java @@ -33,7 +33,7 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.generator.TileBaseFluidGenerator; @RebornRegister(modID = TechReborn.MOD_ID) @@ -54,7 +54,7 @@ public class TileThermalGenerator extends TileBaseFluidGenerator implements ICon @Override public ItemStack getToolDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.THERMAL_GENERATOR, 1); + return new ItemStack(TRBlocks.THERMAL_GENERATOR, 1); } @Override diff --git a/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java b/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java index 5655d7b3b..5d9414a06 100644 --- a/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java +++ b/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java @@ -42,7 +42,7 @@ import techreborn.TechReborn; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; @RebornRegister(modID = TechReborn.MOD_ID) public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider, IContainerProvider { @@ -147,7 +147,7 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDr @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR); + return new ItemStack(TRBlocks.SOLID_FUEL_GENEREATOR); } @Override diff --git a/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java b/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java index e346b571a..3dbd06585 100644 --- a/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java +++ b/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java @@ -34,7 +34,7 @@ import reborncore.common.registration.RebornRegister; import reborncore.common.registration.impl.ConfigRegistry; import techreborn.TechReborn; import techreborn.blocks.generator.BlockWindMill; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; /** * Created by modmuss50 on 25/02/2016. @@ -107,6 +107,6 @@ public class TileWaterMill extends TilePowerAcceptor implements IToolDrop { @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(ModBlocks.WATER_MILL); + return new ItemStack(TRBlocks.WATER_MILL); } } diff --git a/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java b/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java index a9b4b9de2..e991e818c 100644 --- a/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java +++ b/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java @@ -32,7 +32,7 @@ import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.impl.ConfigRegistry; import techreborn.TechReborn; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; /** * Created by modmuss50 on 25/02/2016. @@ -95,6 +95,6 @@ public class TileWindMill extends TilePowerAcceptor implements IToolDrop { @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(ModBlocks.WIND_MILL); + return new ItemStack(TRBlocks.WIND_MILL); } } diff --git a/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java b/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java index 88fe79885..2332477b6 100644 --- a/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java @@ -46,7 +46,7 @@ import techreborn.api.recipe.machines.AlloySmelterRecipe; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; @RebornRegister(modID = TechReborn.MOD_ID) public class TileIronAlloyFurnace extends TileMachineBase @@ -297,7 +297,7 @@ public class TileIronAlloyFurnace extends TileMachineBase @Override public ItemStack getToolDrop(final EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.IRON_ALLOY_FURNACE, 1); + return new ItemStack(TRBlocks.IRON_ALLOY_FURNACE, 1); } public boolean isComplete() { diff --git a/src/main/java/techreborn/tiles/machine/multiblock/MultiblockChecker.java b/src/main/java/techreborn/tiles/machine/multiblock/MultiblockChecker.java index 7a29c24b3..ad0e30b33 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/MultiblockChecker.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/MultiblockChecker.java @@ -28,7 +28,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import techreborn.init.ModBlocks; +import techreborn.init.TRContent; public class MultiblockChecker { @@ -50,16 +50,16 @@ public class MultiblockChecker { // TODO: make thid not so ugly public boolean checkCasing(int offX, int offY, int offZ, String type) { Block block = getBlock(offX, offY, offZ).getBlock(); - if (block == ModBlocks.MACHINE_CASINGS_STANDARD || block == ModBlocks.MACHINE_CASINGS_REINFORCED || block == ModBlocks.MACHINE_CASINGS_ADVANCED ) { + if (block == TRContent.MachineBlocks.BASIC.getCasing()|| block == TRContent.MachineBlocks.ADVANCED.getCasing() || block == TRContent.MachineBlocks.INDUSTRIAL.getCasing() ) { if (type == MultiblockChecker.CASING_ANY) { return true; - } else if ( type == "standard" && block == ModBlocks.MACHINE_CASINGS_STANDARD) { + } else if ( type == "standard" && block == TRContent.MachineBlocks.BASIC.getCasing()) { return true; } - else if (type == "reinforced" && block == ModBlocks.MACHINE_CASINGS_REINFORCED) { + else if (type == "reinforced" && block == TRContent.MachineBlocks.ADVANCED.getCasing()) { return true; } - else if (type == "advanced" && block == ModBlocks.MACHINE_CASINGS_ADVANCED) { + else if (type == "advanced" && block == TRContent.MachineBlocks.INDUSTRIAL.getCasing()) { return true; } } diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java b/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java index 8c2d69d12..38d4aa056 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java @@ -36,7 +36,7 @@ import techreborn.api.Reference; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.TileGenericMachine; @RebornRegister(modID = TechReborn.MOD_ID) @@ -50,7 +50,7 @@ public class TileDistillationTower extends TileGenericMachine implements IContai public MultiblockChecker multiblockChecker; public TileDistillationTower() { - super("DistillationTower", maxInput, maxEnergy, ModBlocks.DISTILLATION_TOWER, 6); + super("DistillationTower", maxInput, maxEnergy, TRBlocks.DISTILLATION_TOWER, 6); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] { 2, 3, 4, 5 }; this.inventory = new Inventory<>(7, "TileDistillationTower", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java b/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java index c34f19aee..7cafd5e2d 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java @@ -39,7 +39,7 @@ import techreborn.api.fluidreplicator.FluidReplicatorRecipeCrafter; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.init.TRContent; import techreborn.tiles.TileGenericMachine; @@ -64,7 +64,7 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine int ticksSinceLastChange; public TileFluidReplicator() { - super("FluidReplicator", maxInput, maxEnergy, ModBlocks.FLUID_REPLICATOR, 3); + super("FluidReplicator", maxInput, maxEnergy, TRBlocks.FLUID_REPLICATOR, 3); final int[] inputs = new int[] { 0 }; this.inventory = new Inventory<>(4, "TileFluidReplicator", 64, this, getInventoryAccess()); this.crafter = new FluidReplicatorRecipeCrafter(this, this.inventory, inputs, null); diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java index 9433a438a..84c871b04 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java @@ -35,7 +35,7 @@ import techreborn.api.Reference; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.TileGenericMachine; @RebornRegister(modID = TechReborn.MOD_ID) @@ -49,7 +49,7 @@ public class TileImplosionCompressor extends TileGenericMachine implements ICont public MultiblockChecker multiblockChecker; public TileImplosionCompressor() { - super("ImplosionCompressor", maxInput, maxEnergy, ModBlocks.IMPLOSION_COMPRESSOR, 4); + super("ImplosionCompressor", maxInput, maxEnergy, TRBlocks.IMPLOSION_COMPRESSOR, 4); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] { 2, 3 }; this.inventory = new Inventory<>(5, "TileImplosionCompressor", 64, this); diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java index 058437f0c..bd1b84e47 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java @@ -44,7 +44,7 @@ import techreborn.blocks.BlockMachineCasing; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.multiblocks.MultiBlockCasing; import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileMachineCasing; @@ -61,7 +61,7 @@ public class TileIndustrialBlastFurnace extends TileGenericMachine implements IC private int cachedHeat; public TileIndustrialBlastFurnace() { - super("IndustrialBlastFurnace", maxInput, maxEnergy, ModBlocks.INDUSTRIAL_BLAST_FURNACE, 4); + super("IndustrialBlastFurnace", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_BLAST_FURNACE, 4); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] { 2, 3 }; this.inventory = new Inventory<>(5, "TileIndustrialBlastFurnace", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java index 36a689758..2b509101f 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java @@ -48,7 +48,7 @@ import techreborn.api.recipe.machines.IndustrialGrinderRecipe; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.TileGenericMachine; import javax.annotation.Nullable; @@ -67,7 +67,7 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai int ticksSinceLastChange; public TileIndustrialGrinder() { - super("IndustrialGrinder", maxInput, maxEnergy, ModBlocks.INDUSTRIAL_GRINDER, 7); + super("IndustrialGrinder", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_GRINDER, 7); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] {2, 3, 4, 5}; this.inventory = new Inventory<>(8, "TileIndustrialGrinder", 64, this, getInventoryAccess()); diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java index deee231e1..5fbb2bf37 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java @@ -48,7 +48,7 @@ import techreborn.api.recipe.machines.IndustrialSawmillRecipe; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.TileGenericMachine; import javax.annotation.Nullable; @@ -66,7 +66,7 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai int ticksSinceLastChange; public TileIndustrialSawmill() { - super("IndustrialSawmill", maxInput, maxEnergy, ModBlocks.INDUSTRIAL_SAWMILL, 6); + super("IndustrialSawmill", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_SAWMILL, 6); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] { 2, 3, 4 }; this.inventory = new Inventory<>(7, "TileSawmill", 64, this, getInventoryAccess()); diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java index 79ad10de3..d68ec7c55 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java @@ -34,7 +34,7 @@ import techreborn.api.Reference; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.TileGenericMachine; @RebornRegister(modID = TechReborn.MOD_ID) @@ -48,7 +48,7 @@ public class TileVacuumFreezer extends TileGenericMachine implements IContainerP public MultiblockChecker multiblockChecker; public TileVacuumFreezer() { - super("VacuumFreezer", maxInput, maxEnergy, ModBlocks.VACUUM_FREEZER, 2); + super("VacuumFreezer", maxInput, maxEnergy, TRBlocks.VACUUM_FREEZER, 2); final int[] inputs = new int[] { 0 }; final int[] outputs = new int[] { 1 }; this.inventory = new Inventory<>(3, "TileVacuumFreezer", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java b/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java index 4f84e8058..7e62e6685 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java @@ -37,7 +37,7 @@ import techreborn.api.recipe.machines.AlloySmelterRecipe; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.TileGenericMachine; @RebornRegister(modID = TechReborn.MOD_ID) @@ -49,7 +49,7 @@ public class TileAlloySmelter extends TileGenericMachine implements IContainerPr public static int maxEnergy = 1_000; public TileAlloySmelter() { - super("AlloySmelter", maxInput, maxEnergy, ModBlocks.ALLOY_SMELTER, 3); + super("AlloySmelter", maxInput, maxEnergy, TRBlocks.ALLOY_SMELTER, 3); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] { 2 }; this.inventory = new Inventory<>(4, "TileAlloySmelter", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java index 447925cce..eb4bb0335 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java @@ -34,7 +34,7 @@ import techreborn.api.Reference; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.TileGenericMachine; @RebornRegister(modID = TechReborn.MOD_ID) @@ -46,7 +46,7 @@ public class TileAssemblingMachine extends TileGenericMachine implements IContai public static int maxEnergy = 10_000; public TileAssemblingMachine() { - super("AssemblingMachine", maxInput, maxEnergy, ModBlocks.ASSEMBLY_MACHINE, 3); + super("AssemblingMachine", maxInput, maxEnergy, TRBlocks.ASSEMBLY_MACHINE, 3); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] { 2 }; this.inventory = new Inventory<>(4, "TileAssemblingMachine", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java b/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java index 4049d5755..31e26415c 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java @@ -48,7 +48,7 @@ import techreborn.TechReborn; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.init.ModSounds; import javax.annotation.Nullable; @@ -425,7 +425,7 @@ public class TileAutoCraftingTable extends TilePowerAcceptor // IToolDrop @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(ModBlocks.AUTO_CRAFTING_TABLE, 1); + return new ItemStack(TRBlocks.AUTO_CRAFTING_TABLE, 1); } // ItemHandlerProvider diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java b/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java index a345d1b04..cecacf9e4 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java @@ -34,7 +34,7 @@ import techreborn.api.Reference; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.TileGenericMachine; @RebornRegister(modID = TechReborn.MOD_ID) @@ -46,7 +46,7 @@ public class TileChemicalReactor extends TileGenericMachine implements IContaine public static int maxEnergy = 10_000; public TileChemicalReactor() { - super("ChemicalReactor", maxInput, maxEnergy, ModBlocks.CHEMICAL_REACTOR, 3); + super("ChemicalReactor", maxInput, maxEnergy, TRBlocks.CHEMICAL_REACTOR, 3); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] { 2 }; this.inventory = new Inventory<>(4, "TileChemicalReactor", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java b/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java index 8b3ba77b0..58ad876ac 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java @@ -34,7 +34,7 @@ import techreborn.api.Reference; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.TileGenericMachine; @RebornRegister(modID = TechReborn.MOD_ID) @@ -46,7 +46,7 @@ public class TileCompressor extends TileGenericMachine implements IContainerProv public static int maxEnergy = 1000; public TileCompressor() { - super("Compressor", maxInput, maxEnergy, ModBlocks.COMPRESSOR, 2); + super("Compressor", maxInput, maxEnergy, TRBlocks.COMPRESSOR, 2); final int[] inputs = new int[] { 0 }; final int[] outputs = new int[] { 1 }; this.inventory = new Inventory<>(3, "TileCompressor", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java index 741291748..4bde038bd 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java @@ -40,7 +40,7 @@ import techreborn.TechReborn; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; @RebornRegister(modID = TechReborn.MOD_ID) public class TileElectricFurnace extends TilePowerAcceptor @@ -204,7 +204,7 @@ public class TileElectricFurnace extends TilePowerAcceptor // IToolDrop @Override public ItemStack getToolDrop(final EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.ELECTRIC_FURNACE, 1); + return new ItemStack(TRBlocks.ELECTRIC_FURNACE, 1); } // ItemHandlerProvider diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java b/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java index 08524f79b..cf37b0dd6 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java @@ -34,7 +34,7 @@ import techreborn.api.Reference; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.TileGenericMachine; @RebornRegister(modID = TechReborn.MOD_ID) @@ -46,7 +46,7 @@ public class TileExtractor extends TileGenericMachine implements IContainerProvi public static int maxEnergy = 1_000; public TileExtractor() { - super("Extractor", maxInput, maxEnergy, ModBlocks.EXTRACTOR, 2); + super("Extractor", maxInput, maxEnergy, TRBlocks.EXTRACTOR, 2); final int[] inputs = new int[] { 0 }; final int[] outputs = new int[] { 1 }; this.inventory = new Inventory<>(3, "TileExtractor", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java b/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java index 42c04dc9f..91cb8b2f1 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java @@ -34,7 +34,7 @@ import techreborn.api.Reference; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.TileGenericMachine; @RebornRegister(modID = TechReborn.MOD_ID) @@ -46,7 +46,7 @@ public class TileGrinder extends TileGenericMachine implements IContainerProvide public static int maxEnergy = 1_000; public TileGrinder() { - super("Grinder", maxInput, maxEnergy, ModBlocks.GRINDER, 2); + super("Grinder", maxInput, maxEnergy, TRBlocks.GRINDER, 2); final int[] inputs = new int[] { 0 }; final int[] outputs = new int[] { 1 }; this.inventory = new Inventory<>(3, "TileGrinder", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java index ef4e5c72b..373124307 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java @@ -35,7 +35,7 @@ import techreborn.api.Reference; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.items.DynamicCell; import techreborn.tiles.TileGenericMachine; @@ -48,7 +48,7 @@ public class TileIndustrialElectrolyzer extends TileGenericMachine implements IC public static int maxEnergy = 10_000; public TileIndustrialElectrolyzer() { - super("IndustrialElectrolyzer", maxInput, maxEnergy, ModBlocks.INDUSTRIAL_ELECTROLYZER, 6); + super("IndustrialElectrolyzer", maxInput, maxEnergy, TRBlocks.INDUSTRIAL_ELECTROLYZER, 6); final int[] inputs = new int[] { 0, 1 }; final int[] outputs = new int[] { 2, 3, 4, 5 }; this.inventory = new Inventory<>(7, "TileIndustrialElectrolyzer", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java b/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java index 0403cb7e1..75b89b157 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java @@ -35,7 +35,7 @@ import reborncore.common.registration.RebornRegister; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.WorldUtils; import techreborn.TechReborn; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import java.util.Iterator; @@ -138,6 +138,6 @@ public class TilePlayerDectector extends TilePowerAcceptor implements IToolDrop // IToolDrop @Override public ItemStack getToolDrop(EntityPlayer p0) { - return new ItemStack(ModBlocks.PLAYER_DETECTOR, 1, 0); + return new ItemStack(TRBlocks.PLAYER_DETECTOR, 1, 0); } } diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java b/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java index 8e2e3699e..d841cc6dd 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java @@ -39,7 +39,7 @@ import techreborn.TechReborn; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.init.TRContent; @RebornRegister(modID = TechReborn.MOD_ID) @@ -188,7 +188,7 @@ public class TileRecycler extends TilePowerAcceptor // IToolDrop @Override public ItemStack getToolDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.RECYCLER, 1); + return new ItemStack(TRBlocks.RECYCLER, 1); } // ItemHandlerProvider diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java b/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java index 5216d00b1..b27226e5b 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java @@ -45,7 +45,7 @@ import techreborn.api.RollingMachineRecipe; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import javax.annotation.Nonnull; import java.util.ArrayList; @@ -274,7 +274,7 @@ public class TileRollingMachine extends TilePowerAcceptor @Override public ItemStack getToolDrop(final EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.ROLLING_MACHINE, 1); + return new ItemStack(TRBlocks.ROLLING_MACHINE, 1); } @Override diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java b/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java index 92053cf2e..5643439a8 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java @@ -33,7 +33,7 @@ import techreborn.api.recipe.ScrapboxRecipeCrafter; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.init.TRItems; import techreborn.tiles.TileGenericMachine; @@ -46,7 +46,7 @@ public class TileScrapboxinator extends TileGenericMachine implements IContainer public static int maxEnergy = 1_000; public TileScrapboxinator() { - super("Scrapboxinator", maxInput, maxEnergy, ModBlocks.SCRAPBOXINATOR, 2); + super("Scrapboxinator", maxInput, maxEnergy, TRBlocks.SCRAPBOXINATOR, 2); final int[] inputs = new int[] { 0 }; final int[] outputs = new int[] { 1 }; this.inventory = new Inventory<>(3, "TileScrapboxinator", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java b/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java index cc709273b..7b222eb61 100644 --- a/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java +++ b/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java @@ -35,7 +35,7 @@ import techreborn.TechReborn; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; @RebornRegister(modID = TechReborn.MOD_ID) public class TileAdjustableSU extends TileEnergyStorage implements IContainerProvider { @@ -51,7 +51,7 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro private int OUTPUT = 64; // The current output public TileAdjustableSU() { - super("ADJUSTABLE_SU", 4, ModBlocks.ADJUSTABLE_SU, EnumPowerTier.INSANE, maxInput, maxOutput, maxEnergy); + super("ADJUSTABLE_SU", 4, TRBlocks.ADJUSTABLE_SU, EnumPowerTier.INSANE, maxInput, maxOutput, maxEnergy); } public void handleGuiInputFromClient(int id) { @@ -77,7 +77,7 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro public ItemStack getDropWithNBT() { NBTTagCompound tileEntity = new NBTTagCompound(); - ItemStack dropStack = new ItemStack(ModBlocks.ADJUSTABLE_SU, 1); + ItemStack dropStack = new ItemStack(TRBlocks.ADJUSTABLE_SU, 1); writeToNBTWithoutCoords(tileEntity); dropStack.setTagCompound(new NBTTagCompound()); dropStack.getTagCompound().setTag("tileEntity", tileEntity); diff --git a/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java b/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java index 45c3aab15..939cdf140 100644 --- a/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java +++ b/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java @@ -29,7 +29,7 @@ import reborncore.api.power.EnumPowerTier; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; /** * Created by modmuss50 on 14/03/2016. @@ -41,7 +41,7 @@ public class TileHighVoltageSU extends TileEnergyStorage implements IContainerPr * MFSU should store 40M FE with 2048 FE/t I/O */ public TileHighVoltageSU() { - super("HIGH_VOLTAGE_SU", 2, ModBlocks.HIGH_VOLTAGE_SU, EnumPowerTier.HIGH, 512, 512, 10_000_000); + super("HIGH_VOLTAGE_SU", 2, TRBlocks.HIGH_VOLTAGE_SU, EnumPowerTier.HIGH, 512, 512, 10_000_000); } @Override diff --git a/src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java b/src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java index e1077cea7..bfecbce3c 100644 --- a/src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java +++ b/src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java @@ -29,7 +29,7 @@ import reborncore.api.power.EnumPowerTier; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; /** * Created by modmuss50 on 14/03/2016. @@ -37,7 +37,7 @@ import techreborn.init.ModBlocks; public class TileLowVoltageSU extends TileEnergyStorage implements IContainerProvider { public TileLowVoltageSU() { - super("BatBox", 2, ModBlocks.LOW_VOLTAGE_SU, EnumPowerTier.LOW, 32, 32, 40000); + super("BatBox", 2, TRBlocks.LOW_VOLTAGE_SU, EnumPowerTier.LOW, 32, 32, 40000); } @Override diff --git a/src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java b/src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java index 4a6a01591..04c2c3eb0 100644 --- a/src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java +++ b/src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java @@ -29,7 +29,7 @@ import reborncore.api.power.EnumPowerTier; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; /** * Created by modmuss50 on 14/03/2016. @@ -41,7 +41,7 @@ public class TileMediumVoltageSU extends TileEnergyStorage implements IContainer * MFE should store 1.2M FE with 512 FE/t I/O */ public TileMediumVoltageSU() { - super("MEDIUM_VOLTAGE_SU", 2, ModBlocks.MEDIUM_VOLTAGE_SU, EnumPowerTier.MEDIUM, 128, 128, 300000); + super("MEDIUM_VOLTAGE_SU", 2, TRBlocks.MEDIUM_VOLTAGE_SU, EnumPowerTier.MEDIUM, 128, 128, 300000); } @Override diff --git a/src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java b/src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java index b2111bd34..43a057823 100644 --- a/src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java +++ b/src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java @@ -34,7 +34,7 @@ import techreborn.TechReborn; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.storage.TileEnergyStorage; @RebornRegister(modID = TechReborn.MOD_ID) @@ -50,7 +50,7 @@ public class TileInterdimensionalSU extends TileEnergyStorage implements IContai public String ownerUdid; public TileInterdimensionalSU() { - super("IDSU", 2, ModBlocks.INTERDIMENSIONAL_SU, EnumPowerTier.EXTREME, maxInput, maxOutput, maxEnergy); + super("IDSU", 2, TRBlocks.INTERDIMENSIONAL_SU, EnumPowerTier.EXTREME, maxInput, maxOutput, maxEnergy); } @Override diff --git a/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java b/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java index 7e14a91d0..166952805 100644 --- a/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java +++ b/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java @@ -31,7 +31,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import reborncore.api.IToolDrop; import reborncore.common.tile.TileMachineBase; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; public class TileLSUStorage extends TileMachineBase implements IToolDrop { @@ -95,6 +95,6 @@ public class TileLSUStorage extends TileMachineBase // IToolDrop @Override public ItemStack getToolDrop(EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.LSU_STORAGE, 1); + return new ItemStack(TRBlocks.LSU_STORAGE, 1); } } diff --git a/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java b/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java index 5f28058b5..730f96cb0 100644 --- a/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java +++ b/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java @@ -38,7 +38,7 @@ import techreborn.blocks.storage.BlockLapotronicSU; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.tiles.storage.TileEnergyStorage; import java.util.ArrayList; @@ -59,7 +59,7 @@ public class TileLapotronicSU extends TileEnergyStorage implements IContainerPro private ArrayList countedNetworks = new ArrayList<>(); public TileLapotronicSU() { - super("LESU", 2, ModBlocks.LAPOTRONIC_SU, EnumPowerTier.INSANE, 8192, baseOutput, 1_000_000); + super("LESU", 2, TRBlocks.LAPOTRONIC_SU, EnumPowerTier.INSANE, 8192, baseOutput, 1_000_000); checkOverfill = false; } diff --git a/src/main/java/techreborn/tiles/transformers/TileHVTransformer.java b/src/main/java/techreborn/tiles/transformers/TileHVTransformer.java index a06ee8380..a6927057e 100644 --- a/src/main/java/techreborn/tiles/transformers/TileHVTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileHVTransformer.java @@ -25,7 +25,7 @@ package techreborn.tiles.transformers; import reborncore.api.power.EnumPowerTier; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; /** * Created by modmuss50 on 16/03/2016. @@ -33,7 +33,7 @@ import techreborn.init.ModBlocks; public class TileHVTransformer extends TileTransformer { public TileHVTransformer() { - super("HVTransformer", ModBlocks.HV_TRANSFORMER, EnumPowerTier.EXTREME); + super("HVTransformer", TRBlocks.HV_TRANSFORMER, EnumPowerTier.EXTREME); } } diff --git a/src/main/java/techreborn/tiles/transformers/TileLVTransformer.java b/src/main/java/techreborn/tiles/transformers/TileLVTransformer.java index 1816a20e2..21b002935 100644 --- a/src/main/java/techreborn/tiles/transformers/TileLVTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileLVTransformer.java @@ -25,7 +25,7 @@ package techreborn.tiles.transformers; import reborncore.api.power.EnumPowerTier; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; /** * Created by modmuss50 on 16/03/2016. @@ -33,7 +33,7 @@ import techreborn.init.ModBlocks; public class TileLVTransformer extends TileTransformer { public TileLVTransformer() { - super("LVTransformer", ModBlocks.LV_TRANSFORMER, EnumPowerTier.MEDIUM); + super("LVTransformer", TRBlocks.LV_TRANSFORMER, EnumPowerTier.MEDIUM); } } diff --git a/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java b/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java index 93a7dc486..2c0013e27 100644 --- a/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java @@ -25,7 +25,7 @@ package techreborn.tiles.transformers; import reborncore.api.power.EnumPowerTier; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; /** * Created by modmuss50 on 16/03/2016. @@ -33,6 +33,6 @@ import techreborn.init.ModBlocks; public class TileMVTransformer extends TileTransformer { public TileMVTransformer() { - super("MVTransformer", ModBlocks.MV_TRANSFORMER, EnumPowerTier.HIGH); + super("MVTransformer", TRBlocks.MV_TRANSFORMER, EnumPowerTier.HIGH); } } diff --git a/src/main/java/techreborn/utils/StackWIPHandler.java b/src/main/java/techreborn/utils/StackWIPHandler.java index 2bc94923f..f156a21e9 100644 --- a/src/main/java/techreborn/utils/StackWIPHandler.java +++ b/src/main/java/techreborn/utils/StackWIPHandler.java @@ -34,7 +34,7 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import java.util.ArrayList; @@ -46,9 +46,9 @@ public class StackWIPHandler { public static ArrayList devHeads = new ArrayList<>(); public StackWIPHandler() { - wipBlocks.add(ModBlocks.MAGICAL_ABSORBER); - wipBlocks.add(ModBlocks.CHUNK_LOADER); - wipBlocks.add(ModBlocks.MAGIC_ENERGY_CONVERTER); + wipBlocks.add(TRBlocks.MAGICAL_ABSORBER); + wipBlocks.add(TRBlocks.CHUNK_LOADER); + wipBlocks.add(TRBlocks.MAGIC_ENERGY_CONVERTER); addHead("modmuss50"); addHead("Gigabit101"); diff --git a/src/main/java/techreborn/world/RubberTreeGenerator.java b/src/main/java/techreborn/world/RubberTreeGenerator.java index 3cfef1f5e..d7db2b7b3 100644 --- a/src/main/java/techreborn/world/RubberTreeGenerator.java +++ b/src/main/java/techreborn/world/RubberTreeGenerator.java @@ -34,7 +34,7 @@ import net.minecraftforge.common.IPlantable; import techreborn.TechReborn; import techreborn.blocks.BlockRubberLeaves; import techreborn.blocks.BlockRubberLog; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import java.util.Random; @@ -80,7 +80,7 @@ public class RubberTreeGenerator extends WorldGenerator { Block baseBlock = baseSate.getBlock(); boolean hasPlacedBlock = false; if (baseBlock != null && baseBlock.canSustainPlant(baseSate, world, new BlockPos(x, y - 1, z), - EnumFacing.UP, (IPlantable) ModBlocks.RUBBER_SAPLING) && y < worldHeight - treeHeight - 1) { + EnumFacing.UP, (IPlantable) TRBlocks.RUBBER_SAPLING) && y < worldHeight - treeHeight - 1) { for (yOffset = y; yOffset <= y + 1 + treeHeight; ++yOffset) { byte radius = 1; if (yOffset == y) { @@ -130,7 +130,7 @@ public class RubberTreeGenerator extends WorldGenerator { || block.canBeReplacedByLeaves(state1, world, new BlockPos(xOffset, yOffset, zOffset)))) { this.setBlockAndNotifyAdequately(world, new BlockPos(xOffset, yOffset, zOffset), - ModBlocks.RUBBER_LEAVES.getDefaultState().withProperty(BlockRubberLeaves.DECAYABLE, true).withProperty(BlockRubberLeaves.CHECK_DECAY, false)); + TRBlocks.RUBBER_LEAVES.getDefaultState().withProperty(BlockRubberLeaves.DECAYABLE, true).withProperty(BlockRubberLeaves.CHECK_DECAY, false)); hasPlacedBlock = true; } } @@ -144,7 +144,7 @@ public class RubberTreeGenerator extends WorldGenerator { Block block = state1.getBlock(); if (block == null || block.isAir(state1, world, blockpos) || block.isLeaves(state1, world, blockpos) || block.isReplaceable(world, blockpos)) { - IBlockState newState = ModBlocks.RUBBER_LOG.getDefaultState(); + IBlockState newState = TRBlocks.RUBBER_LOG.getDefaultState(); boolean isAddingSap = false; if (rand.nextInt(TechReborn.worldGen.config.rubberTreeConfig.sapRarity) == 0) { newState = newState.withProperty(BlockRubberLog.HAS_SAP, true) @@ -163,7 +163,7 @@ public class RubberTreeGenerator extends WorldGenerator { if (topLogPos != null) { for (int i = 0; i < TechReborn.worldGen.config.rubberTreeConfig.spireHeight; i++) { BlockPos spikePos = topLogPos.up(i); - this.setBlockAndNotifyAdequately(world, spikePos, ModBlocks.RUBBER_LEAVES.getDefaultState() + this.setBlockAndNotifyAdequately(world, spikePos, TRBlocks.RUBBER_LEAVES.getDefaultState() .withProperty(BlockRubberLeaves.DECAYABLE, true).withProperty(BlockRubberLeaves.CHECK_DECAY, false)); } } diff --git a/src/main/java/techreborn/world/village/VillageComponentRubberPlantaion.java b/src/main/java/techreborn/world/village/VillageComponentRubberPlantaion.java index ed7fdaca8..b475f68ea 100644 --- a/src/main/java/techreborn/world/village/VillageComponentRubberPlantaion.java +++ b/src/main/java/techreborn/world/village/VillageComponentRubberPlantaion.java @@ -33,7 +33,7 @@ import net.minecraft.world.World; import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; -import techreborn.init.ModBlocks; +import techreborn.init.TRBlocks; import techreborn.world.RubberTreeGenerator; import java.util.List; @@ -71,7 +71,7 @@ public class VillageComponentRubberPlantaion extends StructureVillagePieces.Fiel @Override protected void setBlockState(World worldIn, IBlockState blockstateIn, int x, int y, int z, StructureBoundingBox boundingboxIn) { if (isCrop(blockstateIn)) { - blockstateIn = ModBlocks.RUBBER_SAPLING.getDefaultState(); + blockstateIn = TRBlocks.RUBBER_SAPLING.getDefaultState(); } super.setBlockState(worldIn, blockstateIn, x, y, z, boundingboxIn); } @@ -99,7 +99,7 @@ public class VillageComponentRubberPlantaion extends StructureVillagePieces.Fiel BlockPos pos = new BlockPos(this.getXWithOffset(row, coloum), this.getYWithOffset(1), this.getZWithOffset(row, coloum)); if (!new RubberTreeGenerator(true).growTree(world, random, pos.getX(), pos.getY(), pos.getZ())) { //Puts the sapling back if the tree did not grow - setBlockState(world, ModBlocks.RUBBER_SAPLING.getDefaultState(), row, 1, coloum, structureBoundingBox); + setBlockState(world, TRBlocks.RUBBER_SAPLING.getDefaultState(), row, 1, coloum, structureBoundingBox); } } }