Energy storage enum-ed

This commit is contained in:
drcrazy 2018-09-25 03:09:56 +03:00
parent f2d8891bd5
commit 25f06384f4
14 changed files with 32 additions and 67 deletions

View file

@ -175,17 +175,7 @@ public class TRContent {
// Machines - energy storage & transformers
public static Block ADJUSTABLE_SU;
public static Block CHARGE_O_MAT;
public static Block INTERDIMENSIONAL_SU;
public static Block LAPOTRONIC_SU;
public static Block LSU_STORAGE;
public static Block LOW_VOLTAGE_SU;
public static Block MEDIUM_VOLTAGE_SU;
public static Block HIGH_VOLTAGE_SU;
public static Block LV_TRANSFORMER;
public static Block MV_TRANSFORMER;
public static Block HV_TRANSFORMER;
// Machines - misc
public static Block ALARM;
@ -489,14 +479,23 @@ public class TRContent {
CREATIVE_QUANTUM_TANK(new BlockCreativeQuantumTank(), ItemBlockQuantumTank.class),
DIGITAL_CHEST(new BlockDigitalChest(), ItemBlockDigitalChest.class),
QUANTUM_CHEST(new BlockQuantumChest(), ItemBlockQuantumChest.class),
QUANTUM_TANK(new BlockQuantumTank(), ItemBlockQuantumTank.class)
QUANTUM_TANK(new BlockQuantumTank(), ItemBlockQuantumTank.class),
ADJUSTABLE_SU(new BlockAdjustableSU(), ItemBlockAdjustableSU.class),
CHARGE_O_MAT(new BlockChargeOMat()),
INTERDIMENSIONAL_SU(new BlockInterdimensionalSU()),
LAPOTRONIC_SU(new BlockLapotronicSU()),
LSU_STORAGE(new BlockLSUStorage()),
LOW_VOLTAGE_SU(new BlockLowVoltageSU()),
MEDIUM_VOLTAGE_SU(new BlockMediumVoltageSU()),
HIGH_VOLTAGE_SU(new BlockHighVoltageSU()),
LV_TRANSFORMER(new BlockLVTransformer()),
MV_TRANSFORMER(new BlockMVTransformer()),
HV_TRANSFORMER(new BlockHVTransformer())
;
public final String name;
public final Block block;
@ -857,40 +856,6 @@ public class TRContent {
RUBBER_SAPLING = new BlockRubberSapling();
registerBlock(RUBBER_SAPLING, ItemBlockRubberSapling.class, "rubber_sapling");
// Machines - energy storage & transformers
ADJUSTABLE_SU = new BlockAdjustableSU();
registerBlock(ADJUSTABLE_SU, ItemBlockAdjustableSU.class, "adjustable_su");
CHARGE_O_MAT = new BlockChargeOMat();
registerBlock(CHARGE_O_MAT, "charge_o_mat");
INTERDIMENSIONAL_SU = new BlockInterdimensionalSU();
registerBlock(INTERDIMENSIONAL_SU, "interdimensional_su");
LAPOTRONIC_SU = new BlockLapotronicSU();
registerBlock(LAPOTRONIC_SU, "lapotronic_su");
LSU_STORAGE = new BlockLSUStorage();
registerBlock(LSU_STORAGE, "lsu_storage");
LOW_VOLTAGE_SU = new BlockLowVoltageSU();
registerBlock(LOW_VOLTAGE_SU, "low_voltage_su");
MEDIUM_VOLTAGE_SU = new BlockMediumVoltageSU();
registerBlock(MEDIUM_VOLTAGE_SU, "medium_voltage_su");
HIGH_VOLTAGE_SU = new BlockHighVoltageSU();
registerBlock(HIGH_VOLTAGE_SU, "high_voltage_su");
LV_TRANSFORMER = new BlockLVTransformer();
registerBlock(LV_TRANSFORMER, "lv_transformer");
MV_TRANSFORMER = new BlockMVTransformer();
registerBlock(MV_TRANSFORMER, "mv_transformer");
HV_TRANSFORMER = new BlockHVTransformer();
registerBlock(HV_TRANSFORMER, "hv_transformer");
// Machines - misc
ALARM = new BlockAlarm();
registerBlock(ALARM, "alarm");

View file

@ -122,12 +122,12 @@ public class CraftingTableRecipes extends RecipeMethods {
// registerShaped(getStack(TRContent.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(TRContent.EXTRACTOR), 'P', getStack(TRContent.COMPRESSOR), 'E', getStack(TRContent.EXTRACTOR));
// registerShaped(getStack(TRContent.ROLLING_MACHINE), "PCP", "MBM", "PCP", 'P', getStack(Blocks.PISTON), 'C', "circuitAdvanced", 'M', getStack(TRContent.COMPRESSOR), 'B', "machineBlockBasic");
// registerShaped(getStack(TRContent.AUTO_CRAFTING_TABLE), "MPM", "PCP", "MPM", 'M', "circuitAdvanced", 'C', "workbench", 'P', "plateIron");
registerShaped(getStack(TRContent.CHARGE_O_MAT), "ETE", "COC", "EAE", 'E', "circuitMaster", 'T', "energyCrystal", 'C', "chest", 'O', getStack(TRContent.LAPOTRONIC_ORB), 'A', "machineBlockAdvanced");
registerShaped(TRContent.Machine.CHARGE_O_MAT.getStack(), "ETE", "COC", "EAE", 'E', "circuitMaster", 'T', "energyCrystal", 'C', "chest", 'O', getStack(TRContent.LAPOTRONIC_ORB), 'A', "machineBlockAdvanced");
// registerShaped(getStack(TRContent.ALLOY_SMELTER), " C ", "FMF", " ", 'C', "circuitBasic", 'F', getStack(TRContent.ELECTRIC_FURNACE), 'M', "machineBlockBasic");
registerShaped(getStack(TRContent.INTERDIMENSIONAL_SU), "PAP", "ACA", "PAP", 'P', "plateIridiumAlloy", 'C', "chestEnder", 'A', getStack(TRContent.ADJUSTABLE_SU));
registerShaped(getStack(TRContent.ADJUSTABLE_SU), "LLL", "LCL", "LLL", 'L', getStack(TRContent.LAPOTRONIC_ORB), 'C', "energyCrystal");
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.INTERDIMENSIONAL_SU), "PAP", "ACA", "PAP", 'P', "plateIridiumAlloy", 'C', "chestEnder", 'A', getStack(TRContent.ADJUSTABLE_SU));
// registerShaped(getStack(TRContent.ADJUSTABLE_SU), "LLL", "LCL", "LLL", 'L', getStack(TRContent.LAPOTRONIC_ORB), 'C', "energyCrystal");
// 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(TRContent.Machine.LSU_STORAGE.getStack(), "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(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));

View file

@ -85,7 +85,7 @@ public class ItemBlockAdjustableSU extends ItemBlock {
public ItemStack getDropWithNBT(double energy) {
NBTTagCompound tileEntity = new NBTTagCompound();
ItemStack dropStack = new ItemStack(TRContent.ADJUSTABLE_SU, 1);
ItemStack dropStack = TRContent.Machine.ADJUSTABLE_SU.getStack();
writeToNBTWithoutCoords(tileEntity, energy);
dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity);

View file

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

View file

@ -51,7 +51,7 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro
private int OUTPUT = 64; // The current output
public TileAdjustableSU() {
super("ADJUSTABLE_SU", 4, TRContent.ADJUSTABLE_SU, EnumPowerTier.INSANE, maxInput, maxOutput, maxEnergy);
super("ADJUSTABLE_SU", 4, TRContent.Machine.ADJUSTABLE_SU.block, 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(TRContent.ADJUSTABLE_SU, 1);
ItemStack dropStack = TRContent.Machine.ADJUSTABLE_SU.getStack();
writeToNBTWithoutCoords(tileEntity);
dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity);

View file

@ -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, TRContent.HIGH_VOLTAGE_SU, EnumPowerTier.HIGH, 512, 512, 10_000_000);
super("HIGH_VOLTAGE_SU", 2, TRContent.Machine.HIGH_VOLTAGE_SU.block, EnumPowerTier.HIGH, 512, 512, 10_000_000);
}
@Override

View file

@ -37,7 +37,7 @@ import techreborn.init.TRContent;
public class TileLowVoltageSU extends TileEnergyStorage implements IContainerProvider {
public TileLowVoltageSU() {
super("BatBox", 2, TRContent.LOW_VOLTAGE_SU, EnumPowerTier.LOW, 32, 32, 40000);
super("BatBox", 2, TRContent.Machine.LOW_VOLTAGE_SU.block, EnumPowerTier.LOW, 32, 32, 40000);
}
@Override

View file

@ -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, TRContent.MEDIUM_VOLTAGE_SU, EnumPowerTier.MEDIUM, 128, 128, 300000);
super("MEDIUM_VOLTAGE_SU", 2, TRContent.Machine.MEDIUM_VOLTAGE_SU.block, EnumPowerTier.MEDIUM, 128, 128, 300000);
}
@Override

View file

@ -50,7 +50,7 @@ public class TileInterdimensionalSU extends TileEnergyStorage implements IContai
public String ownerUdid;
public TileInterdimensionalSU() {
super("IDSU", 2, TRContent.INTERDIMENSIONAL_SU, EnumPowerTier.EXTREME, maxInput, maxOutput, maxEnergy);
super("IDSU", 2, TRContent.Machine.INTERDIMENSIONAL_SU.block, EnumPowerTier.EXTREME, maxInput, maxOutput, maxEnergy);
}
@Override

View file

@ -95,6 +95,6 @@ public class TileLSUStorage extends TileMachineBase
// IToolDrop
@Override
public ItemStack getToolDrop(EntityPlayer entityPlayer) {
return new ItemStack(TRContent.LSU_STORAGE, 1);
return TRContent.Machine.LSU_STORAGE.getStack();
}
}

View file

@ -59,7 +59,7 @@ public class TileLapotronicSU extends TileEnergyStorage implements IContainerPro
private ArrayList<LesuNetwork> countedNetworks = new ArrayList<>();
public TileLapotronicSU() {
super("LESU", 2, TRContent.LAPOTRONIC_SU, EnumPowerTier.INSANE, 8192, baseOutput, 1_000_000);
super("LESU", 2, TRContent.Machine.LAPOTRONIC_SU.block, EnumPowerTier.INSANE, 8192, baseOutput, 1_000_000);
checkOverfill = false;
}

View file

@ -33,7 +33,7 @@ import techreborn.init.TRContent;
public class TileHVTransformer extends TileTransformer {
public TileHVTransformer() {
super("HVTransformer", TRContent.HV_TRANSFORMER, EnumPowerTier.EXTREME);
super("HVTransformer", TRContent.Machine.HV_TRANSFORMER.block, EnumPowerTier.EXTREME);
}
}

View file

@ -33,7 +33,7 @@ import techreborn.init.TRContent;
public class TileLVTransformer extends TileTransformer {
public TileLVTransformer() {
super("LVTransformer", TRContent.LV_TRANSFORMER, EnumPowerTier.MEDIUM);
super("LVTransformer", TRContent.Machine.LV_TRANSFORMER.block, EnumPowerTier.MEDIUM);
}
}

View file

@ -33,6 +33,6 @@ import techreborn.init.TRContent;
public class TileMVTransformer extends TileTransformer {
public TileMVTransformer() {
super("MVTransformer", TRContent.MV_TRANSFORMER, EnumPowerTier.HIGH);
super("MVTransformer", TRContent.Machine.MV_TRANSFORMER.block, EnumPowerTier.HIGH);
}
}