Moved generators to enum

This commit is contained in:
drcrazy 2018-09-24 16:49:44 +03:00
parent 86a2612b97
commit 809c02934a
16 changed files with 51 additions and 87 deletions

View file

@ -22,7 +22,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package techreborn.blocks; package techreborn.blocks.generator;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.SoundType; import net.minecraft.block.SoundType;
@ -44,7 +44,6 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry; import reborncore.client.models.RebornModelRegistry;
import techreborn.TechReborn; import techreborn.TechReborn;
import techreborn.init.ModSounds; import techreborn.init.ModSounds;
import techreborn.init.TRContent;
import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.TechRebornCreativeTab;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -68,7 +67,7 @@ public class BlockFusionCoil extends Block {
if (!tool.isEmpty() && ToolManager.INSTANCE.canHandleTool(tool)) { if (!tool.isEmpty() && ToolManager.INSTANCE.canHandleTool(tool)) {
if (ToolManager.INSTANCE.handleTool(tool, pos, worldIn, playerIn, side, false)) { if (ToolManager.INSTANCE.handleTool(tool, pos, worldIn, playerIn, side, false)) {
if (playerIn.isSneaking()) { if (playerIn.isSneaking()) {
ItemStack drop = new ItemStack(TRContent.FUSION_COIL, 1); ItemStack drop = new ItemStack(this);
spawnAsEntity(worldIn, pos, drop); spawnAsEntity(worldIn, pos, drop);
worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, ModSounds.BLOCK_DISMANTLE, worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, ModSounds.BLOCK_DISMANTLE,
SoundCategory.BLOCKS, 0.6F, 1F); SoundCategory.BLOCKS, 0.6F, 1F);

View file

@ -22,7 +22,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package techreborn.blocks; package techreborn.blocks.generator;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
@ -60,7 +60,7 @@ public class BlockFusionControlComputer extends BlockMachineBase {
final EntityPlayer player, final EnumHand hand, final EnumFacing side, final EntityPlayer player, final EnumHand hand, final EnumFacing side,
final float hitX, final float hitY, final float hitZ) { final float hitX, final float hitY, final float hitZ) {
final TileFusionControlComputer tileFusionControlComputer = (TileFusionControlComputer) world.getTileEntity(pos); 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<BlockPos> coils = Torus.generate(tileFusionControlComputer.getPos(), tileFusionControlComputer.size); List<BlockPos> coils = Torus.generate(tileFusionControlComputer.getPos(), tileFusionControlComputer.size);
boolean placed = false; boolean placed = false;
for(BlockPos coil : coils){ for(BlockPos coil : coils){
@ -68,7 +68,7 @@ public class BlockFusionControlComputer extends BlockMachineBase {
return true; return true;
} }
if(world.isAirBlock(coil) && !tileFusionControlComputer.isCoil(coil)){ 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()){ if(!player.isCreative()){
player.getHeldItem(hand).shrink(1); player.getHeldItem(hand).shrink(1);
} }

View file

@ -150,7 +150,7 @@ public class GuiFusionReactor extends GuiBase {
private void updateMultiBlockRender(){ private void updateMultiBlockRender(){
final Multiblock multiblock = new Multiblock(); final Multiblock multiblock = new Multiblock();
IBlockState coil = TRContent.FUSION_COIL.getDefaultState(); IBlockState coil = TRContent.Machine.FUSION_COIL.block.getDefaultState();
List<BlockPos> coils = Torus.generate(new BlockPos(0, 0, 0), tile.size); List<BlockPos> coils = Torus.generate(new BlockPos(0, 0, 0), tile.size);
coils.forEach(pos -> addComponent(pos.getX(), pos.getY(), pos.getZ(), coil, multiblock)); coils.forEach(pos -> addComponent(pos.getX(), pos.getY(), pos.getZ(), coil, multiblock));

View file

@ -29,8 +29,6 @@ import techreborn.TechReborn;
import techreborn.api.Reference; import techreborn.api.Reference;
import techreborn.blocks.BlockAlarm; import techreborn.blocks.BlockAlarm;
import techreborn.blocks.BlockComputerCube; import techreborn.blocks.BlockComputerCube;
import techreborn.blocks.BlockFusionCoil;
import techreborn.blocks.BlockFusionControlComputer;
import techreborn.blocks.BlockMachineCasing; import techreborn.blocks.BlockMachineCasing;
import techreborn.blocks.BlockMachineFrame; import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockNuke; import techreborn.blocks.BlockNuke;
@ -47,6 +45,8 @@ import techreborn.blocks.BlockStorage;
import techreborn.blocks.cable.BlockCable; import techreborn.blocks.cable.BlockCable;
import techreborn.blocks.generator.BlockDieselGenerator; import techreborn.blocks.generator.BlockDieselGenerator;
import techreborn.blocks.generator.BlockDragonEggSyphon; import techreborn.blocks.generator.BlockDragonEggSyphon;
import techreborn.blocks.generator.BlockFusionCoil;
import techreborn.blocks.generator.BlockFusionControlComputer;
import techreborn.blocks.generator.BlockGasTurbine; import techreborn.blocks.generator.BlockGasTurbine;
import techreborn.blocks.generator.BlockLightningRod; import techreborn.blocks.generator.BlockLightningRod;
import techreborn.blocks.generator.BlockMagicEnergyAbsorber; import techreborn.blocks.generator.BlockMagicEnergyAbsorber;
@ -168,22 +168,9 @@ public class TRContent {
public static Block RUBBER_SAPLING; public static Block RUBBER_SAPLING;
// Machines - machines // Machines - machines
// Machines - generators // 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 // Machines - storage
public static Block CREATIVE_QUANTUM_CHEST; public static Block CREATIVE_QUANTUM_CHEST;
@ -358,7 +345,6 @@ public class TRContent {
InitUtils.setup(block, name + "_solar_panel"); InitUtils.setup(block, name + "_solar_panel");
} }
} }
public static enum Cables implements IItemProvider { public static enum Cables implements IItemProvider {
@ -464,6 +450,8 @@ public class TRContent {
return casing; return casing;
} }
} }
public static enum Machine { public static enum Machine {
ALLOY_SMELTER(new BlockAlloySmelter()), ALLOY_SMELTER(new BlockAlloySmelter()),
ASSEMBLY_MACHINE(new BlockAssemblingMachine()), ASSEMBLY_MACHINE(new BlockAssemblingMachine()),
@ -487,7 +475,20 @@ public class TRContent {
RECYCLER(new BlockRecycler()), RECYCLER(new BlockRecycler()),
ROLLING_MACHINE(new BlockRollingMachine()), ROLLING_MACHINE(new BlockRollingMachine()),
SCRAPBOXINATOR(new BlockScrapboxinator()), 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(); RUBBER_SAPLING = new BlockRubberSapling();
registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubber_sapling"); 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 // Machines - storage
CREATIVE_QUANTUM_CHEST = new BlockCreativeQuantumChest(); CREATIVE_QUANTUM_CHEST = new BlockCreativeQuantumChest();

View file

@ -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)); // registerShaped(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G', "blockGlass", 'W', EnumCableType.IGOLD.getStack(), 'C', "circuitBasic", 'T', getStack(ModBlocks.MV_TRANSFORMER));
//Machines //Machines
registerShapeless(getStack(TRContent.SOLID_FUEL_GENEREATOR), "reBattery", "machineBlockBasic", getStack(Blocks.FURNACE)); // 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', "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.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', "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.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', "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.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.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), " 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.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(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(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.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"); 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.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.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.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(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', "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.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.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.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.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.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.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, 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', getStack(ModBlocks.SOLAR_PANEL, 1, 0));
// registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 1), "DLD", "LDL", "CPC", 'D', "dustCoal", 'L', "blockGlass", 'C', "circuitAdvanced", 'P', "machineBlockBasic"); // registerShaped(getStack(ModBlocks.SOLAR_PANEL, 1, 1), "DLD", "LDL", "CPC", 'D', "dustCoal", 'L', "blockGlass", 'C', "circuitAdvanced", 'P', "machineBlockBasic");

View file

@ -105,7 +105,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor
* @return boolean Returns true if block is fusion coil * @return boolean Returns true if block is fusion coil
*/ */
public boolean isCoil(BlockPos pos) { 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 // IToolDrop
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRContent.FUSION_CONTROL_COMPUTER, 1); return TRContent.Machine.FUSION_CONTROL_COMPUTER.getStack();
} }
// ItemHandlerProvider // ItemHandlerProvider

View file

@ -145,6 +145,6 @@ public class TileLightningRod extends TilePowerAcceptor implements IToolDrop {
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRContent.LIGHTNING_ROD); return TRContent.Machine.LIGHTNING_ROD.getStack();
} }
} }

View file

@ -53,7 +53,7 @@ public class TilePlasmaGenerator extends TileBaseFluidGenerator implements ICont
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRContent.PLASMA_GENERATOR, 1); return TRContent.Machine.PLASMA_GENERATOR.getStack();
} }
@Override @Override

View file

@ -54,7 +54,7 @@ public class TileDieselGenerator extends TileBaseFluidGenerator implements ICont
@Override @Override
public ItemStack getToolDrop(final EntityPlayer entityPlayer) { public ItemStack getToolDrop(final EntityPlayer entityPlayer) {
return new ItemStack(TRContent.DIESEL_GENERATOR, 1); return TRContent.Machine.DIESEL_GENERATOR.getStack();
} }
@Override @Override

View file

@ -116,7 +116,7 @@ public class TileDragonEggSyphon extends TilePowerAcceptor
// IToolDrop // IToolDrop
@Override @Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) { public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(TRContent.DRAGON_EGG_SYPHON, 1); return TRContent.Machine.DRAGON_EGG_SYPHON.getStack();
} }
// ItemHandlerProvider // ItemHandlerProvider

View file

@ -54,7 +54,7 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer
@Override @Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) { public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(TRContent.GAS_TURBINE, 1); return TRContent.Machine.GAS_TURBINE.getStack();
} }
@Override @Override

View file

@ -54,7 +54,7 @@ public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IC
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRContent.SEMI_FLUID_GENERATOR, 1); return TRContent.Machine.SEMI_FLUID_GENERATOR.getStack();
} }
@Override @Override

View file

@ -54,7 +54,7 @@ public class TileThermalGenerator extends TileBaseFluidGenerator implements ICon
@Override @Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) { public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(TRContent.THERMAL_GENERATOR, 1); return TRContent.Machine.THERMAL_GENERATOR.getStack();
} }
@Override @Override

View file

@ -147,7 +147,7 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDr
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRContent.SOLID_FUEL_GENEREATOR); return TRContent.Machine.SOLID_FUEL_GENEREATOR.getStack();
} }
@Override @Override

View file

@ -107,6 +107,6 @@ public class TileWaterMill extends TilePowerAcceptor implements IToolDrop {
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRContent.WATER_MILL); return TRContent.Machine.WATER_MILL.getStack();
} }
} }

View file

@ -95,6 +95,6 @@ public class TileWindMill extends TilePowerAcceptor implements IToolDrop {
@Override @Override
public ItemStack getToolDrop(EntityPlayer playerIn) { public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(TRContent.WIND_MILL); return TRContent.Machine.WIND_MILL.getStack();
} }
} }