Mappings update

This commit is contained in:
modmuss50 2017-06-13 22:07:49 +01:00
parent 3400f42962
commit 708ccc758a
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
82 changed files with 236 additions and 236 deletions

View file

@ -90,7 +90,7 @@ if (ENV.BUILD_NUMBER) {
minecraft { minecraft {
version = "1.12-14.21.0.2321" version = "1.12-14.21.0.2321"
mappings = "snapshot_20161220" mappings = "snapshot_20170613"
replace "@MODVERSION@", project.version replace "@MODVERSION@", project.version
// makeObfSourceJar = false // makeObfSourceJar = false
useDepAts = true useDepAts = true

View file

@ -101,7 +101,7 @@ public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRota
itemStack.copy()); itemStack.copy());
if (itemStack.hasTagCompound()) { if (itemStack.hasTagCompound()) {
entityItem.getEntityItem().setTagCompound(itemStack.getTagCompound().copy()); entityItem.getItem().setTagCompound(itemStack.getTagCompound().copy());
} }
final float factor = 0.05F; final float factor = 0.05F;

View file

@ -105,7 +105,7 @@ public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRota
itemStack.copy()); itemStack.copy());
if (itemStack.hasTagCompound()) { if (itemStack.hasTagCompound()) {
entityItem.getEntityItem().setTagCompound(itemStack.getTagCompound().copy()); entityItem.getItem().setTagCompound(itemStack.getTagCompound().copy());
} }
final float factor = 0.05F; final float factor = 0.05F;

View file

@ -53,13 +53,13 @@ public class VersionCheckerClient {
} else { } else {
s = "There is an update for TechReborn with " + changeLog.size() + " changes."; s = "There is an update for TechReborn with " + changeLog.size() + " changes.";
} }
event.getGui().drawString(event.getGui().mc.fontRendererObj, s, 10, 5, Color.white.getRGB()); event.getGui().drawString(event.getGui().mc.fontRenderer, s, 10, 5, Color.white.getRGB());
if (!Core.INSTANCE.versionChecker.isLatestVersion()) { if (!Core.INSTANCE.versionChecker.isLatestVersion()) {
if (event.getMouseY() < 20) { if (event.getMouseY() < 20) {
GuiUtil.drawTooltipBox(5, 15, 330, changeLog.size() * 10 + 5); GuiUtil.drawTooltipBox(5, 15, 330, changeLog.size() * 10 + 5);
int y = 20; int y = 20;
for (String change : changeLog) { for (String change : changeLog) {
event.getGui().drawString(event.getGui().mc.fontRendererObj, change, 10, y, Color.white.getRGB()); event.getGui().drawString(event.getGui().mc.fontRenderer, change, 10, y, Color.white.getRGB());
y += 10; y += 10;
} }
} }

View file

@ -68,13 +68,13 @@ public class ContainerAESU extends RebornContainer {
for (int i = 0; i < this.listeners.size(); i++) { for (int i = 0; i < this.listeners.size(); i++) {
IContainerListener IContainerListener = this.listeners.get(i); IContainerListener IContainerListener = this.listeners.get(i);
if (this.euOut != tile.getMaxOutput()) { if (this.euOut != tile.getMaxOutput()) {
IContainerListener.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); IContainerListener.sendWindowProperty(this, 0, (int) tile.getMaxOutput());
} }
if (this.storedEu != tile.getEnergy()) { if (this.storedEu != tile.getEnergy()) {
IContainerListener.sendProgressBarUpdate(this, 1, (int) tile.getEnergy()); IContainerListener.sendWindowProperty(this, 1, (int) tile.getEnergy());
} }
if (this.euChange != tile.getEuChange() && tile.getEuChange() != -1) { if (this.euChange != tile.getEuChange() && tile.getEuChange() != -1) {
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEuChange()); IContainerListener.sendWindowProperty(this, 2, (int) tile.getEuChange());
} }
} }
} }
@ -82,9 +82,9 @@ public class ContainerAESU extends RebornContainer {
@Override @Override
public void addListener(IContainerListener crafting) { public void addListener(IContainerListener crafting) {
super.addListener(crafting); super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); crafting.sendWindowProperty(this, 0, (int) tile.getMaxOutput());
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy()); crafting.sendWindowProperty(this, 1, (int) tile.getEnergy());
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange()); crafting.sendWindowProperty(this, 2, (int) tile.getEuChange());
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

View file

@ -74,16 +74,16 @@ public class ContainerLESU extends RebornContainer {
for (int i = 0; i < this.listeners.size(); i++) { for (int i = 0; i < this.listeners.size(); i++) {
IContainerListener IContainerListener = this.listeners.get(i); IContainerListener IContainerListener = this.listeners.get(i);
if (this.euOut != tile.getMaxOutput()) { if (this.euOut != tile.getMaxOutput()) {
IContainerListener.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); IContainerListener.sendWindowProperty(this, 0, (int) tile.getMaxOutput());
} }
if (this.storedEu != tile.getEnergy()) { if (this.storedEu != tile.getEnergy()) {
IContainerListener.sendProgressBarUpdate(this, 1, (int) tile.getEnergy()); IContainerListener.sendWindowProperty(this, 1, (int) tile.getEnergy());
} }
if (this.euChange != tile.getEuChange() && tile.getEuChange() != -1) { if (this.euChange != tile.getEuChange() && tile.getEuChange() != -1) {
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEuChange()); IContainerListener.sendWindowProperty(this, 2, (int) tile.getEuChange());
} }
if (this.connectedBlocks != tile.connectedBlocks) { if (this.connectedBlocks != tile.connectedBlocks) {
IContainerListener.sendProgressBarUpdate(this, 3, tile.connectedBlocks); IContainerListener.sendWindowProperty(this, 3, tile.connectedBlocks);
} }
} }
} }
@ -91,10 +91,10 @@ public class ContainerLESU extends RebornContainer {
@Override @Override
public void addListener(IContainerListener crafting) { public void addListener(IContainerListener crafting) {
super.addListener(crafting); super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); crafting.sendWindowProperty(this, 0, (int) tile.getMaxOutput());
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy()); crafting.sendWindowProperty(this, 1, (int) tile.getEnergy());
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange()); crafting.sendWindowProperty(this, 2, (int) tile.getEuChange());
crafting.sendProgressBarUpdate(this, 3, tile.connectedBlocks); crafting.sendWindowProperty(this, 3, tile.connectedBlocks);
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

View file

@ -128,7 +128,7 @@ public class BuiltContainer extends Container {
final short supplied = (short) value.getLeft().getAsInt(); final short supplied = (short) value.getLeft().getAsInt();
if (supplied != value.getRight()) { if (supplied != value.getRight()) {
listener.sendProgressBarUpdate(this, i, supplied); listener.sendWindowProperty(this, i, supplied);
value.setRight(supplied); value.setRight(supplied);
} }
i++; i++;
@ -139,8 +139,8 @@ public class BuiltContainer extends Container {
final int supplied = value.getLeft().getAsInt(); final int supplied = value.getLeft().getAsInt();
if (supplied != value.getRight()) { if (supplied != value.getRight()) {
listener.sendProgressBarUpdate(this, i, supplied >> 16); listener.sendWindowProperty(this, i, supplied >> 16);
listener.sendProgressBarUpdate(this, i + 1, (short) (supplied & 0xFFFF)); listener.sendWindowProperty(this, i + 1, (short) (supplied & 0xFFFF));
value.setRight(supplied); value.setRight(supplied);
} }
i += 2; i += 2;
@ -157,7 +157,7 @@ public class BuiltContainer extends Container {
for (final MutableTriple<IntSupplier, IntConsumer, Short> value : this.shortValues) { for (final MutableTriple<IntSupplier, IntConsumer, Short> value : this.shortValues) {
final short supplied = (short) value.getLeft().getAsInt(); final short supplied = (short) value.getLeft().getAsInt();
listener.sendProgressBarUpdate(this, i, supplied); listener.sendWindowProperty(this, i, supplied);
value.setRight(supplied); value.setRight(supplied);
i++; i++;
} }
@ -166,8 +166,8 @@ public class BuiltContainer extends Container {
for (final MutableTriple<IntSupplier, IntConsumer, Integer> value : this.integerValues) { for (final MutableTriple<IntSupplier, IntConsumer, Integer> value : this.integerValues) {
final int supplied = value.getLeft().getAsInt(); final int supplied = value.getLeft().getAsInt();
listener.sendProgressBarUpdate(this, i, supplied >> 16); listener.sendWindowProperty(this, i, supplied >> 16);
listener.sendProgressBarUpdate(this, i + 1, (short) (supplied & 0xFFFF)); listener.sendWindowProperty(this, i + 1, (short) (supplied & 0xFFFF));
value.setRight(supplied); value.setRight(supplied);
i += 2; i += 2;
} }

View file

@ -77,13 +77,13 @@ public class GuiAESU extends GuiContainer {
} }
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
this.fontRendererObj.drawString(I18n.translateToLocal("tile.techreborn.aesu.name"), 40, 10, this.fontRenderer.drawString(I18n.translateToLocal("tile.techreborn.aesu.name"), 40, 10,
Color.WHITE.getRGB()); Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerAesu.euOut) + " /tick", 10, 20, this.fontRenderer.drawString(PowerSystem.getLocaliszedPower(containerAesu.euOut) + " /tick", 10, 20,
Color.WHITE.getRGB()); Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerAesu.storedEu) + " ", 10, 30, this.fontRenderer.drawString(PowerSystem.getLocaliszedPower(containerAesu.storedEu) + " ", 10, 30,
Color.WHITE.getRGB()); Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerAesu.euChange) + " change", 10, 40, this.fontRenderer.drawString(PowerSystem.getLocaliszedPower(containerAesu.euChange) + " change", 10, 40,
Color.WHITE.getRGB()); Color.WHITE.getRGB());
} }
@ -96,6 +96,6 @@ public class GuiAESU extends GuiContainer {
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -71,15 +71,15 @@ public class GuiAlloyFurnace extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.alloyfurnace.name"); final String name = I18n.translateToLocal("tile.techreborn.alloyfurnace.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -76,15 +76,15 @@ public class GuiAlloySmelter extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.alloysmelter.name"); final String name = I18n.translateToLocal("tile.techreborn.alloysmelter.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -76,15 +76,15 @@ public class GuiAssemblingMachine extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.assemblinmachine.name"); final String name = I18n.translateToLocal("tile.techreborn.assemblinmachine.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -140,7 +140,7 @@ public class GuiBase extends GuiContainer {
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
protected void drawTitle() { protected void drawTitle() {
@ -148,11 +148,11 @@ public class GuiBase extends GuiContainer {
} }
protected void drawCentredString(String string, int y, int colour, Layer layer) { protected void drawCentredString(String string, int y, int colour, Layer layer) {
drawString(string, (xSize / 2 - mc.fontRendererObj.getStringWidth(string) / 2), y, colour, layer); drawString(string, (xSize / 2 - mc.fontRenderer.getStringWidth(string) / 2), y, colour, layer);
} }
protected void drawCentredString(String string, int y, int colour, int modifier, Layer layer) { protected void drawCentredString(String string, int y, int colour, int modifier, Layer layer) {
drawString(string, (xSize / 2 - (mc.fontRendererObj.getStringWidth(string)) / 2) + modifier, y, colour, layer); drawString(string, (xSize / 2 - (mc.fontRenderer.getStringWidth(string)) / 2) + modifier, y, colour, layer);
} }
protected void drawString(String string, int x, int y, int colour, Layer layer) { protected void drawString(String string, int x, int y, int colour, Layer layer) {
@ -162,7 +162,7 @@ public class GuiBase extends GuiContainer {
factorX = guiLeft; factorX = guiLeft;
factorY = guiTop; factorY = guiTop;
} }
mc.fontRendererObj.drawString(string, x + factorX, y + factorY, colour); mc.fontRenderer.drawString(string, x + factorX, y + factorY, colour);
GlStateManager.color(1, 1, 1, 1); GlStateManager.color(1, 1, 1, 1);
} }

View file

@ -78,16 +78,16 @@ public class GuiChunkLoader extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.chunkloader.name"); final String name = I18n.translateToLocal("tile.techreborn.chunkloader.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -52,8 +52,8 @@ public class GuiDestructoPack extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(int arg0, int arg1) { protected void drawGuiContainerForegroundLayer(int arg0, int arg1) {
String name = I18n.translateToLocal("item.techreborn.part.destructoPack.name"); String name = I18n.translateToLocal("item.techreborn.part.destructoPack.name");
fontRendererObj.drawString(name, xSize / 2 - fontRendererObj.getStringWidth(name) / 2, 5, 4210752); fontRenderer.drawString(name, xSize / 2 - fontRenderer.getStringWidth(name) / 2, 5, 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory"), 8, this.ySize - 96 + 2, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory"), 8, this.ySize - 96 + 2,
4210752); 4210752);
super.drawGuiContainerForegroundLayer(arg0, arg1); super.drawGuiContainerForegroundLayer(arg0, arg1);
} }
@ -61,6 +61,6 @@ public class GuiDestructoPack extends GuiContainer {
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -58,21 +58,21 @@ public class GuiDieselGenerator extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.dieselgenerator.name"); final String name = I18n.translateToLocal("tile.techreborn.dieselgenerator.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRenderer.drawString("Liquid Amount", 10, 20, 16448255);
this.fontRendererObj.drawString(this.dieselGenerator.tank.getFluidAmount() + "", 10, 30, 16448255); this.fontRenderer.drawString(this.dieselGenerator.tank.getFluidAmount() + "", 10, 30, 16448255);
this.fontRendererObj.drawString("Power Amount", 10, 40, 16448255); this.fontRenderer.drawString("Power Amount", 10, 40, 16448255);
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.dieselGenerator.getEnergy()) + "", 10, 50, this.fontRenderer.drawString(PowerSystem.getLocaliszedPower(this.dieselGenerator.getEnergy()) + "", 10, 50,
16448255); 16448255);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -57,16 +57,16 @@ public class GuiFusionReactor extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.fusioncontrolcomputer.name"); final String name = I18n.translateToLocal("tile.techreborn.fusioncontrolcomputer.name");
this.fontRendererObj.drawString(name, 87, 6, 4210752); this.fontRenderer.drawString(name, 87, 6, 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.fusionController.getEnergy()), 11, 8, this.fontRenderer.drawString(PowerSystem.getLocaliszedPower(this.fusionController.getEnergy()), 11, 8,
16448255); 16448255);
this.fontRendererObj.drawString("Coils: " + (this.fusionController.getCoilStatus() == 1 ? "Yes" : "No"), 11, 16, this.fontRenderer.drawString("Coils: " + (this.fusionController.getCoilStatus() == 1 ? "Yes" : "No"), 11, 16,
16448255); 16448255);
if (this.fusionController.getNeededPower() > 1 && this.fusionController.getCrafingTickTime() < 1) if (this.fusionController.getNeededPower() > 1 && this.fusionController.getCrafingTickTime() < 1)
this.fontRendererObj.drawString("Start: " this.fontRenderer.drawString("Start: "
+ this.percentage(this.fusionController.getNeededPower(), (int) this.fusionController.getEnergy()) + this.percentage(this.fusionController.getNeededPower(), (int) this.fusionController.getEnergy())
+ "%", 11, 24, 16448255); + "%", 11, 24, 16448255);
@ -140,6 +140,6 @@ public class GuiFusionReactor extends GuiContainer {
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -58,17 +58,17 @@ public class GuiGasTurbine extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = "Gas Turbine"; final String name = "Gas Turbine";
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRenderer.drawString("Liquid Amount", 10, 20, 16448255);
this.fontRendererObj.drawString(this.gasTurbine.tank.getFluidAmount() + "", 10, 30, 16448255); this.fontRenderer.drawString(this.gasTurbine.tank.getFluidAmount() + "", 10, 30, 16448255);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -62,7 +62,7 @@ public class GuiImplosionCompressor extends GuiContainer {
if (!this.compressor.getMutliBlock()) { if (!this.compressor.getMutliBlock()) {
// GuiDraw.drawTooltipBox(k + 30, l + 50 + 12 - 0, 114, 10); // GuiDraw.drawTooltipBox(k + 30, l + 50 + 12 - 0, 114, 10);
this.fontRendererObj.drawString(I18n.translateToLocal("techreborn.message.missingmultiblock"), k + 38, l + 52 + 12, -1); this.fontRenderer.drawString(I18n.translateToLocal("techreborn.message.missingmultiblock"), k + 38, l + 52 + 12, -1);
} }
this.mc.getTextureManager().bindTexture(GuiImplosionCompressor.texture); this.mc.getTextureManager().bindTexture(GuiImplosionCompressor.texture);
@ -80,14 +80,14 @@ public class GuiImplosionCompressor extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.implosioncompressor.name"); final String name = I18n.translateToLocal("tile.techreborn.implosioncompressor.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6, 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -76,9 +76,9 @@ public class GuiIndustrialElectrolyzer extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.industrialelectrolyzer.name"); final String name = I18n.translateToLocal("tile.techreborn.industrialelectrolyzer.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
} }
} }

View file

@ -80,7 +80,7 @@ public class GuiIndustrialSawmill extends GuiContainer {
if (!this.sawmill.getMutliBlock()) { if (!this.sawmill.getMutliBlock()) {
//GuiUtil.drawTooltipBox(k + 30, l + 50 + 12, 114, 10); //GuiUtil.drawTooltipBox(k + 30, l + 50 + 12, 114, 10);
this.fontRendererObj.drawString(I18n.translateToLocal("techreborn.message.missingmultiblock"), k + 38, this.fontRenderer.drawString(I18n.translateToLocal("techreborn.message.missingmultiblock"), k + 38,
l + 52 + 12, -1); l + 52 + 12, -1);
} }
} }
@ -110,13 +110,13 @@ public class GuiIndustrialSawmill extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.industrialsawmill.name"); final String name = I18n.translateToLocal("tile.techreborn.industrialsawmill.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6, 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory"), 58, this.ySize - 96 + 2, 4210752); this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory"), 58, this.ySize - 96 + 2, 4210752);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -69,16 +69,16 @@ public class GuiIronFurnace extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.ironfurnace.name"); final String name = I18n.translateToLocal("tile.techreborn.ironfurnace.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -61,23 +61,23 @@ public class GuiLESU extends GuiContainer {
} }
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
this.fontRendererObj.drawString(I18n.translateToLocal("tile.techreborn.lesu.name"), 40, 10, this.fontRenderer.drawString(I18n.translateToLocal("tile.techreborn.lesu.name"), 40, 10,
Color.WHITE.getRGB()); Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerLesu.euOut) + "/t", 10, 20, this.fontRenderer.drawString(PowerSystem.getLocaliszedPower(containerLesu.euOut) + "/t", 10, 20,
Color.WHITE.getRGB()); Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerLesu.storedEu), 10, 30, this.fontRenderer.drawString(PowerSystem.getLocaliszedPower(containerLesu.storedEu), 10, 30,
Color.WHITE.getRGB()); Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerLesu.euChange) + " change", 10, 40, this.fontRenderer.drawString(PowerSystem.getLocaliszedPower(containerLesu.euChange) + " change", 10, 40,
Color.WHITE.getRGB()); Color.WHITE.getRGB());
this.fontRendererObj.drawString(containerLesu.connectedBlocks + " blocks", 10, 50, Color.WHITE.getRGB()); this.fontRenderer.drawString(containerLesu.connectedBlocks + " blocks", 10, 50, Color.WHITE.getRGB());
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerLesu.euStorage) + " max", 10, 60, this.fontRenderer.drawString(PowerSystem.getLocaliszedPower(containerLesu.euStorage) + " max", 10, 60,
Color.WHITE.getRGB()); Color.WHITE.getRGB());
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -57,17 +57,17 @@ public class GuiQuantumTank extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.quantumTank.name"); final String name = I18n.translateToLocal("tile.techreborn.quantumTank.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRenderer.drawString("Liquid Amount", 10, 20, 16448255);
this.fontRendererObj.drawString(this.quantumTank.tank.getFluidAmount() + "", 10, 30, 16448255); this.fontRenderer.drawString(this.quantumTank.tank.getFluidAmount() + "", 10, 30, 16448255);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -65,9 +65,9 @@ public class GuiRollingMachine extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.rollingmachine.name"); final String name = I18n.translateToLocal("tile.techreborn.rollingmachine.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
} }
@ -83,7 +83,7 @@ public class GuiRollingMachine extends GuiContainer {
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -70,15 +70,15 @@ public class GuiScrapboxinator extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = net.minecraft.util.text.translation.I18n.translateToLocal("tile.techreborn.scrapboxinator.name"); final String name = net.minecraft.util.text.translation.I18n.translateToLocal("tile.techreborn.scrapboxinator.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, this.fontRenderer.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2,
4210752); 4210752);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -60,17 +60,17 @@ public class GuiSemifluidGenerator extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = "Semifluid Generator"; final String name = "Semifluid Generator";
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRenderer.drawString("Liquid Amount", 10, 20, 16448255);
this.fontRendererObj.drawString(this.semifluidGenerator.tank.getFluidAmount() + "", 10, 30, 16448255); this.fontRenderer.drawString(this.semifluidGenerator.tank.getFluidAmount() + "", 10, 30, 16448255);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -59,19 +59,19 @@ public class GuiThermalGenerator extends GuiContainer {
@Override @Override
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.thermalGenerator.name"); final String name = I18n.translateToLocal("tile.techreborn.thermalGenerator.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752); 4210752);
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, this.fontRenderer.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRenderer.drawString("Liquid Amount", 10, 20, 16448255);
this.fontRendererObj.drawString(this.thermalGenerator.tank.getFluidAmount() + "", 10, 30, 16448255); this.fontRenderer.drawString(this.thermalGenerator.tank.getFluidAmount() + "", 10, 30, 16448255);
this.fontRendererObj.drawString(this.thermalGenerator.getEnergy() + "", 10, 40, 16448255); this.fontRenderer.drawString(this.thermalGenerator.getEnergy() + "", 10, 40, 16448255);
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) { public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks); super.drawScreen(mouseX, mouseY, partialTicks);
this.func_191948_b(mouseX, mouseY); this.renderHoveredToolTip(mouseX, mouseY);
} }
} }

View file

@ -85,7 +85,7 @@ public class TRBuilder extends GuiBuilder {
TextFormatting powerColour = TextFormatting.GOLD; TextFormatting powerColour = TextFormatting.GOLD;
list.add(powerColour + PowerSystem.getLocaliszedPowerFormattedNoSuffix(energyStored) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix(maxEnergyStored) + " " + PowerSystem.getDisplayPower().abbreviation); list.add(powerColour + PowerSystem.getLocaliszedPowerFormattedNoSuffix(energyStored) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix(maxEnergyStored) + " " + PowerSystem.getDisplayPower().abbreviation);
list.add(getPercentageColour(percentage) + "" + percentage + "%" + TextFormatting.GRAY + " Charged"); list.add(getPercentageColour(percentage) + "" + percentage + "%" + TextFormatting.GRAY + " Charged");
net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRendererObj); net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRenderer);
GlStateManager.disableLighting(); GlStateManager.disableLighting();
GlStateManager.color(1, 1, 1, 1); GlStateManager.color(1, 1, 1, 1);
} }
@ -123,7 +123,7 @@ public class TRBuilder extends GuiBuilder {
int percentage = percentage(maxProgress, progress); int percentage = percentage(maxProgress, progress);
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
list.add(getPercentageColour(percentage) + "" + percentage + "%"); list.add(getPercentageColour(percentage) + "" + percentage + "%");
net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRendererObj); net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRenderer);
GlStateManager.disableLighting(); GlStateManager.disableLighting();
GlStateManager.color(1, 1, 1, 1); GlStateManager.color(1, 1, 1, 1);
} }
@ -159,7 +159,7 @@ public class TRBuilder extends GuiBuilder {
else else
list.add(TextFormatting.GOLD + "" + amount + "mB/" + maxCapacity + "mB " + fluid.getLocalizedName()); list.add(TextFormatting.GOLD + "" + amount + "mB/" + maxCapacity + "mB " + fluid.getLocalizedName());
list.add(getPercentageColour(percentage) + "" + percentage + "%" + TextFormatting.GRAY + " Full"); list.add(getPercentageColour(percentage) + "" + percentage + "%" + TextFormatting.GRAY + " Full");
net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRendererObj); net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRenderer);
GlStateManager.disableLighting(); GlStateManager.disableLighting();
GlStateManager.color(1, 1, 1, 1); GlStateManager.color(1, 1, 1, 1);
} }
@ -217,7 +217,7 @@ public class TRBuilder extends GuiBuilder {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
list.add("Toggle Multiblock Hologram"); list.add("Toggle Multiblock Hologram");
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRendererObj); net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRenderer);
GlStateManager.popMatrix(); GlStateManager.popMatrix();
} }
} }
@ -248,7 +248,7 @@ public class TRBuilder extends GuiBuilder {
list.add(TextFormatting.GRAY + "prolly a bug"); list.add(TextFormatting.GRAY + "prolly a bug");
list.add(TextFormatting.GRAY + "pls report and tell how tf you did this"); list.add(TextFormatting.GRAY + "pls report and tell how tf you did this");
} }
net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRendererObj); net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRenderer);
GlStateManager.disableLighting(); GlStateManager.disableLighting();
GlStateManager.color(1, 1, 1, 1); GlStateManager.color(1, 1, 1, 1);
} }
@ -320,7 +320,7 @@ public class TRBuilder extends GuiBuilder {
int percentage = percentage(maxProgress, progress); int percentage = percentage(maxProgress, progress);
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
list.add(getPercentageColour(percentage) + "" + percentage + "%"); list.add(getPercentageColour(percentage) + "" + percentage + "%");
net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRendererObj); net.minecraftforge.fml.client.config.GuiUtils.drawHoveringText(list, mouseX, mouseY, gui.width, gui.height, -1, gui.mc.fontRenderer);
GlStateManager.disableLighting(); GlStateManager.disableLighting();
GlStateManager.color(1, 1, 1, 1); GlStateManager.color(1, 1, 1, 1);
} }

View file

@ -53,7 +53,7 @@ public class GuiButtonHologram extends GuiButton {
mouseY -= gui.getGuiTop(); mouseY -= gui.getGuiTop();
} }
if (this.enabled && this.visible && mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height) { if (this.enabled && this.visible && mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height) {
return true; return true;
} }
return false; return false;
@ -69,7 +69,7 @@ public class GuiButtonHologram extends GuiButton {
} }
@Override @Override
public void func_191745_a(Minecraft p_191745_1_, int p_191745_2_, int p_191745_3_, float p_191745_4_) { public void drawButton(Minecraft p_191745_1_, int p_191745_2_, int p_191745_3_, float p_191745_4_) {
} }
} }

View file

@ -51,7 +51,7 @@ public class GuiButtonPowerBar extends GuiButton {
mouseY -= gui.getGuiTop(); mouseY -= gui.getGuiTop();
} }
if (this.enabled && this.visible && mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height) { if (this.enabled && this.visible && mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height) {
PowerSystem.bumpPowerConfig(); PowerSystem.bumpPowerConfig();
return true; return true;
} }
@ -64,7 +64,7 @@ public class GuiButtonPowerBar extends GuiButton {
} }
@Override @Override
public void func_191745_a(Minecraft p_191745_1_, int p_191745_2_, int p_191745_3_, float p_191745_4_) { public void drawButton(Minecraft p_191745_1_, int p_191745_2_, int p_191745_3_, float p_191745_4_) {
} }
} }

View file

@ -84,15 +84,15 @@ public abstract class GuiWidget<T extends Container> extends GuiContainer {
int y = (this.height - this.ySize) / 2; int y = (this.height - this.ySize) / 2;
String name = translate.translateKey("tile.techreborn.industrialgrinder.name"); String name = translate.translateKey("tile.techreborn.industrialgrinder.name");
fontRendererObj.drawString(name, xSize / 2 - fontRendererObj.getStringWidth(name) / 2, 6, 4210752); fontRenderer.drawString(name, xSize / 2 - fontRenderer.getStringWidth(name) / 2, 6, 4210752);
fontRendererObj.drawString(translate.translateKey("container.inventory"), 8, ySize - 94, 4210752); fontRenderer.drawString(translate.translateKey("container.inventory"), 8, ySize - 94, 4210752);
for (Widget widget : widgets) for (Widget widget : widgets)
widget.drawWidget(this, x, y, mouseX, mouseY); widget.drawWidget(this, x, y, mouseX, mouseY);
} }
public FontRenderer getFontRenderer() { public FontRenderer getFontRenderer() {
return fontRendererObj; return fontRenderer;
} }
} }

View file

@ -50,13 +50,13 @@ public class RecipeUtil {
@Nonnull @Nonnull
Minecraft minecraft, int x, int y, final double startCost, Minecraft minecraft, int x, int y, final double startCost,
final double euPerTick, final int tickTime) { final double euPerTick, final int tickTime) {
FontRenderer fontRendererObj = minecraft.fontRendererObj; FontRenderer fontRenderer = minecraft.fontRenderer;
int lineSpacing = fontRendererObj.FONT_HEIGHT + 1; int lineSpacing = fontRenderer.FONT_HEIGHT + 1;
NumberFormat formatter = NumberFormat.getInstance(); NumberFormat formatter = NumberFormat.getInstance();
String startCostEU = formatter.format(startCost); String startCostEU = formatter.format(startCost);
String startCostString = I18n.translateToLocalFormatted("techreborn.jei.recipe.start.cost", startCostEU); String startCostString = I18n.translateToLocalFormatted("techreborn.jei.recipe.start.cost", startCostEU);
fontRendererObj.drawString(startCostString, x, y, color); fontRenderer.drawString(startCostString, x, y, color);
y += lineSpacing; y += lineSpacing;
drawInfo(minecraft, x, y, euPerTick, tickTime); drawInfo(minecraft, x, y, euPerTick, tickTime);
@ -65,22 +65,22 @@ public class RecipeUtil {
public static void drawInfo( public static void drawInfo(
@Nonnull @Nonnull
Minecraft minecraft, int x, int y, final double euPerTick, final int tickTime) { Minecraft minecraft, int x, int y, final double euPerTick, final int tickTime) {
FontRenderer fontRendererObj = minecraft.fontRendererObj; FontRenderer fontRenderer = minecraft.fontRenderer;
int lineSpacing = fontRendererObj.FONT_HEIGHT + 1; int lineSpacing = fontRenderer.FONT_HEIGHT + 1;
String runningCostString = I18n.translateToLocalFormatted("techreborn.jei.recipe.running.cost", euPerTick); String runningCostString = I18n.translateToLocalFormatted("techreborn.jei.recipe.running.cost", euPerTick);
fontRendererObj.drawString(runningCostString, x, y, color); fontRenderer.drawString(runningCostString, x, y, color);
y += lineSpacing; y += lineSpacing;
String processingTimeString1 = I18n.translateToLocalFormatted("techreborn.jei.recipe.processing.time.1", String processingTimeString1 = I18n.translateToLocalFormatted("techreborn.jei.recipe.processing.time.1",
tickTime); tickTime);
fontRendererObj.drawString(processingTimeString1, x, y, color); fontRenderer.drawString(processingTimeString1, x, y, color);
y += lineSpacing; y += lineSpacing;
int seconds = tickTime / 20; int seconds = tickTime / 20;
String processingTimeString2 = I18n.translateToLocalFormatted("techreborn.jei.recipe.processing.time.2", String processingTimeString2 = I18n.translateToLocalFormatted("techreborn.jei.recipe.processing.time.2",
seconds); seconds);
fontRendererObj.drawString(processingTimeString2, x + 10, y, color); fontRenderer.drawString(processingTimeString2, x + 10, y, color);
} }
@Deprecated @Deprecated

View file

@ -57,10 +57,10 @@ public class AlloySmelterRecipeWrapper extends BaseRecipeWrapper<AlloySmelterRec
int x = recipeWidth / 2; int x = recipeWidth / 2;
int y = recipeHeight - recipeHeight / 4; int y = recipeHeight - recipeHeight / 4;
int lineHeight = minecraft.fontRendererObj.FONT_HEIGHT; int lineHeight = minecraft.fontRenderer.FONT_HEIGHT;
minecraft.fontRendererObj.drawString("Time: " + (baseRecipe.tickTime / 20) + " secs", x, y, 0x444444); minecraft.fontRenderer.drawString("Time: " + (baseRecipe.tickTime / 20) + " secs", x, y, 0x444444);
minecraft.fontRendererObj.drawString("EU: " + baseRecipe.euPerTick + " EU/t", x, y += lineHeight, 0x444444); minecraft.fontRenderer.drawString("EU: " + baseRecipe.euPerTick + " EU/t", x, y += lineHeight, 0x444444);
} }
} }

View file

@ -69,11 +69,11 @@ public class BlastFurnaceRecipeWrapper extends BaseRecipeWrapper<BlastFurnaceRec
heat.draw(minecraft, 7, 47); heat.draw(minecraft, 7, 47);
int y = 64; int y = 64;
int lineHeight = minecraft.fontRendererObj.FONT_HEIGHT; int lineHeight = minecraft.fontRenderer.FONT_HEIGHT;
minecraft.fontRendererObj.drawString(baseRecipe.neededHeat + " Heat", (recipeWidth / 2 - minecraft.fontRendererObj.getStringWidth(baseRecipe.neededHeat + " Heat") / 2), 48, 0xFFFFFF); minecraft.fontRenderer.drawString(baseRecipe.neededHeat + " Heat", (recipeWidth / 2 - minecraft.fontRenderer.getStringWidth(baseRecipe.neededHeat + " Heat") / 2), 48, 0xFFFFFF);
minecraft.fontRendererObj.drawString(baseRecipe.tickTime / 20 + " seconds", (recipeWidth / 2 - minecraft.fontRendererObj.getStringWidth(baseRecipe.tickTime / 20 + " seconds") / 2), y, 0x444444); minecraft.fontRenderer.drawString(baseRecipe.tickTime / 20 + " seconds", (recipeWidth / 2 - minecraft.fontRenderer.getStringWidth(baseRecipe.tickTime / 20 + " seconds") / 2), y, 0x444444);
minecraft.fontRendererObj.drawString(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime), (recipeWidth / 2 - minecraft.fontRendererObj.getStringWidth(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime)) / 2), y + lineHeight, 0x444444); minecraft.fontRenderer.drawString(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime), (recipeWidth / 2 - minecraft.fontRenderer.getStringWidth(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime)) / 2), y + lineHeight, 0x444444);
} }
} }

View file

@ -61,10 +61,10 @@ public class CentrifugeRecipeWrapper extends BaseRecipeWrapper<CentrifugeRecipe>
int x = -10; int x = -10;
int y1 = 1; int y1 = 1;
int y2 = 54; int y2 = 54;
int lineHeight = minecraft.fontRendererObj.FONT_HEIGHT; int lineHeight = minecraft.fontRenderer.FONT_HEIGHT;
minecraft.fontRendererObj.drawString(baseRecipe.tickTime / 20 + " seconds", (recipeWidth / 2 - minecraft.fontRendererObj.getStringWidth(baseRecipe.tickTime / 20 + " seconds") / 2) - 40, y1, 0x444444); minecraft.fontRenderer.drawString(baseRecipe.tickTime / 20 + " seconds", (recipeWidth / 2 - minecraft.fontRenderer.getStringWidth(baseRecipe.tickTime / 20 + " seconds") / 2) - 40, y1, 0x444444);
minecraft.fontRendererObj.drawString(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime), (recipeWidth / 2 - minecraft.fontRendererObj.getStringWidth(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime)) / 2) - 40, y2, 0x444444); minecraft.fontRenderer.drawString(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime), (recipeWidth / 2 - minecraft.fontRenderer.getStringWidth(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime)) / 2) - 40, y2, 0x444444);
} }
} }

View file

@ -63,9 +63,9 @@ public class ChemicalReactorRecipeWrapper extends BaseRecipeWrapper<ChemicalReac
progressleft.draw(minecraft, 75, 12); progressleft.draw(minecraft, 75, 12);
int y = 30; int y = 30;
int lineHeight = minecraft.fontRendererObj.FONT_HEIGHT; int lineHeight = minecraft.fontRenderer.FONT_HEIGHT;
minecraft.fontRendererObj.drawString(baseRecipe.tickTime / 20 + " seconds", (recipeWidth / 2 - minecraft.fontRendererObj.getStringWidth(baseRecipe.tickTime / 20 + " seconds") / 2), y, 0x444444); minecraft.fontRenderer.drawString(baseRecipe.tickTime / 20 + " seconds", (recipeWidth / 2 - minecraft.fontRenderer.getStringWidth(baseRecipe.tickTime / 20 + " seconds") / 2), y, 0x444444);
minecraft.fontRendererObj.drawString(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime), (recipeWidth / 2 - minecraft.fontRendererObj.getStringWidth(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime)) / 2), y + lineHeight, 0x444444); minecraft.fontRenderer.drawString(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime), (recipeWidth / 2 - minecraft.fontRenderer.getStringWidth(PowerSystem.getLocaliszedPowerFormatted(baseRecipe.euPerTick * baseRecipe.tickTime)) / 2), y + lineHeight, 0x444444);
} }
} }

View file

@ -76,7 +76,7 @@ public class FluidGeneratorRecipeWrapper extends BlankRecipeWrapper {
energyProduced.draw(minecraft, 73, 26); energyProduced.draw(minecraft, 73, 26);
minecraft.fontRendererObj.drawString(formatter.format(baseRecipe.getEnergyPerMb() * 1000) + " FE", 70, 13, minecraft.fontRenderer.drawString(formatter.format(baseRecipe.getEnergyPerMb() * 1000) + " FE", 70, 13,
0x444444); 0x444444);
} }

View file

@ -57,9 +57,9 @@ public class ImplosionCompressorRecipeWrapper extends BaseRecipeWrapper<Implosio
int x = -45; int x = -45;
int y = 4; int y = 4;
int lineHeight = minecraft.fontRendererObj.FONT_HEIGHT; int lineHeight = minecraft.fontRenderer.FONT_HEIGHT;
minecraft.fontRendererObj.drawString("Time: " + baseRecipe.tickTime / 20 + " s", x, y, 0x444444); minecraft.fontRenderer.drawString("Time: " + baseRecipe.tickTime / 20 + " s", x, y, 0x444444);
minecraft.fontRendererObj.drawString("EU: " + baseRecipe.euPerTick + " EU/t", x, y += lineHeight, 0x444444); minecraft.fontRenderer.drawString("EU: " + baseRecipe.euPerTick + " EU/t", x, y += lineHeight, 0x444444);
} }
} }

View file

@ -57,9 +57,9 @@ public class IndustrialElectrolyzerRecipeWrapper extends BaseRecipeWrapper<Indus
int x = 60; int x = 60;
int y = 30; int y = 30;
int lineHeight = minecraft.fontRendererObj.FONT_HEIGHT; int lineHeight = minecraft.fontRenderer.FONT_HEIGHT;
minecraft.fontRendererObj.drawString("Time: " + baseRecipe.tickTime / 20 + " s", x, y, 0x444444); minecraft.fontRenderer.drawString("Time: " + baseRecipe.tickTime / 20 + " s", x, y, 0x444444);
minecraft.fontRendererObj.drawString("EU: " + baseRecipe.euPerTick + " EU/t", x, y += lineHeight, 0x444444); minecraft.fontRenderer.drawString("EU: " + baseRecipe.euPerTick + " EU/t", x, y += lineHeight, 0x444444);
} }
} }

View file

@ -83,9 +83,9 @@ public class IndustrialGrinderRecipeWrapper extends BaseRecipeWrapper<Industrial
int x = 70; int x = 70;
int y = 40; int y = 40;
int lineHeight = minecraft.fontRendererObj.FONT_HEIGHT; int lineHeight = minecraft.fontRenderer.FONT_HEIGHT;
minecraft.fontRendererObj.drawString("Time: " + baseRecipe.tickTime / 20 + " s", x, y, 0x444444); minecraft.fontRenderer.drawString("Time: " + baseRecipe.tickTime / 20 + " s", x, y, 0x444444);
minecraft.fontRendererObj.drawString("EU: " + baseRecipe.euPerTick + " EU/t", x, y += lineHeight, 0x444444); minecraft.fontRenderer.drawString("EU: " + baseRecipe.euPerTick + " EU/t", x, y += lineHeight, 0x444444);
} }
} }

View file

@ -83,13 +83,13 @@ public class IndustrialSawmillRecipeWrapper extends BaseRecipeWrapper<Industrial
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 48, 23); progress.draw(minecraft, 48, 23);
if (minecraft.fontRendererObj != null) { if (minecraft.fontRenderer != null) {
int x = 70; int x = 70;
int y = 40; int y = 40;
int lineHeight = minecraft.fontRendererObj.FONT_HEIGHT; int lineHeight = minecraft.fontRenderer.FONT_HEIGHT;
minecraft.fontRendererObj.drawString("Time: " + baseRecipe.tickTime / 20 + " s", x, y, 0x444444); minecraft.fontRenderer.drawString("Time: " + baseRecipe.tickTime / 20 + " s", x, y, 0x444444);
minecraft.fontRendererObj.drawString("FE: " + baseRecipe.euPerTick + " FE/t", x, y += lineHeight, 0x444444); minecraft.fontRenderer.drawString("FE: " + baseRecipe.euPerTick + " FE/t", x, y += lineHeight, 0x444444);
} }
} }

View file

@ -87,7 +87,7 @@ public class IndustrialSawmillRecipes extends RecipeMethods {
@Nonnull @Nonnull
public static ItemStack findMatchingRecipe(InventoryCrafting inv) { public static ItemStack findMatchingRecipe(InventoryCrafting inv) {
for (IRecipe recipe : CraftingManager.field_193380_a) { for (IRecipe recipe : CraftingManager.REGISTRY) {
if (recipe.matches(inv, null)) { if (recipe.matches(inv, null)) {
return recipe.getCraftingResult(inv); return recipe.getCraftingResult(inv);
} }

View file

@ -131,7 +131,7 @@ public class DynamicCell extends Item {
@Override @Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> subItems) { public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> subItems) {
if(!func_194125_a(tab)){ if(!isInCreativeTab(tab)){
return; return;
} }
subItems.add(getEmptyCell(1)); subItems.add(getEmptyCell(1));

View file

@ -91,7 +91,7 @@ public class ItemDusts extends ItemTRNoDestroy {
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
@Override @Override
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) { public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
if(!func_194125_a(creativeTabs)){ if(!isInCreativeTab(creativeTabs)){
return; return;
} }
for (int meta = 0; meta < types.length; ++meta) { for (int meta = 0; meta < types.length; ++meta) {

View file

@ -81,7 +81,7 @@ public class ItemDustsSmall extends ItemTRNoDestroy {
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
@Override @Override
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) { public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
if(!func_194125_a(creativeTabs)){ if(!isInCreativeTab(creativeTabs)){
return; return;
} }
for (int meta = 0; meta < types.length; ++meta) { for (int meta = 0; meta < types.length; ++meta) {

View file

@ -71,7 +71,7 @@ public class ItemGems extends ItemTRNoDestroy {
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
@Override @Override
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) { public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
if(!func_194125_a(creativeTabs)){ if(!isInCreativeTab(creativeTabs)){
return; return;
} }
for (int meta = 0; meta < types.length; ++meta) { for (int meta = 0; meta < types.length; ++meta) {

View file

@ -80,7 +80,7 @@ public class ItemIngots extends ItemTRNoDestroy {
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
@Override @Override
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) { public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
if(!func_194125_a(creativeTabs)){ if(!isInCreativeTab(creativeTabs)){
return; return;
} }
for (int meta = 0; meta < types.length; ++meta) { for (int meta = 0; meta < types.length; ++meta) {

View file

@ -74,7 +74,7 @@ public class ItemNuggets extends ItemTRNoDestroy {
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
@Override @Override
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) { public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
if(!func_194125_a(creativeTabs)){ if(!isInCreativeTab(creativeTabs)){
return; return;
} }
for (int meta = 0; meta < types.length; ++meta) { for (int meta = 0; meta < types.length; ++meta) {

View file

@ -96,7 +96,7 @@ public class ItemParts extends ItemTRNoDestroy {
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
@Override @Override
public void getSubItems(final CreativeTabs creativeTabs, final NonNullList list) { public void getSubItems(final CreativeTabs creativeTabs, final NonNullList list) {
if(!func_194125_a(creativeTabs)){ if(!isInCreativeTab(creativeTabs)){
return; return;
} }
for (int meta = 0; meta < ItemParts.types.length; ++meta) { for (int meta = 0; meta < ItemParts.types.length; ++meta) {

View file

@ -92,7 +92,7 @@ public class ItemPlates extends ItemTRNoDestroy {
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
@Override @Override
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) { public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
if(!func_194125_a(creativeTabs)){ if(!isInCreativeTab(creativeTabs)){
return; return;
} }
for (int meta = 0; meta < types.length; ++meta) { for (int meta = 0; meta < types.length; ++meta) {

View file

@ -96,7 +96,7 @@ public class ItemUpgrades extends ItemTRNoDestroy implements IUpgrade {
// Adds Dusts SubItems To Creative Tab // Adds Dusts SubItems To Creative Tab
@Override @Override
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) { public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
if(!func_194125_a(creativeTabs)){ if(!isInCreativeTab(creativeTabs)){
return; return;
} }
for (int meta = 0; meta < types.length; ++meta) { for (int meta = 0; meta < types.length; ++meta) {

View file

@ -83,7 +83,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, public void getSubItems(Item item,
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack uncharged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK); ItemStack uncharged = new ItemStack(ModItems.LAPOTRONIC_ORB_PACK);

View file

@ -101,7 +101,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack uncharged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK); ItemStack uncharged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK);

View file

@ -42,7 +42,7 @@ public class ItemEnergyCrystal extends ItemBattery {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList itemList) { public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.ENERGY_CRYSTAL); ItemStack stack = new ItemStack(ModItems.ENERGY_CRYSTAL);

View file

@ -43,7 +43,7 @@ public class ItemLapotronCrystal extends ItemBattery {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_CRYSTAL); ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_CRYSTAL);

View file

@ -44,7 +44,7 @@ public class ItemLapotronicOrb extends ItemBattery {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_ORB); ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_ORB);

View file

@ -43,7 +43,7 @@ public class ItemLithiumBattery extends ItemBattery {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.LITHIUM_BATTERY); ItemStack stack = new ItemStack(ModItems.LITHIUM_BATTERY);

View file

@ -43,7 +43,7 @@ public class ItemReBattery extends ItemBattery {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.RE_BATTERY); ItemStack stack = new ItemStack(ModItems.RE_BATTERY);

View file

@ -48,7 +48,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.ADVANCED_CHAINSAW); ItemStack stack = new ItemStack(ModItems.ADVANCED_CHAINSAW);

View file

@ -59,7 +59,7 @@ public class ItemAdvancedDrill extends ItemDrill {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList itemList) { public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.ADVANCED_DRILL); ItemStack stack = new ItemStack(ModItems.ADVANCED_DRILL);

View file

@ -46,7 +46,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.ADVANCED_JACKHAMMER); ItemStack stack = new ItemStack(ModItems.ADVANCED_JACKHAMMER);

View file

@ -108,7 +108,7 @@ public class ItemCloakingDevice extends ItemTRNoDestroy implements IEnergyItemIn
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack uncharged = new ItemStack(ModItems.CLOAKING_DEVICE); ItemStack uncharged = new ItemStack(ModItems.CLOAKING_DEVICE);

View file

@ -48,7 +48,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.DIAMOND_CHAINSAW); ItemStack stack = new ItemStack(ModItems.DIAMOND_CHAINSAW);

View file

@ -48,7 +48,7 @@ public class ItemDiamondDrill extends ItemDrill {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.DIAMOND_DRILL); ItemStack stack = new ItemStack(ModItems.DIAMOND_DRILL);

View file

@ -45,7 +45,7 @@ public class ItemDiamondJackhammer extends ItemJackhammer {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList itemList) { public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.DIAMOND_JACKHAMMER); ItemStack stack = new ItemStack(ModItems.DIAMOND_JACKHAMMER);

View file

@ -96,7 +96,7 @@ public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemI
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList itemList) { public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack uncharged = new ItemStack(ModItems.ELECTRIC_TREE_TAP); ItemStack uncharged = new ItemStack(ModItems.ELECTRIC_TREE_TAP);

View file

@ -120,7 +120,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) { public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack itemStack = new ItemStack(this, 1); ItemStack itemStack = new ItemStack(this, 1);

View file

@ -113,7 +113,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack inactiveUncharged = new ItemStack(ModItems.NANOSABER); ItemStack inactiveUncharged = new ItemStack(ModItems.NANOSABER);

View file

@ -139,7 +139,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack uncharged = new ItemStack(ModItems.OMNI_TOOL); ItemStack uncharged = new ItemStack(ModItems.OMNI_TOOL);

View file

@ -137,7 +137,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack uncharged = new ItemStack(ModItems.ROCK_CUTTER); ItemStack uncharged = new ItemStack(ModItems.ROCK_CUTTER);

View file

@ -48,7 +48,7 @@ public class ItemSteelChainsaw extends ItemChainsaw {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.STEEL_CHAINSAW); ItemStack stack = new ItemStack(ModItems.STEEL_CHAINSAW);

View file

@ -48,7 +48,7 @@ public class ItemSteelDrill extends ItemDrill {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.STEEL_DRILL); ItemStack stack = new ItemStack(ModItems.STEEL_DRILL);

View file

@ -46,7 +46,7 @@ public class ItemSteelJackhammer extends ItemJackhammer {
@Override @Override
public void getSubItems( public void getSubItems(
CreativeTabs par2CreativeTabs, NonNullList itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
if(!func_194125_a(par2CreativeTabs)){ if(!isInCreativeTab(par2CreativeTabs)){
return; return;
} }
ItemStack stack = new ItemStack(ModItems.STEEL_JACKHAMMER); ItemStack stack = new ItemStack(ModItems.STEEL_JACKHAMMER);

View file

@ -172,7 +172,7 @@ public class ItemWrench extends ItemTRNoDestroy {
pos.getZ() + dZ, itemStack.copy()); pos.getZ() + dZ, itemStack.copy());
if (itemStack.hasTagCompound()) { if (itemStack.hasTagCompound()) {
entityItem.getEntityItem() entityItem.getItem()
.setTagCompound((NBTTagCompound) itemStack.getTagCompound().copy()); .setTagCompound((NBTTagCompound) itemStack.getTagCompound().copy());
} }

View file

@ -98,7 +98,7 @@ public class CraftingInfoPage extends TitledPage {
if (hasRecipe) { if (hasRecipe) {
renderImage(offsetX + (offsetX / 2), offsetY + 10, "craftingtable"); renderImage(offsetX + (offsetX / 2), offsetY + 10, "craftingtable");
} else { } else {
drawString(fontRendererObj, "No Crafting Recipe", offsetX + 40, offsetY + 22, Color.black.getRGB()); drawString(fontRenderer, "No Crafting Recipe", offsetX + 40, offsetY + 22, Color.black.getRGB());
} }
} }
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -166,15 +166,15 @@ public class CraftingInfoPage extends TitledPage {
GL11.glTranslated(offsetX + 5, offsetY + 40, 1); GL11.glTranslated(offsetX + 5, offsetY + 40, 1);
GL11.glScalef(descriptionScale, descriptionScale, descriptionScale); GL11.glScalef(descriptionScale, descriptionScale, descriptionScale);
int offset = 0; int offset = 0;
for (String s : getFormattedText(fontRendererObj)) { for (String s : getFormattedText(fontRenderer)) {
if (s == null) if (s == null)
break; break;
if (s.contains("\\%") && s.substring(0, 2).equals("\\%")) { if (s.contains("\\%") && s.substring(0, 2).equals("\\%")) {
s = s.substring(2); s = s.substring(2);
offset += fontRendererObj.FONT_HEIGHT / 2; offset += fontRenderer.FONT_HEIGHT / 2;
} }
fontRendererObj.drawString(s, 0, offset, Color.black.getRGB()); fontRenderer.drawString(s, 0, offset, Color.black.getRGB());
offset += fontRendererObj.FONT_HEIGHT; offset += fontRenderer.FONT_HEIGHT;
} }
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
@ -217,7 +217,7 @@ public class CraftingInfoPage extends TitledPage {
protected void drawItemStackTooltip(ItemStack stack, int x, int y) { protected void drawItemStackTooltip(ItemStack stack, int x, int y) {
final Minecraft mc = Minecraft.getMinecraft(); final Minecraft mc = Minecraft.getMinecraft();
FontRenderer font = MoreObjects.firstNonNull(stack.getItem().getFontRenderer(stack), mc.fontRendererObj); FontRenderer font = MoreObjects.firstNonNull(stack.getItem().getFontRenderer(stack), mc.fontRenderer);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
List<String> list = stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL); List<String> list = stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL);
@ -242,7 +242,7 @@ public class CraftingInfoPage extends TitledPage {
if (par1ItemStack != null) if (par1ItemStack != null)
font = par1ItemStack.getItem().getFontRenderer(par1ItemStack); font = par1ItemStack.getItem().getFontRenderer(par1ItemStack);
if (font == null) if (font == null)
font = Minecraft.getMinecraft().fontRendererObj; font = Minecraft.getMinecraft().fontRenderer;
renderItemStack(par1ItemStack, par2, par3); renderItemStack(par1ItemStack, par2, par3);
this.zLevel = 0.0F; this.zLevel = 0.0F;
} }
@ -263,7 +263,7 @@ public class CraftingInfoPage extends TitledPage {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private ItemStack[] getFirstRecipeForItem(ItemStack resultingItem) { private ItemStack[] getFirstRecipeForItem(ItemStack resultingItem) {
ItemStack[] recipeItems = new ItemStack[9]; ItemStack[] recipeItems = new ItemStack[9];
for (IRecipe recipe : CraftingManager.field_193380_a) { for (IRecipe recipe : CraftingManager.REGISTRY) {
if (recipe == null) if (recipe == null)
continue; continue;
@ -271,7 +271,7 @@ public class CraftingInfoPage extends TitledPage {
if (result == ItemStack.EMPTY || !result.isItemEqual(resultingItem)) if (result == ItemStack.EMPTY || !result.isItemEqual(resultingItem))
continue; continue;
NonNullList<Ingredient> input = recipe.func_192400_c(); NonNullList<Ingredient> input = recipe.getIngredients();
if (input.isEmpty()) if (input.isEmpty())
continue; continue;
@ -297,7 +297,7 @@ public class CraftingInfoPage extends TitledPage {
protected ItemStack convertToStack(Ingredient ingredient) { protected ItemStack convertToStack(Ingredient ingredient) {
ItemStack entry = ItemStack.EMPTY; ItemStack entry = ItemStack.EMPTY;
entry = ingredient.func_193365_a()[0]; entry = ingredient.getMatchingStacks()[0];
if (entry == null || entry.isEmpty()) if (entry == null || entry.isEmpty())
return null; return null;
entry = entry.copy(); entry = entry.copy();
@ -312,7 +312,7 @@ public class CraftingInfoPage extends TitledPage {
if (field != null) { if (field != null) {
field.setAccessible(true); field.setAccessible(true);
int width = field.getInt(recipe); int width = field.getInt(recipe);
NonNullList<Ingredient> input = recipe.func_192400_c(); NonNullList<Ingredient> input = recipe.getIngredients();
Object[] grid = new Object[9]; Object[] grid = new Object[9];
for (int i = 0, offset = 0, y = 0; y < 3; y++) { for (int i = 0, offset = 0, y = 0; y < 3; y++) {
for (int x = 0; x < 3; x++, i++) { for (int x = 0; x < 3; x++, i++) {

View file

@ -89,15 +89,15 @@ public class DescriptionPage extends TitledPage {
GL11.glTranslated(offsetX + 15, offsetY + 40, 1); GL11.glTranslated(offsetX + 15, offsetY + 40, 1);
GL11.glScalef(descriptionScale, descriptionScale, descriptionScale); GL11.glScalef(descriptionScale, descriptionScale, descriptionScale);
int offset = 0; int offset = 0;
for (String s : getFormattedText(fontRendererObj)) { for (String s : getFormattedText(fontRenderer)) {
if (s == null) if (s == null)
break; break;
if (s.contains("\\%") && s.substring(0, 2).equals("\\%")) { if (s.contains("\\%") && s.substring(0, 2).equals("\\%")) {
s = s.substring(2); s = s.substring(2);
offset += fontRendererObj.FONT_HEIGHT / 2; offset += fontRenderer.FONT_HEIGHT / 2;
} }
fontRendererObj.drawString(s, 0, offset, Color.black.getRGB()); fontRenderer.drawString(s, 0, offset, Color.black.getRGB());
offset += fontRendererObj.FONT_HEIGHT; offset += fontRenderer.FONT_HEIGHT;
} }
GL11.glPopMatrix(); GL11.glPopMatrix();
} }

View file

@ -43,6 +43,6 @@ public class TitledPage extends BasePage {
if (title == null) if (title == null)
title = INDEX_NAME; title = INDEX_NAME;
if (drawTitle) if (drawTitle)
drawCenteredString(minecraft.fontRendererObj, ttl(title), offsetX + 70, offsetY + 10, colour); drawCenteredString(minecraft.fontRenderer, ttl(title), offsetX + 70, offsetY + 10, colour);
} }
} }

View file

@ -37,26 +37,26 @@ public class GuiButtonAHeight extends GuiButton {
} }
@Override @Override
public void func_191745_a(Minecraft minecraft, int mouseX, int mouseY, float ticks) { public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float ticks) {
if (this.visible) { if (this.visible) {
FontRenderer fontrenderer = minecraft.fontRendererObj; FontRenderer fontrenderer = minecraft.fontRenderer;
minecraft.getTextureManager().bindTexture(BUTTON_TEXTURES); minecraft.getTextureManager().bindTexture(BUTTON_TEXTURES);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width
&& mouseY < this.yPosition + this.height; && mouseY < this.y + this.height;
int k = this.getHoverState(this.hovered); int k = this.getHoverState(this.hovered);
GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(770, 771, 1, 0); OpenGlHelper.glBlendFunc(770, 771, 1, 0);
GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
this.drawTexturedModalRect(this.xPosition, this.yPosition, 0, 46 + k * 20, this.width / 2, this.height); this.drawTexturedModalRect(this.x, this.y, 0, 46 + k * 20, this.width / 2, this.height);
this.drawTexturedModalRect(this.xPosition + this.width / 2, this.yPosition, 200 - this.width / 2, this.drawTexturedModalRect(this.x + this.width / 2, this.y, 200 - this.width / 2,
46 + k * 20, this.width / 2, this.height); 46 + k * 20, this.width / 2, this.height);
if (this.height < 20) { if (this.height < 20) {
this.drawTexturedModalRect(xPosition, yPosition + 3, 0, (46 + k * 20) + 20 - height + 3, width / 2, this.drawTexturedModalRect(x, y + 3, 0, (46 + k * 20) + 20 - height + 3, width / 2,
height - 3); height - 3);
this.drawTexturedModalRect(xPosition + width / 2, yPosition + 3, 200 - width / 2, this.drawTexturedModalRect(x + width / 2, y + 3, 200 - width / 2,
(46 + k * 20) + 20 - height + 3, width / 2, height - 3); (46 + k * 20) + 20 - height + 3, width / 2, height - 3);
} }
@ -70,8 +70,8 @@ public class GuiButtonAHeight extends GuiButton {
} else if (this.hovered) { } else if (this.hovered) {
l = 16777120; l = 16777120;
} }
this.drawCenteredString(fontrenderer, this.displayString, this.xPosition + this.width / 2, this.drawCenteredString(fontrenderer, this.displayString, this.x + this.width / 2,
this.yPosition + (this.height - 8) / 2, l); this.y + (this.height - 8) / 2, l);
} }
} }
} }

View file

@ -65,8 +65,8 @@ public class GuiButtonCustomTexture extends GuiButtonExt {
public void drawButton(Minecraft mc, int mouseX, int mouseY) { public void drawButton(Minecraft mc, int mouseX, int mouseY) {
if (this.visible) { if (this.visible) {
boolean flag = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width boolean flag = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width
&& mouseY < this.yPosition + this.height; && mouseY < this.y + this.height;
mc.getTextureManager().bindTexture(BUTTON_TEXTURES); mc.getTextureManager().bindTexture(BUTTON_TEXTURES);
int u = textureU; int u = textureU;
int v = textureV; int v = textureV;
@ -75,15 +75,15 @@ public class GuiButtonCustomTexture extends GuiButtonExt {
u += width; u += width;
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glColor4f(0f, 0f, 0f, 1f); GL11.glColor4f(0f, 0f, 0f, 1f);
this.drawTexturedModalRect(this.xPosition, this.yPosition, u, v, width, height); this.drawTexturedModalRect(this.x, this.y, u, v, width, height);
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
GL11.glEnable(32826); GL11.glEnable(32826);
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting();
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
renderImage(this.xPosition, this.yPosition); renderImage(this.x, this.y);
this.drawString(mc.fontRendererObj, this.NAME, this.xPosition + 20, this.yPosition + 3, this.drawString(mc.fontRenderer, this.NAME, this.x + 20, this.y + 3,
Color.white.getRGB()); Color.white.getRGB());
} }
} }

View file

@ -53,17 +53,17 @@ public class GuiButtonItemTexture extends GuiButtonExt {
public void drawButton(Minecraft mc, int mouseX, int mouseY) { public void drawButton(Minecraft mc, int mouseX, int mouseY) {
if (this.visible) { if (this.visible) {
boolean flag = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width boolean flag = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width
&& mouseY < this.yPosition + this.height; && mouseY < this.y + this.height;
mc.getTextureManager().bindTexture(BUTTON_TEXTURES); mc.getTextureManager().bindTexture(BUTTON_TEXTURES);
int u = textureU; int u = textureU;
int v = textureV; int v = textureV;
if (flag) { if (flag) {
u += mc.fontRendererObj.getStringWidth(this.NAME) + 25; u += mc.fontRenderer.getStringWidth(this.NAME) + 25;
v += mc.fontRendererObj.getStringWidth(this.NAME) + 25; v += mc.fontRenderer.getStringWidth(this.NAME) + 25;
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glColor4f(0f, 0f, 0f, 1f); GL11.glColor4f(0f, 0f, 0f, 1f);
this.drawTexturedModalRect(this.xPosition, this.yPosition, u, v, mc.fontRendererObj.getStringWidth(this.NAME) + 25, height); this.drawTexturedModalRect(this.x, this.y, u, v, mc.fontRenderer.getStringWidth(this.NAME) + 25, height);
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@ -71,8 +71,8 @@ public class GuiButtonItemTexture extends GuiButtonExt {
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting();
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
RenderItem itemRenderer = Minecraft.getMinecraft().getRenderItem(); RenderItem itemRenderer = Minecraft.getMinecraft().getRenderItem();
itemRenderer.renderItemIntoGUI(itemstack, this.xPosition, this.yPosition); itemRenderer.renderItemIntoGUI(itemstack, this.x, this.y);
this.drawString(mc.fontRendererObj, this.NAME, this.xPosition + 20, this.yPosition + 3, this.drawString(mc.fontRenderer, this.NAME, this.x + 20, this.y + 3,
Color.white.getRGB()); Color.white.getRGB());
} }
} }

View file

@ -45,13 +45,13 @@ public class GuiButtonTextOnly extends GuiButton {
} }
@Override @Override
public void func_191745_a(Minecraft minecraft, int mouseX, int mouseY, float partialTicks) { public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float partialTicks) {
if (this.visible) { if (this.visible) {
FontRenderer fontrenderer = minecraft.fontRendererObj; FontRenderer fontrenderer = minecraft.fontRenderer;
minecraft.getTextureManager().bindTexture(BUTTON_TEXTURES); minecraft.getTextureManager().bindTexture(BUTTON_TEXTURES);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width
&& mouseY < this.yPosition + this.height; && mouseY < this.y + this.height;
GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(770, 771, 1, 0); OpenGlHelper.glBlendFunc(770, 771, 1, 0);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@ -74,14 +74,14 @@ public class GuiButtonTextOnly extends GuiButton {
trimmedDisplayString = TextFormatting.BOLD + "" + TextFormatting.ITALIC + trimmedDisplayString; trimmedDisplayString = TextFormatting.BOLD + "" + TextFormatting.ITALIC + trimmedDisplayString;
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glColor4f(0f, 0f, 0f, 1f); GL11.glColor4f(0f, 0f, 0f, 1f);
drawTexturedModalRect(xPosition + (int) (xPosition * 0.01), yPosition + (int) (yPosition * 0.01), 0, 46, drawTexturedModalRect(x + (int) (x * 0.01), y + (int) (y * 0.01), 0, 46,
(int) (fontrenderer.getStringWidth(trimmedDisplayString) * 0.72) + 2, 8); (int) (fontrenderer.getStringWidth(trimmedDisplayString) * 0.72) + 2, 8);
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glScalef(0.7F, 0.7F, 1); GL11.glScalef(0.7F, 0.7F, 1);
fontrenderer.drawString(trimmedDisplayString, (int) (xPosition * 1.45), fontrenderer.drawString(trimmedDisplayString, (int) (x * 1.45),
(int) ((yPosition + (height - 8) / 2) * 1.45), Color.WHITE.getRGB()); (int) ((y + (height - 8) / 2) * 1.45), Color.WHITE.getRGB());
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
} }

View file

@ -69,7 +69,7 @@ public class PacketSyncSideConfig implements INetworkPacket<PacketSyncSideConfig
@Override @Override
public void processData(PacketSyncSideConfig message, MessageContext context) { public void processData(PacketSyncSideConfig message, MessageContext context) {
TileEntity tileEntity = context.getServerHandler().playerEntity.world.getTileEntity(message.pos); TileEntity tileEntity = context.getServerHandler().player.world.getTileEntity(message.pos);
if (tileEntity instanceof IUpgradeable) { if (tileEntity instanceof IUpgradeable) {
ItemStack stack = ((IUpgradeable) tileEntity).getUpgradeInvetory().getStackInSlot(message.slotID); ItemStack stack = ((IUpgradeable) tileEntity).getUpgradeInvetory().getStackInSlot(message.slotID);
ItemNBTHelper.setInt(stack, "side", message.side); ItemNBTHelper.setInt(stack, "side", message.side);