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

@ -20,23 +20,23 @@ public class AdvancedMachines extends TitledPage {
buttonList.clear();
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 10, getYMin() + 20, 0, 46, 100, 20,
new ItemStack(ModBlocks.blastFurnace), ModBlocks.blastFurnace.getUnlocalizedName(),
ttl(ModBlocks.blastFurnace.getLocalizedName())));
new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), ModBlocks.INDUSTRIAL_BLAST_FURNACE.getUnlocalizedName(),
ttl(ModBlocks.INDUSTRIAL_BLAST_FURNACE.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 10, getYMin() + 40, 0, 46, 100, 20,
new ItemStack(ModBlocks.industrialSawmill), ModBlocks.industrialSawmill.getUnlocalizedName(),
ttl(ModBlocks.industrialSawmill.getLocalizedName())));
new ItemStack(ModBlocks.INDUSTRIAL_SAWMILL), ModBlocks.INDUSTRIAL_SAWMILL.getUnlocalizedName(),
ttl(ModBlocks.INDUSTRIAL_SAWMILL.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 10, getYMin() + 60, 0, 46, 100, 20,
new ItemStack(ModBlocks.industrialElectrolyzer), ModBlocks.industrialElectrolyzer.getUnlocalizedName(),
ttl(ModBlocks.industrialElectrolyzer.getLocalizedName())));
new ItemStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), ModBlocks.INDUSTRIAL_ELECTROLYZER.getUnlocalizedName(),
ttl(ModBlocks.INDUSTRIAL_ELECTROLYZER.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 10, getYMin() + 80, 0, 46, 100, 20,
new ItemStack(ModBlocks.industrialGrinder), ModBlocks.industrialGrinder.getUnlocalizedName(),
ttl(ModBlocks.industrialGrinder.getLocalizedName())));
new ItemStack(ModBlocks.INDUSTRIAL_GRINDER), ModBlocks.INDUSTRIAL_GRINDER.getUnlocalizedName(),
ttl(ModBlocks.INDUSTRIAL_GRINDER.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(5, getXMin() + 10, getYMin() + 100, 0, 46, 100, 20,
new ItemStack(ModBlocks.implosionCompressor), ModBlocks.implosionCompressor.getUnlocalizedName(),
ttl(ModBlocks.implosionCompressor.getLocalizedName())));
new ItemStack(ModBlocks.IMPLOSION_COMPRESSOR), ModBlocks.IMPLOSION_COMPRESSOR.getUnlocalizedName(),
ttl(ModBlocks.IMPLOSION_COMPRESSOR.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(6, getXMin() + 10, getYMin() + 120, 0, 46, 100, 20,
new ItemStack(ModBlocks.centrifuge), ModBlocks.centrifuge.getUnlocalizedName(),
ttl(ModBlocks.centrifuge.getLocalizedName())));
new ItemStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), ModBlocks.INDUSTRIAL_CENTRIFUGE.getUnlocalizedName(),
ttl(ModBlocks.INDUSTRIAL_CENTRIFUGE.getLocalizedName())));
}
@Override
@ -44,16 +44,16 @@ public class AdvancedMachines extends TitledPage {
if (button.id == 0)
collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE);
if (button.id == 1)
collection.changeActivePage(ModBlocks.blastFurnace.getLocalizedName());
collection.changeActivePage(ModBlocks.INDUSTRIAL_BLAST_FURNACE.getLocalizedName());
if (button.id == 2)
collection.changeActivePage(ModBlocks.industrialSawmill.getLocalizedName());
collection.changeActivePage(ModBlocks.INDUSTRIAL_SAWMILL.getLocalizedName());
if (button.id == 3)
collection.changeActivePage(ModBlocks.industrialElectrolyzer.getLocalizedName());
collection.changeActivePage(ModBlocks.INDUSTRIAL_ELECTROLYZER.getLocalizedName());
if (button.id == 4)
collection.changeActivePage(ModBlocks.industrialGrinder.getLocalizedName());
collection.changeActivePage(ModBlocks.INDUSTRIAL_GRINDER.getLocalizedName());
if (button.id == 5)
collection.changeActivePage(ModBlocks.implosionCompressor.getLocalizedName());
collection.changeActivePage(ModBlocks.IMPLOSION_COMPRESSOR.getLocalizedName());
if (button.id == 6)
collection.changeActivePage(ModBlocks.centrifuge.getLocalizedName());
collection.changeActivePage(ModBlocks.INDUSTRIAL_CENTRIFUGE.getLocalizedName());
}
}

View file

@ -20,20 +20,20 @@ public class BasicMachinesPage extends TitledPage {
buttonList.clear();
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20,
new ItemStack(ModBlocks.grinder), ModBlocks.grinder.getUnlocalizedName(),
ttl(ModBlocks.grinder.getLocalizedName())));
new ItemStack(ModBlocks.GRINDER), ModBlocks.GRINDER.getUnlocalizedName(),
ttl(ModBlocks.GRINDER.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
new ItemStack(ModBlocks.electricFurnace), ModBlocks.electricFurnace.getUnlocalizedName(),
ttl(ModBlocks.electricFurnace.getLocalizedName())));
new ItemStack(ModBlocks.ELECTRIC_FURNACE), ModBlocks.ELECTRIC_FURNACE.getUnlocalizedName(),
ttl(ModBlocks.ELECTRIC_FURNACE.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20,
new ItemStack(ModBlocks.alloySmelter), ModBlocks.alloySmelter.getUnlocalizedName(),
ttl(ModBlocks.alloySmelter.getLocalizedName())));
new ItemStack(ModBlocks.ALLOY_SMELTER), ModBlocks.ALLOY_SMELTER.getUnlocalizedName(),
ttl(ModBlocks.ALLOY_SMELTER.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20,
new ItemStack(ModBlocks.extractor), ModBlocks.extractor.getUnlocalizedName(),
ttl(ModBlocks.extractor.getLocalizedName())));
new ItemStack(ModBlocks.EXTRACTOR), ModBlocks.EXTRACTOR.getUnlocalizedName(),
ttl(ModBlocks.EXTRACTOR.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(5, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
new ItemStack(ModBlocks.compressor), ModBlocks.compressor.getUnlocalizedName(),
ttl(ModBlocks.compressor.getLocalizedName())));
new ItemStack(ModBlocks.COMPRESSOR), ModBlocks.COMPRESSOR.getUnlocalizedName(),
ttl(ModBlocks.COMPRESSOR.getLocalizedName())));
}
@Override
@ -41,14 +41,14 @@ public class BasicMachinesPage extends TitledPage {
if (button.id == 0)
collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE);
if (button.id == 1)
collection.changeActivePage(ModBlocks.grinder.getLocalizedName());
collection.changeActivePage(ModBlocks.GRINDER.getLocalizedName());
if (button.id == 2)
collection.changeActivePage(ModBlocks.electricFurnace.getLocalizedName());
collection.changeActivePage(ModBlocks.ELECTRIC_FURNACE.getLocalizedName());
if (button.id == 3)
collection.changeActivePage(ModBlocks.alloySmelter.getLocalizedName());
collection.changeActivePage(ModBlocks.ALLOY_SMELTER.getLocalizedName());
if (button.id == 4)
collection.changeActivePage(ModBlocks.extractor.getLocalizedName());
collection.changeActivePage(ModBlocks.EXTRACTOR.getLocalizedName());
if (button.id == 5)
collection.changeActivePage(ModBlocks.compressor.getLocalizedName());
collection.changeActivePage(ModBlocks.COMPRESSOR.getLocalizedName());
}
}

View file

@ -25,16 +25,16 @@ public class ContentsPage extends TitledPage {
ItemPlates.getPlateByName("iron"), Reference.pageNames.GETTINGSTARTED_PAGE,
ttl(Reference.GETTINGSTARTED_KEY)));
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
new ItemStack(ModBlocks.generator), Reference.pageNames.GENERATINGPOWER_PAGE,
new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR), Reference.pageNames.GENERATINGPOWER_PAGE,
ttl(Reference.GENERATINGPOWER_KEY)));
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20,
new ItemStack(ModBlocks.electricFurnace), Reference.pageNames.BASICMACHINES_PAGE,
new ItemStack(ModBlocks.ELECTRIC_FURNACE), Reference.pageNames.BASICMACHINES_PAGE,
ttl(Reference.BASICMACHINES_KEY)));
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20,
new ItemStack(ModBlocks.blastFurnace), Reference.pageNames.ADVANCEDMACHINES_PAGE,
new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), Reference.pageNames.ADVANCEDMACHINES_PAGE,
ttl(Reference.ADVANCEDMACHINES_KEY)));
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
new ItemStack(ModItems.ironDrill), Reference.pageNames.TOOLS_PAGE, ttl(Reference.TOOLS_KEY)));
new ItemStack(ModItems.STEEL_DRILL), Reference.pageNames.TOOLS_PAGE, ttl(Reference.TOOLS_KEY)));
}
@Override

View file

@ -20,20 +20,20 @@ public class GeneratingPowerPage extends TitledPage {
buttonList.clear();
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20,
new ItemStack(ModBlocks.generator), ModBlocks.generator.getUnlocalizedName(),
ttl(ModBlocks.generator.getLocalizedName())));
new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR), ModBlocks.SOLID_FUEL_GENEREATOR.getUnlocalizedName(),
ttl(ModBlocks.SOLID_FUEL_GENEREATOR.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
new ItemStack(ModBlocks.thermalGenerator), ModBlocks.thermalGenerator.getUnlocalizedName(),
ttl(ModBlocks.thermalGenerator.getLocalizedName())));
new ItemStack(ModBlocks.THERMAL_GENERATOR), ModBlocks.THERMAL_GENERATOR.getUnlocalizedName(),
ttl(ModBlocks.THERMAL_GENERATOR.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20,
new ItemStack(ModBlocks.solarPanel), ModBlocks.solarPanel.getUnlocalizedName(),
ttl(ModBlocks.solarPanel.getLocalizedName())));
new ItemStack(ModBlocks.SOLAR_PANEL), ModBlocks.SOLAR_PANEL.getUnlocalizedName(),
ttl(ModBlocks.SOLAR_PANEL.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20,
new ItemStack(ModBlocks.heatGenerator), ModBlocks.heatGenerator.getUnlocalizedName(),
ttl(ModBlocks.heatGenerator.getLocalizedName())));
new ItemStack(ModBlocks.HEAT_GENERATOR), ModBlocks.HEAT_GENERATOR.getUnlocalizedName(),
ttl(ModBlocks.HEAT_GENERATOR.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(5, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
new ItemStack(ModBlocks.lightningRod), ModBlocks.lightningRod.getUnlocalizedName(),
ttl(ModBlocks.lightningRod.getLocalizedName())));
new ItemStack(ModBlocks.LIGHTNING_ROD), ModBlocks.LIGHTNING_ROD.getUnlocalizedName(),
ttl(ModBlocks.LIGHTNING_ROD.getLocalizedName())));
}
@Override
@ -41,14 +41,14 @@ public class GeneratingPowerPage extends TitledPage {
if (button.id == 0)
collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE);
if (button.id == 1)
collection.changeActivePage(ModBlocks.generator.getLocalizedName());
collection.changeActivePage(ModBlocks.SOLID_FUEL_GENEREATOR.getLocalizedName());
if (button.id == 2)
collection.changeActivePage(ModBlocks.thermalGenerator.getLocalizedName());
collection.changeActivePage(ModBlocks.THERMAL_GENERATOR.getLocalizedName());
if (button.id == 3)
collection.changeActivePage(ModBlocks.solarPanel.getLocalizedName());
collection.changeActivePage(ModBlocks.SOLAR_PANEL.getLocalizedName());
if (button.id == 4)
collection.changeActivePage(ModBlocks.heatGenerator.getLocalizedName());
collection.changeActivePage(ModBlocks.HEAT_GENERATOR.getLocalizedName());
if (button.id == 5)
collection.changeActivePage(ModBlocks.lightningRod.getLocalizedName());
collection.changeActivePage(ModBlocks.LIGHTNING_ROD.getLocalizedName());
}
}

View file

@ -21,23 +21,23 @@ public class ToolsPage extends TitledPage {
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
ButtonUtil.addNextButton(1, width / 2 + 40, height / 2 + 64, buttonList);
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20,
new ItemStack(ModItems.ironDrill), ModItems.ironDrill.getUnlocalizedName(),
ttl(ModItems.ironDrill.getUnlocalizedName() + ".name")));
new ItemStack(ModItems.STEEL_DRILL), ModItems.STEEL_DRILL.getUnlocalizedName(),
ttl(ModItems.STEEL_DRILL.getUnlocalizedName() + ".name")));
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
new ItemStack(ModItems.diamondDrill), ModItems.diamondDrill.getUnlocalizedName(),
ttl(ModItems.diamondDrill.getUnlocalizedName() + ".name")));
new ItemStack(ModItems.DIAMOND_DRILL), ModItems.DIAMOND_DRILL.getUnlocalizedName(),
ttl(ModItems.DIAMOND_DRILL.getUnlocalizedName() + ".name")));
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20,
new ItemStack(ModItems.advancedDrill), ModItems.advancedDrill.getUnlocalizedName(),
ttl(ModItems.advancedDrill.getUnlocalizedName() + ".name")));
new ItemStack(ModItems.ADVANCED_DRILL), ModItems.ADVANCED_DRILL.getUnlocalizedName(),
ttl(ModItems.ADVANCED_DRILL.getUnlocalizedName() + ".name")));
buttonList.add(new GuiButtonItemTexture(5, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20,
new ItemStack(ModItems.ironChainsaw), ModItems.ironChainsaw.getUnlocalizedName(),
ttl(ModItems.ironChainsaw.getUnlocalizedName() + ".name")));
new ItemStack(ModItems.STEEL_CHAINSAW), ModItems.STEEL_CHAINSAW.getUnlocalizedName(),
ttl(ModItems.STEEL_CHAINSAW.getUnlocalizedName() + ".name")));
buttonList.add(new GuiButtonItemTexture(6, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
new ItemStack(ModItems.diamondChainsaw), ModItems.diamondChainsaw.getUnlocalizedName(),
ttl(ModItems.diamondChainsaw.getUnlocalizedName() + ".name")));
new ItemStack(ModItems.DIAMOND_CHAINSAW), ModItems.DIAMOND_CHAINSAW.getUnlocalizedName(),
ttl(ModItems.DIAMOND_CHAINSAW.getUnlocalizedName() + ".name")));
buttonList.add(new GuiButtonItemTexture(7, getXMin() + 20, getYMin() + 120, 0, 46, 100, 20,
new ItemStack(ModItems.advancedChainsaw), ModItems.advancedChainsaw.getUnlocalizedName(),
ttl(ModItems.advancedChainsaw.getUnlocalizedName() + ".name")));
new ItemStack(ModItems.ADVANCED_CHAINSAW), ModItems.ADVANCED_CHAINSAW.getUnlocalizedName(),
ttl(ModItems.ADVANCED_CHAINSAW.getUnlocalizedName() + ".name")));
}
@Override
@ -48,27 +48,27 @@ public class ToolsPage extends TitledPage {
buttonList.clear();
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
buttonList.add(new GuiButtonItemTexture(8, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20,
new ItemStack(ModItems.omniTool), ModItems.omniTool.getUnlocalizedName(),
ttl(ModItems.omniTool.getUnlocalizedName() + ".name")));
new ItemStack(ModItems.OMNI_TOOL), ModItems.OMNI_TOOL.getUnlocalizedName(),
ttl(ModItems.OMNI_TOOL.getUnlocalizedName() + ".name")));
buttonList.add(new GuiButtonItemTexture(9, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
new ItemStack(ModItems.treeTap), ModItems.treeTap.getUnlocalizedName(),
ttl(ModItems.treeTap.getUnlocalizedName() + ".name")));
new ItemStack(ModItems.TREE_TAP), ModItems.TREE_TAP.getUnlocalizedName(),
ttl(ModItems.TREE_TAP.getUnlocalizedName() + ".name")));
}
if (button.id == 2)
collection.changeActivePage(ModItems.ironDrill.getUnlocalizedName() + ".name");
collection.changeActivePage(ModItems.STEEL_DRILL.getUnlocalizedName() + ".name");
if (button.id == 3)
collection.changeActivePage(ModItems.diamondDrill.getUnlocalizedName() + ".name");
collection.changeActivePage(ModItems.DIAMOND_DRILL.getUnlocalizedName() + ".name");
if (button.id == 4)
collection.changeActivePage(ModItems.advancedDrill.getUnlocalizedName() + ".name");
collection.changeActivePage(ModItems.ADVANCED_DRILL.getUnlocalizedName() + ".name");
if (button.id == 5)
collection.changeActivePage(ModItems.ironChainsaw.getUnlocalizedName() + ".name");
collection.changeActivePage(ModItems.STEEL_CHAINSAW.getUnlocalizedName() + ".name");
if (button.id == 6)
collection.changeActivePage(ModItems.diamondChainsaw.getUnlocalizedName() + ".name");
collection.changeActivePage(ModItems.DIAMOND_CHAINSAW.getUnlocalizedName() + ".name");
if (button.id == 7)
collection.changeActivePage(ModItems.advancedChainsaw.getUnlocalizedName() + ".name");
collection.changeActivePage(ModItems.ADVANCED_CHAINSAW.getUnlocalizedName() + ".name");
if (button.id == 8)
collection.changeActivePage(ModItems.omniTool.getUnlocalizedName() + ".name");
collection.changeActivePage(ModItems.OMNI_TOOL.getUnlocalizedName() + ".name");
if (button.id == 9)
collection.changeActivePage(ModItems.treeTap.getUnlocalizedName() + ".name");
collection.changeActivePage(ModItems.TREE_TAP.getUnlocalizedName() + ".name");
}
}