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,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());
}
}