Merge pull request #944 from srs-bsns/BOP-1.11.2-6.0.x
Update to 1.11.2
This commit is contained in:
commit
4977b0100c
|
@ -1,4 +1,4 @@
|
||||||
minecraft_version=1.11
|
minecraft_version=1.11.2
|
||||||
forge_version=13.19.0.2176
|
forge_version=13.20.0.2224
|
||||||
mod_version=6.0.1
|
mod_version=6.0.1
|
||||||
mappings_version=snapshot_nodoc_20161130
|
mappings_version=snapshot_nodoc_20170121
|
||||||
|
|
|
@ -664,9 +664,9 @@ public class GuiBOPConfigureWorld extends GuiScreen implements GuiSlider.FormatH
|
||||||
{
|
{
|
||||||
this.drawDefaultBackground();
|
this.drawDefaultBackground();
|
||||||
this.pageManager.getActivePage().drawScreen(mouseX, mouseY, partialTicks);
|
this.pageManager.getActivePage().drawScreen(mouseX, mouseY, partialTicks);
|
||||||
this.drawCenteredString(this.fontRendererObj, this.screenTitle, this.width / 2, 2, 16777215);
|
this.drawCenteredString(this.fontRenderer, this.screenTitle, this.width / 2, 2, 16777215);
|
||||||
this.drawCenteredString(this.fontRendererObj, this.pageInfo, this.width / 2, 12, 16777215);
|
this.drawCenteredString(this.fontRenderer, this.pageInfo, this.width / 2, 12, 16777215);
|
||||||
this.drawCenteredString(this.fontRendererObj, this.page0Title, this.width / 2, 22, 16777215);
|
this.drawCenteredString(this.fontRenderer, this.page0Title, this.width / 2, 22, 16777215);
|
||||||
super.drawScreen(mouseX, mouseY, partialTicks);
|
super.drawScreen(mouseX, mouseY, partialTicks);
|
||||||
|
|
||||||
if (this.modalAction != 0)
|
if (this.modalAction != 0)
|
||||||
|
@ -688,9 +688,9 @@ public class GuiBOPConfigureWorld extends GuiScreen implements GuiSlider.FormatH
|
||||||
worldrenderer.pos((double)(this.width / 2 + 90), 100.0D, 0.0D).tex(5.625D, 0.0D).color(64, 64, 64, 64).endVertex();
|
worldrenderer.pos((double)(this.width / 2 + 90), 100.0D, 0.0D).tex(5.625D, 0.0D).color(64, 64, 64, 64).endVertex();
|
||||||
worldrenderer.pos((double)(this.width / 2 - 90), 100.0D, 0.0D).tex(0.0D, 0.0D).color(64, 64, 64, 64).endVertex();
|
worldrenderer.pos((double)(this.width / 2 - 90), 100.0D, 0.0D).tex(0.0D, 0.0D).color(64, 64, 64, 64).endVertex();
|
||||||
tessellator.draw();
|
tessellator.draw();
|
||||||
this.drawCenteredString(this.fontRendererObj, I18n.format("createWorld.customize.custom.confirmTitle", new Object[0]), this.width / 2, 105, 16777215);
|
this.drawCenteredString(this.fontRenderer, I18n.format("createWorld.customize.custom.confirmTitle", new Object[0]), this.width / 2, 105, 16777215);
|
||||||
this.drawCenteredString(this.fontRendererObj, I18n.format("createWorld.customize.custom.confirm1", new Object[0]), this.width / 2, 125, 16777215);
|
this.drawCenteredString(this.fontRenderer, I18n.format("createWorld.customize.custom.confirm1", new Object[0]), this.width / 2, 125, 16777215);
|
||||||
this.drawCenteredString(this.fontRendererObj, I18n.format("createWorld.customize.custom.confirm2", new Object[0]), this.width / 2, 135, 16777215);
|
this.drawCenteredString(this.fontRenderer, I18n.format("createWorld.customize.custom.confirm2", new Object[0]), this.width / 2, 135, 16777215);
|
||||||
this.yesButton.drawButton(this.mc, mouseX, mouseY);
|
this.yesButton.drawButton(this.mc, mouseX, mouseY);
|
||||||
this.noButton.drawButton(this.mc, mouseX, mouseY);
|
this.noButton.drawButton(this.mc, mouseX, mouseY);
|
||||||
}
|
}
|
||||||
|
|
|
@ -205,7 +205,7 @@ public class GuiBOPPageTable extends GuiBOPPageList
|
||||||
|
|
||||||
private GuiTextField createTextField(int xPosition, int yPosition, GuiBOPPageList.EditBoxEntry field)
|
private GuiTextField createTextField(int xPosition, int yPosition, GuiBOPPageList.EditBoxEntry field)
|
||||||
{
|
{
|
||||||
GuiTextField guitextfield = new GuiTextField(field.getFieldId(), this.mc.fontRendererObj, xPosition, yPosition, 150, 20);
|
GuiTextField guitextfield = new GuiTextField(field.getFieldId(), this.mc.fontRenderer, xPosition, yPosition, 150, 20);
|
||||||
guitextfield.setText(field.getLabelText());
|
guitextfield.setText(field.getLabelText());
|
||||||
guitextfield.setGuiResponder(this.responder);
|
guitextfield.setGuiResponder(this.responder);
|
||||||
guitextfield.setVisible(field.isVisible());
|
guitextfield.setVisible(field.isVisible());
|
||||||
|
@ -219,11 +219,11 @@ public class GuiBOPPageTable extends GuiBOPPageList
|
||||||
|
|
||||||
if (hasNoNeighbor)
|
if (hasNoNeighbor)
|
||||||
{
|
{
|
||||||
guilabel = new GuiLabel(this.mc.fontRendererObj, field.getFieldId(), xPosition, yPosition, this.width - xPosition * 2, 20, -1);
|
guilabel = new GuiLabel(this.mc.fontRenderer, field.getFieldId(), xPosition, yPosition, this.width - xPosition * 2, 20, -1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
guilabel = new GuiLabel(this.mc.fontRendererObj, field.getFieldId(), xPosition, yPosition, 150, 20, -1);
|
guilabel = new GuiLabel(this.mc.fontRenderer, field.getFieldId(), xPosition, yPosition, 150, 20, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
guilabel.visible = field.isVisible();
|
guilabel.visible = field.isVisible();
|
||||||
|
|
|
@ -31,8 +31,8 @@ public class GuiFlowerBasket extends GuiContainer
|
||||||
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
|
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
|
||||||
{
|
{
|
||||||
String inventoryName = this.inventory.getDisplayName().getUnformattedText();
|
String inventoryName = this.inventory.getDisplayName().getUnformattedText();
|
||||||
this.fontRendererObj.drawString(inventoryName, 8, 6, 4210752);
|
this.fontRenderer.drawString(inventoryName, 8, 6, 4210752);
|
||||||
this.fontRendererObj.drawString(this.playerInventory.getDisplayName().getUnformattedText(), 8, this.ySize - 96 + 2, 4210752);
|
this.fontRenderer.drawString(this.playerInventory.getDisplayName().getUnformattedText(), 8, this.ySize - 96 + 2, 4210752);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue