Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class.

This commit is contained in:
Prospector 2016-12-31 23:29:32 -08:00
parent 6d931b232d
commit 6a70424252
133 changed files with 1579 additions and 1622 deletions

View file

@ -102,7 +102,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable {
public ItemStack getDropWithNBT() {
NBTTagCompound tileEntity = new NBTTagCompound();
ItemStack dropStack = new ItemStack(ModBlocks.AESU, 1);
ItemStack dropStack = new ItemStack(ModBlocks.ADJUSTABLE_SU, 1);
writeToNBTWithoutCoords(tileEntity);
dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity);

View file

@ -255,7 +255,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.alloyFurnace, 1);
return new ItemStack(ModBlocks.IRON_ALLOY_FURNACE, 1);
}
public boolean isComplete() {

View file

@ -66,7 +66,7 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable,
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.alloySmelter, 1);
return new ItemStack(ModBlocks.ALLOY_SMELTER, 1);
}
public boolean isComplete() {

View file

@ -6,15 +6,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import reborncore.api.power.EnumPowerTier;
import reborncore.api.recipe.IRecipeCrafterProvider;
import reborncore.api.tile.IContainerProvider;
import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable;
import reborncore.common.container.RebornContainer;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.recipes.RecipeCrafter;
import reborncore.common.util.Inventory;
import techreborn.api.Reference;
import techreborn.client.container.ContainerAssemblingMachine;
import techreborn.init.ModBlocks;
public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider {
@ -62,7 +59,7 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.assemblyMachine, 1);
return new ItemStack(ModBlocks.ASSEMBLY_MACHINE, 1);
}
public boolean isComplete() {

View file

@ -88,7 +88,7 @@ public class TileCentrifuge extends TilePowerAcceptor
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.centrifuge, 1);
return new ItemStack(ModBlocks.INDUSTRIAL_CENTRIFUGE, 1);
}
public boolean isComplete() {

View file

@ -63,7 +63,7 @@ public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, I
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.chargeBench, 1);
return new ItemStack(ModBlocks.CHARGE_O_MAT, 1);
}
public boolean isComplete() {

View file

@ -61,7 +61,7 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.chemicalReactor, 1);
return new ItemStack(ModBlocks.CHEMICAL_REACTOR, 1);
}
public boolean isComplete() {

View file

@ -45,7 +45,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.chunkLoader, 1);
return new ItemStack(ModBlocks.CHUNK_LOADER, 1);
}
public boolean isComplete() {

View file

@ -64,7 +64,7 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.industrialElectrolyzer, 1);
return new ItemStack(ModBlocks.INDUSTRIAL_ELECTROLYZER, 1);
}
public boolean isComplete() {

View file

@ -48,7 +48,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.matterFabricator, 1);
return new ItemStack(ModBlocks.MATTER_FABRICATOR, 1);
}
public boolean isComplete() {
@ -121,15 +121,15 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
private boolean spaceForOutput() {
return inventory.getStackInSlot(6) == ItemStack.EMPTY
|| ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.uuMatter), true, true)
|| ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.UU_MATTER), true, true)
&& inventory.getStackInSlot(6).getCount() < 64;
}
private void addOutputProducts() {
if (inventory.getStackInSlot(6) == ItemStack.EMPTY) {
inventory.setInventorySlotContents(6, new ItemStack(ModItems.uuMatter));
} else if (ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.uuMatter), true, true)) {
inventory.setInventorySlotContents(6, new ItemStack(ModItems.UU_MATTER));
} else if (ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.UU_MATTER), true, true)) {
inventory.getStackInSlot(6).setCount(Math.min(64, 1 + inventory.getStackInSlot(6).getCount()));
}
}
@ -152,9 +152,9 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
public int getValue(ItemStack itemStack) {
// int value = getValue(Recipes.matterAmplifier.getOutputFor(itemStack,
// false));
if (itemStack.getItem() == ModItems.parts && itemStack.getItemDamage() == ItemParts.getPartByName("scrap").getItemDamage()) {
if (itemStack.getItem() == ModItems.PARTS && itemStack.getItemDamage() == ItemParts.getPartByName("scrap").getItemDamage()) {
return 5000;
} else if (itemStack.getItem() == ModItems.scrapBox) {
} else if (itemStack.getItem() == ModItems.SCRAP_BOX) {
return 45000;
}
return 0;

View file

@ -113,7 +113,7 @@ public class TileQuantumTank extends TileLegacyMachineBase
public ItemStack getDropWithNBT() {
NBTTagCompound tileEntity = new NBTTagCompound();
ItemStack dropStack = new ItemStack(ModBlocks.quantumTank, 1);
ItemStack dropStack = new ItemStack(ModBlocks.QUANTUM_TANK, 1);
writeToNBTWithoutCoords(tileEntity);
dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity);

View file

@ -140,7 +140,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.rollingMachine, 1);
return new ItemStack(ModBlocks.ROLLING_MACHINE, 1);
}
@Override

View file

@ -125,7 +125,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.scrapboxinator, 1);
return new ItemStack(ModBlocks.SCRAPBOXINATOR, 1);
}
public boolean isComplete() {
@ -143,7 +143,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable
if (slotIndex == 2)
return false;
if (slotIndex == 1) {
if (itemStack.getItem() == ModItems.scrapBox) {
if (itemStack.getItem() == ModItems.SCRAP_BOX) {
return true;
}
}

View file

@ -131,7 +131,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
}
private boolean isCoil(int x, int y, int z) {
return world.getBlockState(new BlockPos(x, y, z)).getBlock() == ModBlocks.fusionCoil;
return world.getBlockState(new BlockPos(x, y, z)).getBlock() == ModBlocks.FUSION_COIL;
}
@Override

View file

@ -16,7 +16,7 @@ public class TileDieselGenerator extends TileBaseFluidGenerator {
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.dieselGenerator, 1);
return new ItemStack(ModBlocks.DIESEL_GENERATOR, 1);
}
@Override

View file

@ -82,7 +82,7 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.dragonEggEnergySiphoner, 1);
return new ItemStack(ModBlocks.DRAGON_EGG_SIPHONER, 1);
}
public boolean isComplete() {

View file

@ -15,7 +15,7 @@ public class TileGasTurbine extends TileBaseFluidGenerator {
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.gasTurbine, 1);
return new ItemStack(ModBlocks.GAS_TURBINE, 1);
}
@Override

View file

@ -134,7 +134,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
@Override
public ItemStack getWrenchDrop(EntityPlayer p0) {
return new ItemStack(ModBlocks.generator);
return new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR);
}
@Override

View file

@ -86,7 +86,7 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.heatGenerator, 1);
return new ItemStack(ModBlocks.HEAT_GENERATOR, 1);
}
public boolean isComplete() {

View file

@ -15,7 +15,7 @@ public class TileSemifluidGenerator extends TileBaseFluidGenerator {
@Override
public ItemStack getWrenchDrop(EntityPlayer arg0) {
return new ItemStack(ModBlocks.semiFluidGenerator, 1);
return new ItemStack(ModBlocks.SEMIFLUID_GENERATOR, 1);
}
@Override

View file

@ -20,7 +20,7 @@ public class TileThermalGenerator extends TileBaseFluidGenerator {
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.thermalGenerator, 1);
return new ItemStack(ModBlocks.THERMAL_GENERATOR, 1);
}
@Override

View file

@ -157,7 +157,7 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable {
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
NBTTagCompound tileEntity = new NBTTagCompound();
ItemStack dropStack = new ItemStack(ModBlocks.IDSU, 1);
ItemStack dropStack = new ItemStack(ModBlocks.INTERDIMENSIONAL_SU, 1);
writeToNBT(tileEntity);
dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity);

View file

@ -24,7 +24,7 @@ public class MultiblockChecker {
public boolean checkCasing(int offX, int offY, int offZ, int type) {
IBlockState block = getBlock(offX, offY, offZ);
if (block.getBlock() == ModBlocks.machineCasing) {
if (block.getBlock() == ModBlocks.MACHINE_CASINGS) {
if (block.getValue(BlockMachineCasing.METADATA) == type)
return true;
}

View file

@ -75,7 +75,7 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.blastFurnace, 1);
return new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE, 1);
}
public int getHeat() {

View file

@ -60,7 +60,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.implosionCompressor, 1);
return new ItemStack(ModBlocks.IMPLOSION_COMPRESSOR, 1);
}
public boolean getMutliBlock() {

View file

@ -77,7 +77,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.industrialGrinder, 1);
return new ItemStack(ModBlocks.INDUSTRIAL_GRINDER, 1);
}
public boolean getMutliBlock() {

View file

@ -131,7 +131,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.industrialSawmill, 1);
return new ItemStack(ModBlocks.INDUSTRIAL_SAWMILL, 1);
}
@Override

View file

@ -100,7 +100,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable,
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.alloySmelter, 1);
return new ItemStack(ModBlocks.ALLOY_SMELTER, 1);
}
@Override

View file

@ -12,7 +12,7 @@ import java.util.List;
public class TileBatBox extends TileEnergyStorage implements IListInfoProvider {
public TileBatBox() {
super("BatBox", 2, ModBlocks.batBox, EnumPowerTier.LOW, 32, 32, 40000);
super("BatBox", 2, ModBlocks.BATTERY_BOX, EnumPowerTier.LOW, 32, 32, 40000);
}
@Override

View file

@ -9,7 +9,7 @@ import techreborn.init.ModBlocks;
public class TileMFE extends TileEnergyStorage {
public TileMFE() {
super("MFE", 2, ModBlocks.MFE, EnumPowerTier.MEDIUM, 512, 512, 600000);
super("MFE", 2, ModBlocks.MVSU, EnumPowerTier.MEDIUM, 512, 512, 600000);
}
}

View file

@ -9,6 +9,6 @@ import techreborn.init.ModBlocks;
public class TileMFSU extends TileEnergyStorage {
public TileMFSU() {
super("MFSU", 2, ModBlocks.MFSU, EnumPowerTier.HIGH, 2048, 2048, 1000000);
super("MFSU", 2, ModBlocks.HVSU, EnumPowerTier.HIGH, 2048, 2048, 1000000);
}
}

View file

@ -62,7 +62,7 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.compressor, 1);
return new ItemStack(ModBlocks.COMPRESSOR, 1);
}
public boolean isComplete() {

View file

@ -140,7 +140,7 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.electricFurnace, 1);
return new ItemStack(ModBlocks.ELECTRIC_FURNACE, 1);
}
public boolean isComplete() {

View file

@ -67,7 +67,7 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable, IIn
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.extractor, 1);
return new ItemStack(ModBlocks.EXTRACTOR, 1);
}
public boolean isComplete() {

View file

@ -72,7 +72,7 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IInve
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.grinder, 1);
return new ItemStack(ModBlocks.GRINDER, 1);
}
public boolean isComplete() {

View file

@ -141,7 +141,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.recycler, 1);
return new ItemStack(ModBlocks.RECYCLER, 1);
}
public boolean isComplete() {

View file

@ -10,7 +10,7 @@ import techreborn.init.ModBlocks;
public class TileHVTransformer extends TileTransformer {
public TileHVTransformer() {
super("HVTransformer", ModBlocks.HVT, EnumPowerTier.EXTREME, ConfigTechReborn.HVTransformerMaxInput, ConfigTechReborn.HVTransformerMaxOutput, ConfigTechReborn.HVTransformerMaxInput * 2);
super("HVTransformer", ModBlocks.HV_TRANSFORMER, EnumPowerTier.EXTREME, ConfigTechReborn.HVTransformerMaxInput, ConfigTechReborn.HVTransformerMaxOutput, ConfigTechReborn.HVTransformerMaxInput * 2);
}
}

View file

@ -10,7 +10,7 @@ import techreborn.init.ModBlocks;
public class TileLVTransformer extends TileTransformer {
public TileLVTransformer() {
super("LVTransformer", ModBlocks.LVT, EnumPowerTier.LOW, ConfigTechReborn.LVTransformerMaxInput, ConfigTechReborn.LVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput * 2);
super("LVTransformer", ModBlocks.LV_TRANSFORMER, EnumPowerTier.LOW, ConfigTechReborn.LVTransformerMaxInput, ConfigTechReborn.LVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput * 2);
}
}

View file

@ -10,7 +10,7 @@ import techreborn.init.ModBlocks;
public class TileMVTransformer extends TileTransformer {
public TileMVTransformer() {
super("MVTransformer", ModBlocks.MVT, EnumPowerTier.HIGH, ConfigTechReborn.MVTransformerMaxInput, ConfigTechReborn.MVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput * 2);
super("MVTransformer", ModBlocks.MV_TRANSFORMER, EnumPowerTier.HIGH, ConfigTechReborn.MVTransformerMaxInput, ConfigTechReborn.MVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput * 2);
}
@Override