Revert "Rewrite to use new RebornCore Power API. Texture fixes."

This reverts commit b292fdd352.

# Conflicts:
#	src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
#	src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
#	src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
#	src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
#	src/main/java/techreborn/tiles/TileAlloyFurnace.java
#	src/main/java/techreborn/tiles/TileAlloySmelter.java
#	src/main/java/techreborn/tiles/TileAssemblingMachine.java
#	src/main/java/techreborn/tiles/TileImplosionCompressor.java
#	src/main/java/techreborn/tiles/TileIndustrialSawmill.java
#	src/main/java/techreborn/tiles/TileVacuumFreezer.java
#	src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java
#	src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java
#	src/main/java/techreborn/tiles/teir1/TileCompressor.java
#	src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java
#	src/main/java/techreborn/tiles/teir1/TileExtractor.java
#	src/main/java/techreborn/tiles/teir1/TileGrinder.java
#	src/main/java/techreborn/tiles/teir1/TileRecycler.java
This commit is contained in:
modmuss50 2016-08-10 00:45:07 +01:00
parent 9b882e75ce
commit cdae866b2d
87 changed files with 3721 additions and 1277 deletions

View file

@ -43,16 +43,16 @@ public class StackToolTipEvent
color = TextFormatting.YELLOW;
}
event.getToolTip().add(color + ""
+ PowerSystem.getLocalizedPower(
+ PowerSystem.getLocaliszedPower(
(int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getEnergy(event.getItemStack()))
+ TextFormatting.LIGHT_PURPLE + " stored");
event.getToolTip().add(Color.GREEN + ""
+ PowerSystem.getLocalizedPower(
+ PowerSystem.getLocaliszedPower(
(int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxPower(event.getItemStack()))
+ TextFormatting.LIGHT_PURPLE + " max");
event.getToolTip()
.add(TextFormatting.GREEN + "" + percentage + "%" + TextFormatting.LIGHT_PURPLE + " charged");
event.getToolTip().add(Color.GREEN + "" + PowerSystem.getLocalizedPower(
event.getToolTip().add(Color.GREEN + "" + PowerSystem.getLocaliszedPower(
(int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxTransfer(event.getItemStack()))
+ TextFormatting.LIGHT_PURPLE + " /tick in/out");
}

View file

@ -14,7 +14,7 @@ public class ContainerIndustrialGrinder extends ContainerCrafting {
TileIndustrialGrinder tile;
public ContainerIndustrialGrinder(TileIndustrialGrinder tileGrinder, EntityPlayer player) {
super(tileGrinder.crafter);
super(tileGrinder.getRecipeCrafter());
tile = tileGrinder;
this.player = player;

View file

@ -60,11 +60,11 @@ public class GuiAESU extends GuiContainer
{
this.fontRendererObj.drawString(I18n.translateToLocal("tile.techreborn.aesu.name"), 40, 10,
Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerAesu.euOut) + " /tick", 10, 20,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerAesu.euOut) + " /tick", 10, 20,
Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerAesu.storedEu) + " ", 10, 30,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerAesu.storedEu) + " ", 10, 30,
Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerAesu.euChange) + " change", 10, 40,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerAesu.euChange) + " change", 10, 40,
Color.WHITE.getRGB());
}

View file

@ -42,13 +42,15 @@ public class GuiAlloySmelter extends GuiContainer
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = alloysmelter.getProgressScaled(24);
if (j > 0) {
int j = 0;
j = alloysmelter.getProgressScaled(24);
if (j > 0)
{
this.drawTexturedModalRect(k + 79, l + 34, 176, 14, j + 1, 16);
}
j = (int)(alloysmelter.getEnergy() * 24f / alloysmelter.getMaxPower());
j = alloysmelter.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);

View file

@ -45,12 +45,15 @@ public class GuiAssemblingMachine extends GuiContainer
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = assemblingmachine.getProgressScaled(20);
if (j > 0) {
int j = 0;
j = assemblingmachine.getProgressScaled(20);
if (j > 0)
{
this.drawTexturedModalRect(k + 86, l + 34, 176, 14, j + 1, 16);
}
j = (int)(assemblingmachine.getEnergy() * 12f / assemblingmachine.getMaxPower());
j = assemblingmachine.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);

View file

@ -42,7 +42,9 @@ public class GuiBatbox extends GuiContainer
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = (int)(generator.getEnergy() * 24f / generator.getMaxPower());
int j = 0;
j = generator.getEnergyScaled(24);
if (j > 0)
{
this.drawTexturedModalRect(k + 109, l + 21 + 12, 176, 0, j + 1, 16);
@ -64,9 +66,9 @@ public class GuiBatbox extends GuiContainer
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(generator.getMaxPower()), 25, this.ySize - 140,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(generator.getMaxPower()), 25, this.ySize - 140,
4210752);
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerGenerator.energy), 25, this.ySize - 150,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerGenerator.energy), 25, this.ySize - 150,
4210752);
}
}

View file

@ -78,15 +78,17 @@ public class GuiBlastFurnace extends GuiContainer
l + 52 + 12 - 0, -1);
}
int j = 0;
this.mc.getTextureManager().bindTexture(texture);
int j = blastfurnace.getProgressScaled(24);
j = blastfurnace.getProgressScaled(24);
if (j > 0)
{
this.drawTexturedModalRect(k + 64, l + 37, 176, 14, j + 1, 16);
}
j = (int)(blastfurnace.getEnergy() * 12f / blastfurnace.getMaxPower());
if (j > 0) {
j = blastfurnace.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 9, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}

View file

@ -43,7 +43,9 @@ public class GuiCentrifuge extends GuiContainer
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = centrifuge.getProgressScaled(11);
int j = 0;
j = centrifuge.getProgressScaled(11);
if (j > 0)
{
this.drawTexturedModalRect(k + 83, l + 23 + 10 - j, 177, 15 + 10 - j, 10, j);
@ -52,8 +54,10 @@ public class GuiCentrifuge extends GuiContainer
this.drawTexturedModalRect(k + 68 + 10 - j, l + 38, 177 + 10 - j, 27, j, 10);
}
j = (int)(centrifuge.getEnergy() * 12f / centrifuge.getMaxPower());
if (j > 0) {
j = centrifuge.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 9, l + 32 + 12 - j, 176, 12 - j, 14, j + 2);
}
}

View file

@ -42,8 +42,9 @@ public class GuiChargeBench extends GuiContainer
int j = 0;
j = (int)(chargebench.getEnergy() * 12f / chargebench.getMaxPower());
if (j > 0) {
j = chargebench.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 10, l + 32 + 12 - j, 176, 12 - j, 14, j + 2);
}
}

View file

@ -51,8 +51,9 @@ public class GuiChemicalReactor extends GuiContainer
this.drawTexturedModalRect(k + 73, l + 39, 177, 15, 30, j);
}
j = (int)(chemicalReactor.getEnergy() * 12f / chemicalReactor.getMaxPower());
if (j > 0) {
j = chemicalReactor.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 9, l + 32 + 12 - j, 176, 12 - j, 14, j + 2);
}

View file

@ -34,16 +34,19 @@ public class GuiCompressor extends GuiContainer
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = compressor.getProgressScaled(24);
if (j > 0) {
int j = 0;
j = compressor.getProgressScaled(24);
if (j > 0)
{
this.drawTexturedModalRect(k + 78, l + 35, 176, 14, j + 1, 16);
}
j = (int)(compressor.getEnergy() * 12f / compressor.getMaxPower());
if (j > 0) {
j = compressor.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 24, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}
}
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_)

View file

@ -49,7 +49,7 @@ public class GuiDieselGenerator extends GuiContainer
this.fontRendererObj.drawString(containerDieselGenerator.fluid + "", 10, 30, 16448255);
this.fontRendererObj.drawString("Power Amount", 10, 40, 16448255);
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerDieselGenerator.energy) + "", 10, 50,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerDieselGenerator.energy) + "", 10, 50,
16448255);
}
}

View file

@ -34,16 +34,19 @@ public class GuiElectricFurnace extends GuiContainer
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = furnace.gaugeProgressScaled(24);
if (j > 0) {
int j = 0;
j = furnace.gaugeProgressScaled(24);
if (j > 0)
{
this.drawTexturedModalRect(k + 78, l + 34, 176, 14, j + 1, 16);
}
j = (int)(furnace.getEnergy() * 12f / furnace.getMaxPower());
if (j > 0) {
j = furnace.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 24, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}
}
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_)

View file

@ -35,13 +35,17 @@ public class GuiExtractor extends GuiContainer
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = extractor.getProgressScaled(24);
if (j > 0) {
int j = 0;
j = extractor.getProgressScaled(24);
if (j > 0)
{
this.drawTexturedModalRect(k + 78, l + 35, 176, 14, j + 1, 16);
}
j = (int)(extractor.getEnergy() * 12f / extractor.getMaxPower());
if (j > 0) {
j = extractor.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 24, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}
}

View file

@ -35,7 +35,7 @@ public class GuiFusionReactor extends GuiContainer
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerFusionReactor.energy), 11, 8, 16448255);
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerFusionReactor.energy), 11, 8, 16448255);
this.fontRendererObj.drawString("Coils: " + (containerFusionReactor.coilStatus == 1 ? "Yes" : "No"), 11, 16,
16448255);
if (containerFusionReactor.neededEU > 1 && containerFusionReactor.tickTime < 1)

View file

@ -42,8 +42,11 @@ public class GuiGenerator extends GuiContainer
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = (int)(generator.getEnergy() * 24f / generator.getMaxPower());
if (j > 0) {
int j = 0;
j = generator.getEnergyScaled(24);
if (j > 0)
{
this.drawTexturedModalRect(k + 109, l + 21 + 12, 176, 0, j + 1, 16);
}
@ -62,7 +65,7 @@ public class GuiGenerator extends GuiContainer
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerGenerator.energy), 25, this.ySize - 150,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerGenerator.energy), 25, this.ySize - 150,
4210752);
}
}

View file

@ -43,8 +43,9 @@ public class GuiGrinder extends GuiContainer
this.drawTexturedModalRect(k + 80, l + 36, 176, 14, j + 1, 16);
}
j = (int)(grinder.getEnergy() * 12f / grinder.getMaxPower());
if (j > 0) {
j = grinder.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 24, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}
}

View file

@ -85,11 +85,11 @@ public class GuiIDSU extends GuiContainer
{
this.fontRendererObj.drawString(I18n.translateToLocal("tile.techreborn.idsu.name"), 75, 10,
Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerIDSU.euOut) + "/tick", 10, 22,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerIDSU.euOut) + "/tick", 10, 22,
Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerIDSU.storedEu), 10, 32,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerIDSU.storedEu), 10, 32,
Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerIDSU.euChange) + " change", 10, 42,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerIDSU.euChange) + " change", 10, 42,
Color.WHITE.getRGB());
}

View file

@ -50,11 +50,12 @@ public class GuiImplosionCompressor extends GuiContainer {
this.drawTexturedModalRect(k + 61, l + 37, 176, 14, j + 1, 16);
}
j = (int) (compresser.getEnergy() * 12f / compresser.getMaxPower());
if (j > 0) {
this.drawTexturedModalRect(k + 14, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}
}
j = compresser.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 14, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}
}
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
String name = I18n.translateToLocal("tile.techreborn.implosioncompressor.name");

View file

@ -52,7 +52,7 @@ public class GuiIndustrialElectrolyzer extends GuiContainer
this.drawTexturedModalRect(k + 72, l + 38, 176, 14, j + 1, 16);
}
j = (int)(eletrolyzer.getEnergy() * 12f / eletrolyzer.getMaxPower());
j = eletrolyzer.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 134, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);

View file

@ -93,4 +93,5 @@ public class GuiIndustrialGrinder extends GuiContainer {
this.ySize - 96 + 2, 4210752);
}
}

View file

@ -54,8 +54,15 @@ public class GuiIndustrialSawmill extends GuiContainer
if(!sawmill.tank.isEmpty()) {
drawFluid(sawmill.tank.getFluid(), k + 11, l + 66, 12, 47, sawmill.tank.getCapacity());
<<<<<<< HEAD
mc.renderEngine.bindTexture(texture);
drawTexturedModalRect(k + 14, l + 24, 179, 88, 9, 37);
=======
j = sawmill.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 33, l + 65 + 12 - j, 176, 12 - j, 14, j + 2);
>>>>>>> parent of b292fdd... Rewrite to use new RebornCore Power API. Texture fixes.
}
if (!sawmill.getMutliBlock()) {

View file

@ -43,14 +43,14 @@ public class GuiLESU extends GuiContainer
{
this.fontRendererObj.drawString(I18n.translateToLocal("tile.techreborn.lesu.name"), 40, 10,
Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerLesu.euOut) + "/t", 10, 20,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerLesu.euOut) + "/t", 10, 20,
Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerLesu.storedEu), 10, 30,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerLesu.storedEu), 10, 30,
Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerLesu.euChange) + " change", 10, 40,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerLesu.euChange) + " change", 10, 40,
Color.WHITE.getRGB());
this.fontRendererObj.drawString(containerLesu.connectedBlocks + " blocks", 10, 50, Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerLesu.euStorage) + " max", 10, 60,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerLesu.euStorage) + " max", 10, 60,
Color.WHITE.getRGB());
}

View file

@ -45,8 +45,11 @@ public class GuiMFE extends GuiContainer
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = (int)(generator.getEnergy() * 24f / generator.getMaxPower());
if (j > 0) {
int j = 0;
j = generator.getEnergyScaled(24);
if (j > 0)
{
this.drawTexturedModalRect(k + 109, l + 21 + 12, 176, 0, j + 1, 16);
}
//
@ -66,9 +69,9 @@ public class GuiMFE extends GuiContainer
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), this.xSize - 60,
this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(generator.getMaxPower()), 110, this.ySize - 150,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(generator.getMaxPower()), 110, this.ySize - 150,
4210752);
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerGenerator.energy), 110, this.ySize - 160,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerGenerator.energy), 110, this.ySize - 160,
4210752);
}
}

View file

@ -45,8 +45,11 @@ public class GuiMFSU extends GuiContainer
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = (int)(generator.getEnergy() * 24f / generator.getMaxPower());
if (j > 0) {
int j = 0;
j = generator.getEnergyScaled(24);
if (j > 0)
{
this.drawTexturedModalRect(k + 109, l + 21 + 12, 176, 0, j + 1, 16);
}
//
@ -66,9 +69,9 @@ public class GuiMFSU extends GuiContainer
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), this.xSize - 60,
this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(generator.getMaxPower()), 110, this.ySize - 150,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(generator.getMaxPower()), 110, this.ySize - 150,
4210752);
this.fontRendererObj.drawString(PowerSystem.getLocalizedPower(containerGenerator.energy), 110, this.ySize - 160,
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerGenerator.energy), 110, this.ySize - 160,
4210752);
}
}

View file

@ -42,7 +42,7 @@ public class GuiRecycler extends GuiContainer
this.drawTexturedModalRect(k + 78, l + 35, 176, 14, j + 1, 16);
}
j = (int)(compressor.getEnergy() * 12f / compressor.getMaxPower());
j = compressor.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 24, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);

View file

@ -38,7 +38,7 @@ public class GuiRollingMachine extends GuiContainer
int j = this.containerRollingMachine.getBurnTimeRemainingScaled(24);
this.drawTexturedModalRect(k + 91, l + 34, 176, 14, j + 1, 19);
j = (int)(rollingMachine.getEnergy() * 12f / rollingMachine.getMaxPower());
j = this.rollingMachine.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 7, l + 33 + 12 - j, 176, 12 - j, 14, j + 2);

View file

@ -44,7 +44,7 @@ public class GuiScrapboxinator extends GuiContainer
this.drawTexturedModalRect(k + 78, l + 35, 176, 14, j + 1, 16);
}
j = (int)(tile.getEnergy() * 12f / tile.getMaxPower());
j = tile.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 24, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);

View file

@ -43,7 +43,15 @@ public class GuiVacuumFreezer extends GuiContainer {
this.fontRendererObj.drawString(I18n.translateToLocal("techreborn.message.missingmultiblock"), k + 38, l + 52 + 12, -1);
}
<<<<<<< HEAD
}
=======
j = crafter.getEnergyScaled(12);
if (j > 0)
{
this.drawTexturedModalRect(k + 26, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}
>>>>>>> parent of b292fdd... Rewrite to use new RebornCore Power API. Texture fixes.
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
String name = I18n.translateToLocal("tile.techreborn.vacuumfreezer.name");