From 809c02934a3a8641b3ddaed2c765f92b5931293e Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 24 Sep 2018 16:49:44 +0300 Subject: [PATCH] Moved generators to enum --- .../{ => generator}/BlockFusionCoil.java | 5 +- .../BlockFusionControlComputer.java | 6 +- .../client/gui/GuiFusionReactor.java | 2 +- src/main/java/techreborn/init/TRContent.java | 73 +++++-------------- .../init/recipes/CraftingTableRecipes.java | 28 +++---- .../TileFusionControlComputer.java | 4 +- .../tiles/generator/TileLightningRod.java | 2 +- .../tiles/generator/TilePlasmaGenerator.java | 2 +- .../advanced/TileDieselGenerator.java | 2 +- .../advanced/TileDragonEggSyphon.java | 2 +- .../generator/advanced/TileGasTurbine.java | 2 +- .../advanced/TileSemiFluidGenerator.java | 2 +- .../advanced/TileThermalGenerator.java | 2 +- .../basic/TileSolidFuelGenerator.java | 2 +- .../tiles/generator/basic/TileWaterMill.java | 2 +- .../tiles/generator/basic/TileWindMill.java | 2 +- 16 files changed, 51 insertions(+), 87 deletions(-) rename src/main/java/techreborn/blocks/{ => generator}/BlockFusionCoil.java (96%) rename src/main/java/techreborn/blocks/{ => generator}/BlockFusionControlComputer.java (95%) diff --git a/src/main/java/techreborn/blocks/BlockFusionCoil.java b/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java similarity index 96% rename from src/main/java/techreborn/blocks/BlockFusionCoil.java rename to src/main/java/techreborn/blocks/generator/BlockFusionCoil.java index e69fe1c91..638167b7a 100644 --- a/src/main/java/techreborn/blocks/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks; +package techreborn.blocks.generator; import net.minecraft.block.Block; import net.minecraft.block.SoundType; @@ -44,7 +44,6 @@ import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import techreborn.TechReborn; import techreborn.init.ModSounds; -import techreborn.init.TRContent; import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; @@ -68,7 +67,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(TRContent.FUSION_COIL, 1); + ItemStack drop = new ItemStack(this); 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/generator/BlockFusionControlComputer.java similarity index 95% rename from src/main/java/techreborn/blocks/BlockFusionControlComputer.java rename to src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java index 73169ee0d..9a5dd706d 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks; +package techreborn.blocks.generator; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -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(TRContent.FUSION_COIL)){ + if(!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == Item.getItemFromBlock(TRContent.Machine.FUSION_COIL.block)){ 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, TRContent.FUSION_COIL.getDefaultState()); + world.setBlockState(coil, TRContent.Machine.FUSION_COIL.block.getDefaultState()); if(!player.isCreative()){ player.getHeldItem(hand).shrink(1); } diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 91d4b36cc..a636bea12 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -150,7 +150,7 @@ public class GuiFusionReactor extends GuiBase { private void updateMultiBlockRender(){ final Multiblock multiblock = new Multiblock(); - IBlockState coil = TRContent.FUSION_COIL.getDefaultState(); + IBlockState coil = TRContent.Machine.FUSION_COIL.block.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/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index eb3000a6d..40bd8c131 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -29,8 +29,6 @@ import techreborn.TechReborn; import techreborn.api.Reference; import techreborn.blocks.BlockAlarm; import techreborn.blocks.BlockComputerCube; -import techreborn.blocks.BlockFusionCoil; -import techreborn.blocks.BlockFusionControlComputer; import techreborn.blocks.BlockMachineCasing; import techreborn.blocks.BlockMachineFrame; import techreborn.blocks.BlockNuke; @@ -47,6 +45,8 @@ import techreborn.blocks.BlockStorage; import techreborn.blocks.cable.BlockCable; import techreborn.blocks.generator.BlockDieselGenerator; import techreborn.blocks.generator.BlockDragonEggSyphon; +import techreborn.blocks.generator.BlockFusionCoil; +import techreborn.blocks.generator.BlockFusionControlComputer; import techreborn.blocks.generator.BlockGasTurbine; import techreborn.blocks.generator.BlockLightningRod; import techreborn.blocks.generator.BlockMagicEnergyAbsorber; @@ -168,22 +168,9 @@ public class TRContent { public static Block RUBBER_SAPLING; // Machines - machines - - // Machines - generators - public static Block DIESEL_GENERATOR; - public static Block DRAGON_EGG_SYPHON; - public static Block FUSION_COIL; - public static Block FUSION_CONTROL_COMPUTER; - public static Block GAS_TURBINE; - public static Block LIGHTNING_ROD; - public static Block PLASMA_GENERATOR; - public static Block SEMI_FLUID_GENERATOR; - public static Block SOLID_FUEL_GENEREATOR; - public static Block THERMAL_GENERATOR; - public static Block WATER_MILL; - public static Block WIND_MILL; + // Machines - storage public static Block CREATIVE_QUANTUM_CHEST; @@ -358,7 +345,6 @@ public class TRContent { InitUtils.setup(block, name + "_solar_panel"); } - } public static enum Cables implements IItemProvider { @@ -464,6 +450,8 @@ public class TRContent { return casing; } } + + public static enum Machine { ALLOY_SMELTER(new BlockAlloySmelter()), ASSEMBLY_MACHINE(new BlockAssemblingMachine()), @@ -487,7 +475,20 @@ public class TRContent { RECYCLER(new BlockRecycler()), ROLLING_MACHINE(new BlockRollingMachine()), SCRAPBOXINATOR(new BlockScrapboxinator()), - VACUUM_FREEZER(new BlockVacuumFreezer()) + VACUUM_FREEZER(new BlockVacuumFreezer()), + + DIESEL_GENERATOR(new BlockDieselGenerator()), + DRAGON_EGG_SYPHON(new BlockDragonEggSyphon()), + FUSION_COIL(new BlockFusionCoil()), + FUSION_CONTROL_COMPUTER(new BlockFusionControlComputer()), + GAS_TURBINE(new BlockGasTurbine()), + LIGHTNING_ROD(new BlockLightningRod()), + PLASMA_GENERATOR(new BlockPlasmaGenerator()), + SEMI_FLUID_GENERATOR(new BlockSemiFluidGenerator()), + SOLID_FUEL_GENEREATOR(new BlockSolidFuelGenerator()), + THERMAL_GENERATOR(new BlockThermalGenerator()), + WATER_MILL(new BlockWaterMill()), + WIND_MILL(new BlockWindMill()) ; @@ -844,42 +845,6 @@ public class TRContent { RUBBER_SAPLING = new BlockRubberSapling(); registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubber_sapling"); - // Machines - generators - DIESEL_GENERATOR = new BlockDieselGenerator(); - registerBlock(DIESEL_GENERATOR, "diesel_generator"); - - DRAGON_EGG_SYPHON = new BlockDragonEggSyphon(); - registerBlock(DRAGON_EGG_SYPHON, "dragon_egg_syphon"); - - FUSION_COIL = new BlockFusionCoil(); - registerBlock(FUSION_COIL, "fusion_coil"); - - FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer(); - registerBlock(FUSION_CONTROL_COMPUTER, "fusion_control_computer"); - - GAS_TURBINE = new BlockGasTurbine(); - registerBlock(GAS_TURBINE, "gas_turbine"); - - LIGHTNING_ROD = new BlockLightningRod(); - registerBlock(LIGHTNING_ROD, "lightning_rod"); - - PLASMA_GENERATOR = new BlockPlasmaGenerator(); - registerBlock(PLASMA_GENERATOR, "plasma_generator"); - - SEMI_FLUID_GENERATOR = new BlockSemiFluidGenerator(); - registerBlock(SEMI_FLUID_GENERATOR, "semi_fluid_generator"); - - SOLID_FUEL_GENEREATOR = new BlockSolidFuelGenerator(); - registerBlock(SOLID_FUEL_GENEREATOR, "solid_fuel_generator"); - - THERMAL_GENERATOR = new BlockThermalGenerator(); - registerBlock(THERMAL_GENERATOR, "thermal_generator"); - - WATER_MILL = new BlockWaterMill(); - registerBlock(WATER_MILL, "water_mill"); - - WIND_MILL = new BlockWindMill(); - registerBlock(WIND_MILL, "wind_mill"); // Machines - storage CREATIVE_QUANTUM_CHEST = new BlockCreativeQuantumChest(); diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index 15cb92e88..aceb5a4dd 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -97,17 +97,17 @@ 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(TRContent.SOLID_FUEL_GENEREATOR), "reBattery", "machineBlockBasic", getStack(Blocks.FURNACE)); - registerShaped(getStack(TRContent.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(TRContent.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateAluminum", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(TRContent.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "ingotRefinedIron", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(TRContent.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "plateAluminum", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(TRContent.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateInvar", 'A', "circuitAdvanced", 'W', getStack(TRContent.WIND_MILL), 'G', "glassReinforced"); - registerShaped(getStack(TRContent.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateAluminum", 'A', "circuitAdvanced", 'W', getStack(TRContent.WIND_MILL), 'G', "glassReinforced"); - registerShaped(getStack(TRContent.THERMAL_GENERATOR), "III", "IRI", "CGC", 'I', "plateInvar", 'R', "glassReinforced", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic"); - registerShaped(getStack(TRContent.WIND_MILL), " I ", " G ", " I ", 'I', "plateMagnalium", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(TRContent.WIND_MILL), "IGI", 'I', "plateMagnalium", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); - registerShaped(getStack(TRContent.WATER_MILL), "SWS", "WGW", "SWS", 'S', "stickWood", 'W', "plankWood", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); +// registerShapeless(getStack(TRContent.SOLID_FUEL_GENEREATOR), "reBattery", "machineBlockBasic", getStack(Blocks.FURNACE)); +// registerShaped(getStack(TRContent.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateIron", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); +// registerShaped(getStack(TRContent.SEMI_FLUID_GENERATOR), "III", "IHI", "CGC", 'I', "plateAluminum", 'H', "glassReinforced", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); +// registerShaped(getStack(TRContent.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "ingotRefinedIron", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); +// registerShaped(getStack(TRContent.DIESEL_GENERATOR), "III", "I I", "CGC", 'I', "plateAluminum", 'C', "circuitBasic", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); +// registerShaped(getStack(TRContent.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateInvar", 'A', "circuitAdvanced", 'W', getStack(TRContent.WIND_MILL), 'G', "glassReinforced"); +// registerShaped(getStack(TRContent.GAS_TURBINE), "IAI", "WGW", "IAI", 'I', "plateAluminum", 'A', "circuitAdvanced", 'W', getStack(TRContent.WIND_MILL), 'G', "glassReinforced"); +// registerShaped(getStack(TRContent.THERMAL_GENERATOR), "III", "IRI", "CGC", 'I', "plateInvar", 'R', "glassReinforced", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR), 'C', "circuitBasic"); +// registerShaped(getStack(TRContent.WIND_MILL), " I ", " G ", " I ", 'I', "plateMagnalium", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); +// registerShaped(getStack(TRContent.WIND_MILL), "IGI", 'I', "plateMagnalium", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); +// registerShaped(getStack(TRContent.WATER_MILL), "SWS", "WGW", "SWS", 'S', "stickWood", 'W', "plankWood", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); // registerShaped(getStack(ModBlocks.LIGHTNING_ROD), "CAC", "ACA", "CAC", 'A', getStack(ModBlocks.MACHINE_CASINGS, 1, 2), 'C', "circuitMaster"); registerShaped(TRContent.Machine.IRON_ALLOY_FURNACE.getStack(), "III", "F F", "III", 'I', "ingotRefinedIron", 'F', TRContent.Machine.IRON_FURNACE.getStack()); registerShaped(TRContent.Machine.INDUSTRIAL_ELECTROLYZER.getStack(), "RER", "CFC", "RER", 'R', "plateIron", 'E', TRContent.Machine.EXTRACTOR.getStack(), 'C', "circuitAdvanced", 'F', "machineBlockAdvanced"); @@ -129,15 +129,15 @@ public class CraftingTableRecipes extends RecipeMethods { registerShaped(getStack(TRContent.LAPOTRONIC_SU), " L ", "CBC", " M ", 'L', getStack(TRContent.LV_TRANSFORMER), 'C', "circuitAdvanced", 'M', getStack(TRContent.MV_TRANSFORMER), 'B', getStack(TRContent.LSU_STORAGE)); registerShaped(getStack(TRContent.LSU_STORAGE), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C', "circuitBasic"); // registerShaped(getStack(TRContent.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(TRContent.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt"); - registerShaped(getStack(TRContent.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(TRContent.FUSION_COIL), 'C', "circuitMaster"); +// registerShaped(getStack(TRContent.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(TRContent.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(TRContent.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack()); registerShaped(getStack(TRContent.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRContent.Parts.DIGITAL_DISPLAY.getStack()); // registerShaped(getStack(TRContent.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(TRContent.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(TRContent.LAPOTRONIC_ORB)); registerShaped(getStack(TRContent.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', TRContent.Parts.DATA_STORAGE_CORE.getStack(), 'M', TRContent.Parts.DIGITAL_DISPLAY.getStack(), 'C', "circuitMaster", 'F', "machineBlockAdvanced"); registerShaped(getStack(TRContent.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(TRContent.COMPUTER_CUBE)); - registerShaped(getStack(TRContent.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(TRContent.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(TRContent.LAPOTRONIC_ORB)); - registerShaped(getStack(TRContent.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(TRContent.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(TRContent.SOLID_FUEL_GENEREATOR)); +// registerShaped(getStack(TRContent.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(TRContent.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(TRContent.LAPOTRONIC_ORB)); +// registerShaped(getStack(TRContent.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(TRContent.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(TRContent.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"); diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java index b04024098..7254aef31 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java @@ -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() == TRContent.FUSION_COIL; + return world.getBlockState(pos).getBlock() == TRContent.Machine.FUSION_COIL.block; } /** @@ -359,7 +359,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor // IToolDrop @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(TRContent.FUSION_CONTROL_COMPUTER, 1); + return TRContent.Machine.FUSION_CONTROL_COMPUTER.getStack(); } // ItemHandlerProvider diff --git a/src/main/java/techreborn/tiles/generator/TileLightningRod.java b/src/main/java/techreborn/tiles/generator/TileLightningRod.java index c1f797a9f..c70a93006 100644 --- a/src/main/java/techreborn/tiles/generator/TileLightningRod.java +++ b/src/main/java/techreborn/tiles/generator/TileLightningRod.java @@ -145,6 +145,6 @@ public class TileLightningRod extends TilePowerAcceptor implements IToolDrop { @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(TRContent.LIGHTNING_ROD); + return TRContent.Machine.LIGHTNING_ROD.getStack(); } } diff --git a/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java b/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java index 782ebd4d7..d49974dea 100644 --- a/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java @@ -53,7 +53,7 @@ public class TilePlasmaGenerator extends TileBaseFluidGenerator implements ICont @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(TRContent.PLASMA_GENERATOR, 1); + return TRContent.Machine.PLASMA_GENERATOR.getStack(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java index 1ba12af48..f59cfb756 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java @@ -54,7 +54,7 @@ public class TileDieselGenerator extends TileBaseFluidGenerator implements ICont @Override public ItemStack getToolDrop(final EntityPlayer entityPlayer) { - return new ItemStack(TRContent.DIESEL_GENERATOR, 1); + return TRContent.Machine.DIESEL_GENERATOR.getStack(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java b/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java index cfee5791c..732054b44 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java @@ -116,7 +116,7 @@ public class TileDragonEggSyphon extends TilePowerAcceptor // IToolDrop @Override public ItemStack getToolDrop(EntityPlayer entityPlayer) { - return new ItemStack(TRContent.DRAGON_EGG_SYPHON, 1); + return TRContent.Machine.DRAGON_EGG_SYPHON.getStack(); } // ItemHandlerProvider diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java index 1dd554ad6..bf81cf233 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java @@ -54,7 +54,7 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer @Override public ItemStack getToolDrop(EntityPlayer entityPlayer) { - return new ItemStack(TRContent.GAS_TURBINE, 1); + return TRContent.Machine.GAS_TURBINE.getStack(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java index 9807f757a..55b3270b2 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java @@ -54,7 +54,7 @@ public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IC @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(TRContent.SEMI_FLUID_GENERATOR, 1); + return TRContent.Machine.SEMI_FLUID_GENERATOR.getStack(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java index 0f643a24d..295a66111 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java @@ -54,7 +54,7 @@ public class TileThermalGenerator extends TileBaseFluidGenerator implements ICon @Override public ItemStack getToolDrop(EntityPlayer entityPlayer) { - return new ItemStack(TRContent.THERMAL_GENERATOR, 1); + return TRContent.Machine.THERMAL_GENERATOR.getStack(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java b/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java index d8b098677..287e9cbf4 100644 --- a/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java +++ b/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java @@ -147,7 +147,7 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDr @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(TRContent.SOLID_FUEL_GENEREATOR); + return TRContent.Machine.SOLID_FUEL_GENEREATOR.getStack(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java b/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java index e53decd9f..8d9f390aa 100644 --- a/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java +++ b/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java @@ -107,6 +107,6 @@ public class TileWaterMill extends TilePowerAcceptor implements IToolDrop { @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(TRContent.WATER_MILL); + return TRContent.Machine.WATER_MILL.getStack(); } } diff --git a/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java b/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java index 58d425b86..8aeac2111 100644 --- a/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java +++ b/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java @@ -95,6 +95,6 @@ public class TileWindMill extends TilePowerAcceptor implements IToolDrop { @Override public ItemStack getToolDrop(EntityPlayer playerIn) { - return new ItemStack(TRContent.WIND_MILL); + return TRContent.Machine.WIND_MILL.getStack(); } }