Refactoring custom GUI components

This commit is contained in:
kordum committed 2017-06-29 11:25:44 +03:00
1 parent e83d0e3fa6
commit 2475710a6a
70 files changed
+353 -343

No files matched your search

@@ -31,8 +31,8 @@ public class ControlColorDisplay extends Control implements IControlValue<IFlowe
@Override
public void onRenderBackground() {
IArea area = getArea();
CraftGUI.Render.solid(area, -1);
CraftGUI.Render.solid(area.inset(1), 0xff000000 + getValue().getColor(false));
CraftGUI.render.solid(area, -1);
CraftGUI.render.solid(area.inset(1), 0xff000000 + getValue().getColor(false));
}
@Override
@@ -19,7 +19,7 @@ public class ControlColorOption extends ControlTextOption<IFlowerColor> {
addAttribute(WidgetAttribute.MOUSE_OVER);
CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f));
textWidget.setSize(textWidget.getSize().sub(new IPoint(24.0f, 0.0f)));
int th = (int) CraftGUI.Render.textHeight(textWidget.getValue(), textWidget.getSize().x());
int th = (int) CraftGUI.render.textHeight(textWidget.getValue(), textWidget.getSize().x());
int height = Math.max(20, th + 6);
setSize(new IPoint(size().x(), height));
textWidget.setSize(new IPoint(textWidget.getSize().x(), height));
@@ -31,9 +31,9 @@ public class ControlColourMixSymbol extends Control implements ITooltip {
public void onRenderBackground() {
super.onRenderBackground();
if (type == 0) {
CraftGUI.Render.texture(ControlColourMixSymbol.MutationPlus, IPoint.ZERO);
CraftGUI.render.texture(ControlColourMixSymbol.MutationPlus, IPoint.ZERO);
} else {
CraftGUI.Render.texture(ControlColourMixSymbol.MutationArrow, IPoint.ZERO);
CraftGUI.render.texture(ControlColourMixSymbol.MutationArrow, IPoint.ZERO);
}
}
@@ -4,6 +4,6 @@ import binnie.core.craftgui.renderer.Renderer;
import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager;
public class CraftGUI {
public static CraftGUIResourceManager ResourceManager;
public static Renderer Render;
public static CraftGUIResourceManager resourceManager;
public static Renderer render;
}
@@ -104,7 +104,7 @@ public interface IWidget {
void setCroppedZone(IWidget relative, IArea area);
boolean isCroppedWidet();
boolean isCroppedWidget();
IWidget getCropWidget();
@@ -173,7 +173,7 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget {
private Collection<IWidget> getQueuedWidgets(IWidget widget) {
List<IWidget> widgets = new ArrayList<>();
boolean addChildren = true;
if (widget.isCroppedWidet()) {
if (widget.isCroppedWidget()) {
addChildren = widget.getCroppedZone().contains(widget.getCropWidget().getRelativeMousePosition());
}
@@ -265,7 +265,7 @@ public class Widget implements IWidget {
}
@Override
public boolean isCroppedWidet() {
public boolean isCroppedWidget() {
return cropped;
}
@@ -280,7 +280,7 @@ public class Widget implements IWidget {
return;
}
CraftGUI.Render.preRender(this);
CraftGUI.render.preRender(this);
onRender(RenderStage.PreChildren);
for (IWidget widget : getWidgets()) {
@@ -288,13 +288,13 @@ public class Widget implements IWidget {
}
for (IWidget widget : getWidgets()) {
CraftGUI.Render.preRender(widget);
CraftGUI.render.preRender(widget);
widget.onRender(RenderStage.PostSiblings);
CraftGUI.Render.postRender(widget);
CraftGUI.render.postRender(widget);
}
onRender(RenderStage.PostChildren);
CraftGUI.Render.postRender(this);
CraftGUI.render.postRender(this);
}
@Override
@@ -110,7 +110,7 @@ public class WindowFieldKit extends Window {
@Override
public void initialiseClient() {
setTitle(getName());
CraftGUI.Render.stylesheet(new StyleSheetPunnett());
CraftGUI.render.stylesheet(new StyleSheetPunnett());
getWindowInventory().createSlot(0);
getWindowInventory().createSlot(1);
setupValidators();
@@ -54,7 +54,7 @@ public class ControlButton extends Control {
} else if (isEnabled()) {
texture = CraftGUITexture.Button;
}
CraftGUI.Render.texture(texture, getArea());
CraftGUI.render.texture(texture, getArea());
}
public String getText() {
@@ -44,7 +44,7 @@ public class ControlCheckbox extends Control implements IControlValue<Boolean> {
if (isMouseOver()) {
texture = (getValue() ? CraftGUITexture.CheckboxCheckedHighlighted : CraftGUITexture.CheckboxHighlighted);
}
CraftGUI.Render.texture(texture, IPoint.ZERO);
CraftGUI.render.texture(texture, IPoint.ZERO);
}
protected void onValueChanged(boolean value) {
@@ -28,7 +28,7 @@ public class ControlText extends Control implements IControlValue<String> {
@Override
public void onRenderBackground() {
CraftGUI.Render.text(getArea(), align, text, getColor());
CraftGUI.render.text(getArea(), align, text, getColor());
}
@Override
@@ -71,7 +71,7 @@ public class ControlTextEdit extends Control implements IControlValue<String> {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.Slot, getArea());
CraftGUI.render.texture(CraftGUITexture.Slot, getArea());
renderTextField();
}
@@ -46,7 +46,7 @@ public class ControlOption<T> extends Control implements IControlValue<T> {
@Override
public void onRenderForeground() {
if (isCurrentSelection()) {
CraftGUI.Render.texture(CraftGUITexture.Outline, getArea());
CraftGUI.render.texture(CraftGUITexture.Outline, getArea());
}
}
@@ -61,7 +61,7 @@ public class ControlScrollBar extends Control {
} else if (isEnabled()) {
texture = CraftGUITexture.Scroll;
}
CraftGUI.Render.texture(texture, renderArea);
CraftGUI.render.texture(texture, renderArea);
}
@Override
@@ -43,7 +43,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
texture = CraftGUITexture.Tab;
}
Texture lTexture = CraftGUI.Render.getTexture(texture);
Texture lTexture = CraftGUI.render.getTexture(texture);
Position position = getTabPosition();
Texture iTexture = lTexture.crop(position, 8.0f);
IArea area = getArea();
@@ -56,7 +56,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
}
}
CraftGUI.Render.texture(iTexture, area);
CraftGUI.render.texture(iTexture, area);
if (this instanceof ControlTabIcon) {
ControlTabIcon icon = (ControlTabIcon) this;
ControlItemDisplay item = (ControlItemDisplay) getWidgets().get(0);
@@ -67,10 +67,10 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
}
if (icon.hasOutline()) {
iTexture = CraftGUI.Render.getTexture(CraftGUITexture.TabOutline);
iTexture = CraftGUI.render.getTexture(CraftGUITexture.TabOutline);
iTexture = iTexture.crop(position, 8.0f);
CraftGUI.Render.color(icon.getOutlineColor());
CraftGUI.Render.texture(iTexture, area.inset(2));
CraftGUI.render.color(icon.getOutlineColor());
CraftGUI.render.texture(iTexture, area.inset(2));
}
}
}
@@ -25,10 +25,10 @@ class ControlBreedingProgress extends Control {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.PanelBlack, getArea());
CraftGUI.render.texture(CraftGUITexture.PanelBlack, getArea());
IArea area = getArea().inset(1);
area.setSize(new IPoint(area.size().x() * percentage, area.size().y()));
CraftGUI.Render.color(colour);
CraftGUI.Render.texture(ControlBreedingProgress.Progress, area);
CraftGUI.render.color(colour);
CraftGUI.render.texture(ControlBreedingProgress.Progress, area);
}
}
@@ -81,7 +81,7 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme
break;
}
if (icon != null) {
CraftGUI.Render.iconItem(IPoint.ZERO, icon);
CraftGUI.render.iconItem(IPoint.ZERO, icon);
}
}
@@ -22,7 +22,7 @@ public class ControlItemStackOption extends ControlTextOption<ItemStack> {
addAttribute(WidgetAttribute.MOUSE_OVER);
CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f));
textWidget.setSize(textWidget.getSize().sub(new IPoint(24.0f, 0.0f)));
int th = (int) CraftGUI.Render.textHeight(textWidget.getValue(), textWidget.getSize().x());
int th = (int) CraftGUI.render.textHeight(textWidget.getValue(), textWidget.getSize().x());
int height = Math.max(20, th + 6);
setSize(new IPoint(size().x(), height));
textWidget.setSize(new IPoint(textWidget.getSize().x(), height));
@@ -26,9 +26,9 @@ class ControlMutationSymbol extends Control implements ITooltip {
public void onRenderBackground() {
super.onRenderBackground();
if (type == 0) {
CraftGUI.Render.texture(ControlMutationSymbol.MutationPlus, IPoint.ZERO);
CraftGUI.render.texture(ControlMutationSymbol.MutationPlus, IPoint.ZERO);
} else {
CraftGUI.Render.texture(ControlMutationSymbol.MutationArrow, IPoint.ZERO);
CraftGUI.render.texture(ControlMutationSymbol.MutationArrow, IPoint.ZERO);
}
}
@@ -29,7 +29,7 @@ class ControlSpeciesBoxOption extends ControlTextOption<IAlleleSpecies> {
CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f));
textWidget.setSize(textWidget.getSize().sub(new IPoint(24.0f, 0.0f)));
int th = (int) CraftGUI.Render.textHeight(textWidget.getValue(), textWidget.getSize().x());
int th = (int) CraftGUI.render.textHeight(textWidget.getValue(), textWidget.getSize().x());
int height = Math.max(20, th + 6);
setSize(new IPoint(size().x(), height));
textWidget.setSize(new IPoint(textWidget.getSize().x(), height));
@@ -56,7 +56,7 @@ public class PageBranchOverview extends PageBranch {
StringBuilder line = new StringBuilder();
List<String> descLines = new ArrayList<>();
for (String str : desc.split(" ")) {
if (CraftGUI.Render.textWidth(line + " " + str) > 134) {
if (CraftGUI.render.textWidth(line + " " + str) > 134) {
descLines.add(EnumChatFormatting.ITALIC + line.toString() + EnumChatFormatting.RESET);
line = new StringBuilder();
}
@@ -64,7 +64,7 @@ public class PageSpeciesOverview extends PageSpecies {
controlDescription.setValue(descBody + EnumChatFormatting.RESET);
controlSignature.setValue(descSig + EnumChatFormatting.RESET);
float descHeight = CraftGUI.Render.textHeight(controlDescription.getValue(), controlDescription.getSize().x());
float descHeight = CraftGUI.render.textHeight(controlDescription.getValue(), controlDescription.getSize().x());
controlSignature.setPosition(new IPoint(controlSignature.pos().x(), controlDescription.getPosition().y() + descHeight + 10.0f));
}
}
@@ -26,9 +26,9 @@ public abstract class Dialog extends Control {
@Override
public void onRenderBackground() {
CraftGUI.Render.gradientRect(getArea().outset(400), -1442840576, -1442840576);
CraftGUI.Render.texture(CraftGUITexture.Window, getArea());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().inset(4));
CraftGUI.render.gradientRect(getArea().outset(400), -1442840576, -1442840576);
CraftGUI.render.texture(CraftGUITexture.Window, getArea());
CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea().inset(4));
}
@Override
@@ -77,10 +77,10 @@ public class GuiCraftGUI extends GuiContainer {
window.setMousePosition(mouseX - (int) window.getPosition().x(), mouseY - (int) window.getPosition().y());
drawDefaultBackground();
GL11.glDisable(32826);
GL11.glDisable(32826); // GL_RESCALE_NORMAL_EXT
RenderHelper.disableStandardItemLighting();
GL11.glDisable(2896);
GL11.glDisable(2929);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_DEPTH_TEST);
zLevel = 10.0f;
GuiScreen.itemRender.zLevel = zLevel;
@@ -88,7 +88,7 @@ public class GuiCraftGUI extends GuiContainer {
RenderHelper.enableGUIStandardItemLighting();
GL11.glPushMatrix();
GL11.glEnable(32826);
GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
InventoryPlayer playerInventory = mc.thePlayer.inventory;
draggedItem = playerInventory.getItemStack();
@@ -96,10 +96,10 @@ public class GuiCraftGUI extends GuiContainer {
renderItem(new IPoint(mouseX - 8, mouseY - 8), draggedItem, 200, false);
renderItem(new IPoint(mouseX - 8, mouseY - 8), draggedItem, 200, false);
}
GL11.glDisable(32826);
GL11.glDisable(32826); // GL_RESCALE_NORMAL_EXT
GL11.glPopMatrix();
GL11.glDisable(2896);
GL11.glDisable(2929);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_DEPTH_TEST);
MinecraftTooltip tooltip = new MinecraftTooltip();
if (isHelpMode()) {
tooltip.setType(Tooltip.Type.HELP);
@@ -108,24 +108,26 @@ public class GuiCraftGUI extends GuiContainer {
tooltip.setType(Tooltip.Type.STANDARD);
window.getTooltip(tooltip);
}
if (tooltip.exists()) {
renderTooltip(new IPoint(mouseX, mouseY), tooltip);
}
zLevel = 0.0f;
GL11.glEnable(2896);
GL11.glEnable(2929);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_DEPTH_TEST);
}
public void renderTooltip(IPoint mousePosition, MinecraftTooltip tooltip) {
int mouseX = (int) mousePosition.x();
int mouseY = (int) mousePosition.y();
FontRenderer font = getFontRenderer();
GL11.glDisable(32826);
GL11.glDisable(32826); // GL_RESCALE_NORMAL_EXT
RenderHelper.disableStandardItemLighting();
GL11.glDisable(2896);
GL11.glDisable(2929);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_DEPTH_TEST);
int k = 0;
List<String> strings = new ArrayList<String>();
List<String> strings = new ArrayList<>();
for (String string : tooltip.getList()) {
if (string != null) {
if (!string.contains("~~~")) {
@@ -135,6 +137,7 @@ public class GuiCraftGUI extends GuiContainer {
}
}
}
for (String s : strings) {
int l = font.getStringWidth(s);
if (s.contains("~~~")) {
@@ -144,6 +147,7 @@ public class GuiCraftGUI extends GuiContainer {
k = l;
}
}
int i1 = mouseX + 12;
int j1 = mouseY - 12;
int k2 = 8;
@@ -158,9 +162,10 @@ public class GuiCraftGUI extends GuiContainer {
}
zLevel = 300.0f;
GuiScreen.itemRender.zLevel = 300.0f;
int l2 = -267386864;
int l2 = 0xf0100010;
int j2;
int i2 = j2 = 1342177280 + MinecraftTooltip.getOutline(tooltip.getType());
int i2 = j2 = 0x50000000 + MinecraftTooltip.getOutline(tooltip.getType());
drawGradientRect(i1 - 3, j1 - 4, i1 + k + 3, j1 - 3, l2, l2);
drawGradientRect(i1 - 3, j1 + k2 + 3, i1 + k + 3, j1 + k2 + 4, l2, l2);
drawGradientRect(i1 - 3, j1 - 3, i1 + k + 3, j1 + k2 + 3, l2, l2);
@@ -170,6 +175,7 @@ public class GuiCraftGUI extends GuiContainer {
drawGradientRect(i1 + k + 2, j1 - 3 + 1, i1 + k + 3, j1 + k2 + 3 - 1, i2, j2);
drawGradientRect(i1 - 3, j1 - 3, i1 + k + 3, j1 - 3 + 1, i2, i2);
drawGradientRect(i1 - 3, j1 + k2 + 2, i1 + k + 3, j1 + k2 + 3, j2, j2);
for (int k3 = 0; k3 < strings.size(); ++k3) {
String s2 = strings.get(k3);
if (k3 == 0) {
@@ -177,6 +183,7 @@ public class GuiCraftGUI extends GuiContainer {
} else {
s2 = MinecraftTooltip.getBody(tooltip.getType()) + s2;
}
if (s2.contains("~~~")) {
String split = s2.split("~~~")[1];
try {
@@ -192,18 +199,20 @@ public class GuiCraftGUI extends GuiContainer {
}
s2 = " " + s2.replaceAll("~~~(.*?)~~~", "");
}
font.drawStringWithShadow(s2, i1, j1, -1);
if (k3 == 0) {
j1 += 2;
}
j1 += 10;
}
zLevel = 0.0f;
GuiScreen.itemRender.zLevel = 0.0f;
GL11.glEnable(2896);
GL11.glEnable(2929);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_DEPTH_TEST);
RenderHelper.enableStandardItemLighting();
GL11.glEnable(32826);
GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
}
@Override
@@ -215,10 +224,6 @@ public class GuiCraftGUI extends GuiContainer {
window.callEvent(new EventMouse.Down(origin, x, y, button));
}
public boolean isShiftDown() {
return Keyboard.isKeyDown(mc.gameSettings.keyBindSneak.getKeyCode());
}
@Override
protected void keyTyped(char c, int key) {
if (key == 1 || (key == mc.gameSettings.keyBindInventory.getKeyCode() && window.getFocusedWidget() == null)) {
@@ -231,10 +236,7 @@ public class GuiCraftGUI extends GuiContainer {
@Override
protected void mouseMovedOrUp(int x, int y, int button) {
IWidget origin = (window.getMousedOverWidget() == null) ? window : window.getMousedOverWidget();
if (button == -1) {
float dx = Mouse.getEventDX() * width / (float) mc.displayWidth;
float dy = -(Mouse.getEventDY() * height / (float) mc.displayHeight);
} else {
if (button != -1) {
window.callEvent(new EventMouse.Up(origin, x, y, button));
}
}
@@ -243,7 +245,6 @@ public class GuiCraftGUI extends GuiContainer {
public void handleMouseInput() {
super.handleMouseInput();
int dWheel = Mouse.getDWheel();
IWidget origin = (window.getFocusedWidget() == null) ? window : window.getFocusedWidget();
if (dWheel != 0) {
window.callEvent(new EventMouse.Wheel(window, dWheel));
}
@@ -254,16 +255,15 @@ public class GuiCraftGUI extends GuiContainer {
window.onClose();
}
public void renderTexturedRect(float x, float y, float u, float v, float w, float h) {
drawTexturedModalRect((int) x, (int) y, (int) u, (int) v, (int) w, (int) h);
}
public void renderTexture(IPoint position, IArea textureArea) {
drawTexturedModalRect((int) position.x(), (int) position.y(), (int) textureArea.pos().x(), (int) textureArea.pos().y(), (int) textureArea.size().x(), (int) textureArea.size().y());
}
private void renderTexturedRect(IArea area, IPoint uv) {
renderTexturedRect(area.pos().x(), area.pos().y(), uv.x(), uv.y(), area.size().x(), area.size().y());
drawTexturedModalRect(
(int) position.x(),
(int) position.y(),
(int) textureArea.pos().x(),
(int) textureArea.pos().y(),
(int) textureArea.size().x(),
(int) textureArea.size().y()
);
}
public void renderTexturePadded(IArea area, IArea texture, IBorder padding) {
@@ -279,19 +279,22 @@ public class GuiCraftGUI extends GuiContainer {
int textHeight = (int) texture.h();
int u = (int) texture.x();
int v = (int) texture.y();
if (borderTop + borderBottom > height) {
borderTop = height / 2;
borderBottom = height / 2;
}
if (borderLeft + borderRight > width) {
borderLeft = width / 2;
borderRight = width / 2;
}
IPoint origin = area.pos();
drawTexturedModalRect(posX, posY, u, v, borderLeft, borderTop);
drawTexturedModalRect(posX + width - borderRight, posY, u + textWidth - borderRight, v, borderRight, borderTop);
drawTexturedModalRect(posX, posY + height - borderBottom, u, v + textHeight - borderBottom, borderLeft, borderBottom);
drawTexturedModalRect(posX + width - borderRight, posY + height - borderBottom, u + textWidth - borderRight, v + textHeight - borderBottom, borderRight, borderBottom);
int texturingWidth;
for (int currentXPos = borderLeft; currentXPos < width - borderRight; currentXPos += texturingWidth) {
int distanceXRemaining = width - borderRight - currentXPos;
@@ -299,9 +302,11 @@ public class GuiCraftGUI extends GuiContainer {
if (texturingWidth > distanceXRemaining) {
texturingWidth = distanceXRemaining;
}
if (texturingWidth <= 0) {
break;
}
drawTexturedModalRect(posX + currentXPos, posY, u + borderLeft, v, texturingWidth, borderTop);
drawTexturedModalRect(posX + currentXPos, posY + height - borderBottom, u + borderLeft, v + textHeight - borderBottom, texturingWidth, borderBottom);
int texturingHeight;
@@ -317,6 +322,7 @@ public class GuiCraftGUI extends GuiContainer {
drawTexturedModalRect(posX + currentXPos, posY + currentYPos, u + borderLeft, v + borderTop, texturingWidth, texturingHeight);
}
}
int texturingHeight2;
for (int currentYPos2 = borderTop; currentYPos2 < height - borderBottom; currentYPos2 += texturingHeight2) {
int distanceYRemaining2 = height - borderBottom - currentYPos2;
@@ -324,6 +330,7 @@ public class GuiCraftGUI extends GuiContainer {
if (texturingHeight2 > distanceYRemaining2) {
texturingHeight2 = distanceYRemaining2;
}
if (texturingHeight2 <= 0) {
break;
}
@@ -332,33 +339,35 @@ public class GuiCraftGUI extends GuiContainer {
}
}
public void drawGradientArea(float p_73733_1_, float p_73733_2_, float p_73733_3_, float p_73733_4_, int p_73733_5_, int p_73733_6_) {
float f = (p_73733_5_ >> 24 & 0xFF) / 255.0f;
float f2 = (p_73733_5_ >> 16 & 0xFF) / 255.0f;
float f3 = (p_73733_5_ >> 8 & 0xFF) / 255.0f;
float f4 = (p_73733_5_ & 0xFF) / 255.0f;
float f5 = (p_73733_6_ >> 24 & 0xFF) / 255.0f;
float f6 = (p_73733_6_ >> 16 & 0xFF) / 255.0f;
float f7 = (p_73733_6_ >> 8 & 0xFF) / 255.0f;
float f8 = (p_73733_6_ & 0xFF) / 255.0f;
GL11.glDisable(3553);
GL11.glEnable(3042);
GL11.glDisable(3008);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
GL11.glShadeModel(7425);
public void drawGradientArea(float x, float y, float width, float height, int color1, int color2) {
float alpha1 = (color1 >> 24 & 0xFF) / 255.0f;
float r1 = (color1 >> 16 & 0xFF) / 255.0f;
float b1 = (color1 >> 8 & 0xFF) / 255.0f;
float g1 = (color1 & 0xFF) / 255.0f;
float alpha2 = (color2 >> 24 & 0xFF) / 255.0f;
float r2 = (color2 >> 16 & 0xFF) / 255.0f;
float g2 = (color2 >> 8 & 0xFF) / 255.0f;
float b2 = (color2 & 0xFF) / 255.0f;
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
GL11.glShadeModel(GL11.GL_SMOOTH);
Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();
tessellator.setColorRGBA_F(f2, f3, f4, f);
tessellator.addVertex(p_73733_3_, p_73733_2_, zLevel);
tessellator.addVertex(p_73733_1_, p_73733_2_, zLevel);
tessellator.setColorRGBA_F(f6, f7, f8, f5);
tessellator.addVertex(p_73733_1_, p_73733_4_, zLevel);
tessellator.addVertex(p_73733_3_, p_73733_4_, zLevel);
tessellator.setColorRGBA_F(r1, b1, g1, alpha1);
tessellator.addVertex(width, y, zLevel);
tessellator.addVertex(x, y, zLevel);
tessellator.setColorRGBA_F(r2, g2, b2, alpha2);
tessellator.addVertex(x, height, zLevel);
tessellator.addVertex(width, height, zLevel);
tessellator.draw();
GL11.glShadeModel(7424);
GL11.glDisable(3042);
GL11.glEnable(3008);
GL11.glEnable(3553);
GL11.glShadeModel(GL11.GL_FLAT);
GL11.glDisable(GL11.GL_BLEND);
GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_TEXTURE_2D);
}
public void renderItem(IPoint pos, ItemStack item, boolean rotating) {
@@ -369,31 +378,31 @@ public class GuiCraftGUI extends GuiContainer {
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
GL11.glPushMatrix();
RenderHelper.enableGUIStandardItemLighting();
GL11.glEnable(32826);
GL11.glEnable(2929);
GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
GL11.glEnable(GL11.GL_DEPTH_TEST);
FontRenderer font = item.getItem().getFontRenderer(item);
if (font == null) {
font = getFontRenderer();
}
if (item != null) {
BinnieCore.proxy.getMinecraftInstance();
float phase = Minecraft.getSystemTime() / 20.0f;
GL11.glPushMatrix();
if (rotating) {
GL11.glTranslatef(8.0f, 8.0f, 0.0f);
GL11.glRotatef(phase, 0.0f, -0.866f, 0.5f);
GL11.glTranslatef(-8.0f, -8.0f, -67.1f);
}
GuiScreen.itemRender.renderItemAndEffectIntoGUI(font, mc.renderEngine, item, (int) pos.x(), (int) pos.y());
GL11.glPopMatrix();
GuiScreen.itemRender.renderItemOverlayIntoGUI(font, mc.renderEngine, item, (int) pos.x(), (int) pos.y(), null);
BinnieCore.proxy.getMinecraftInstance();
float phase = Minecraft.getSystemTime() / 20.0f;
GL11.glPushMatrix();
if (rotating) {
GL11.glTranslatef(8.0f, 8.0f, 0.0f);
GL11.glRotatef(phase, 0.0f, -0.866f, 0.5f);
GL11.glTranslatef(-8.0f, -8.0f, -67.1f);
}
GuiScreen.itemRender.renderItemAndEffectIntoGUI(font, mc.renderEngine, item, (int) pos.x(), (int) pos.y());
GL11.glPopMatrix();
GuiScreen.itemRender.renderItemOverlayIntoGUI(font, mc.renderEngine, item, (int) pos.x(), (int) pos.y(), null);
GL11.glClear(256);
GL11.glEnable(3042);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
RenderHelper.disableStandardItemLighting();
CraftGUI.Render.color(-1);
GL11.glEnable(32826);
CraftGUI.render.color(0xffffffff);
GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
GL11.glPopMatrix();
}
@@ -401,17 +410,18 @@ public class GuiCraftGUI extends GuiContainer {
if (icon == null) {
return;
}
GL11.glPushMatrix();
GL11.glEnable(32826);
GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
BinnieCore.proxy.bindTexture(map);
GuiScreen.itemRender.zLevel = zLevel;
GuiScreen.itemRender.renderIcon((int) pos.x(), (int) pos.y(), icon, 16, 16);
GL11.glEnable(32826);
GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
GL11.glPopMatrix();
}
public boolean isHelpMode() {
return Keyboard.isKeyDown(15);
return Keyboard.isKeyDown(Keyboard.KEY_TAB);
}
public FontRenderer getFontRenderer() {
@@ -432,47 +442,42 @@ public class GuiCraftGUI extends GuiContainer {
float w = area.size().x();
float h = area.size().y();
y = height - (y + h);
float k = xSize;
float scaleX = width / (float) mc.displayWidth;
float scaleY = height / (float) mc.displayHeight;
x += 0.0f;
y += 0.0f;
w += 0.0f;
h += 0.0f;
GL11.glScissor((int) (x / scaleX), (int) (y / scaleY), (int) (w / scaleX), (int) (h / scaleY));
}
public int getZLevel() {
return (int) zLevel;
}
public void drawRect(float x, float y, float width, float height, int color) {
if (x < width) {
float temp = x;
x = width;
width = temp;
}
public void drawRect(float p_73734_0_, float p_73734_1_, float p_73734_2_, float p_73734_3_, int p_73734_4_) {
if (p_73734_0_ < p_73734_2_) {
float j1 = p_73734_0_;
p_73734_0_ = p_73734_2_;
p_73734_2_ = j1;
if (y < height) {
float temp = y;
y = height;
height = temp;
}
if (p_73734_1_ < p_73734_3_) {
float j1 = p_73734_1_;
p_73734_1_ = p_73734_3_;
p_73734_3_ = j1;
}
float f3 = (p_73734_4_ >> 24 & 0xFF) / 255.0f;
float f4 = (p_73734_4_ >> 16 & 0xFF) / 255.0f;
float f5 = (p_73734_4_ >> 8 & 0xFF) / 255.0f;
float f6 = (p_73734_4_ & 0xFF) / 255.0f;
float alpha = (color >> 24 & 0xFF) / 255.0f;
float r = (color >> 16 & 0xFF) / 255.0f;
float g = (color >> 8 & 0xFF) / 255.0f;
float b = (color & 0xFF) / 255.0f;
Tessellator tessellator = Tessellator.instance;
GL11.glEnable(3042);
GL11.glDisable(3553);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
GL11.glColor4f(f4, f5, f6, f3);
GL11.glEnable(GL11.GL_BLEND);
GL11.glDisable(GL11.GL_TEXTURE_2D);
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
GL11.glColor4f(r, g, b, alpha);
tessellator.startDrawingQuads();
tessellator.addVertex(p_73734_0_, p_73734_3_, 0.0);
tessellator.addVertex(p_73734_2_, p_73734_3_, 0.0);
tessellator.addVertex(p_73734_2_, p_73734_1_, 0.0);
tessellator.addVertex(p_73734_0_, p_73734_1_, 0.0);
tessellator.addVertex(x, height, 0.0);
tessellator.addVertex(width, height, 0.0);
tessellator.addVertex(width, y, 0.0);
tessellator.addVertex(x, y, 0.0);
tessellator.draw();
GL11.glEnable(3553);
GL11.glDisable(3042);
GL11.glColor4f(1, 1, 1, 255);
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glDisable(GL11.GL_BLEND);
}
}
@@ -78,8 +78,8 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
ControlSlot.highlighting.put(h, new ArrayList<>());
}
CraftGUI.Render = new Renderer(gui);
CraftGUI.Render.stylesheet(StyleSheetManager.getDefault());
CraftGUI.render = new Renderer(gui);
CraftGUI.render.stylesheet(StyleSheetManager.getDefault());
titleButtonLeft = -14.0f;
if (showHelpButton()) {
@@ -211,15 +211,15 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
@Override
public void onRenderBackground() {
CraftGUI.Render.color(0xffffff);
CraftGUI.render.color(0xffffff);
if (getBackground1() != null) {
CraftGUI.Render.texture(getBackground1(), IPoint.ZERO);
CraftGUI.render.texture(getBackground1(), IPoint.ZERO);
}
if (getBackground2() != null) {
CraftGUI.Render.texture(getBackground2(), new IPoint(256.0f, 0.0f));
CraftGUI.render.texture(getBackground2(), new IPoint(256.0f, 0.0f));
}
CraftGUI.Render.color(getColor());
CraftGUI.Render.texture(CraftGUITexture.Window, getArea());
CraftGUI.render.color(getColor());
CraftGUI.render.texture(CraftGUITexture.Window, getArea());
}
@Override
@@ -85,9 +85,9 @@ public class ControlEnergyBar extends Control implements ITooltip {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.EnergyBarBack, getArea());
CraftGUI.render.texture(CraftGUITexture.EnergyBarBack, getArea());
float percentage = getPercentage() / 100.0f;
CraftGUI.Render.color(getColourFromPercentage(percentage));
CraftGUI.render.color(getColourFromPercentage(percentage));
IArea area = getArea();
switch (direction) {
@@ -106,27 +106,27 @@ public class ControlEnergyBar extends Control implements ITooltip {
if (isMouseOver() && Window.get(this).getGui().isHelpMode()) {
int c = 0xaa000000 + MinecraftTooltip.getOutline(Tooltip.Type.HELP);
CraftGUI.Render.gradientRect(getArea().inset(1), c, c);
CraftGUI.render.gradientRect(getArea().inset(1), c, c);
} else if (ControlEnergyBar.isError) {
int c = 0xaa000000 + MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR);
CraftGUI.Render.gradientRect(getArea().inset(1), c, c);
CraftGUI.render.gradientRect(getArea().inset(1), c, c);
}
CraftGUI.Render.texture(CraftGUITexture.EnergyBarGlow, area);
CraftGUI.render.texture(CraftGUITexture.EnergyBarGlow, area);
GL11.glColor3d(1.0, 1.0, 1.0);
CraftGUI.Render.texture(CraftGUITexture.EnergyBarGlass, getArea());
CraftGUI.render.texture(CraftGUITexture.EnergyBarGlass, getArea());
}
@Override
public void onRenderForeground() {
if (isMouseOver() && Window.get(this).getGui().isHelpMode()) {
IArea area = getArea();
CraftGUI.Render.color(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
CraftGUI.render.color(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.render.texture(CraftGUITexture.Outline, area.outset(1));
} else if (ControlEnergyBar.isError) {
IArea area = getArea();
CraftGUI.Render.color(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
CraftGUI.render.color(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.render.texture(CraftGUITexture.Outline, area.outset(1));
}
}
@@ -32,7 +32,7 @@ public class ControlErrorState extends Control implements ITooltip {
} else if (type == 0) {
texture = CraftGUITexture.StateError;
}
CraftGUI.Render.texture(texture, IPoint.ZERO);
CraftGUI.render.texture(texture, IPoint.ZERO);
super.onRenderBackground();
}
@@ -17,7 +17,7 @@ public class ControlHelp extends Control implements ITooltip {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.HelpButton, getArea());
CraftGUI.render.texture(CraftGUITexture.HelpButton, getArea());
}
@Override
@@ -16,6 +16,6 @@ public class ControlIconDisplay extends Control {
@Override
public void onRenderForeground() {
CraftGUI.Render.iconItem(IPoint.ZERO, icon);
CraftGUI.render.iconItem(IPoint.ZERO, icon);
}
}
@@ -16,6 +16,6 @@ public class ControlImage extends Control {
@Override
public void onRenderForeground() {
CraftGUI.Render.texture(key, IPoint.ZERO);
CraftGUI.render.texture(key, IPoint.ZERO);
}
}
@@ -20,7 +20,7 @@ public class ControlInfo extends Control implements ITooltip {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.InfoButton, getArea());
CraftGUI.render.texture(CraftGUITexture.InfoButton, getArea());
}
@Override
@@ -60,10 +60,10 @@ public class ControlItemDisplay extends Control implements ITooltip {
GL11.glScalef(scale, scale, 1.0f);
BinnieCore.proxy.getMinecraftInstance();
float phase = Minecraft.getSystemTime() / 20.0f;
CraftGUI.Render.item(IPoint.ZERO, itemStack, rotating);
CraftGUI.render.item(IPoint.ZERO, itemStack, rotating);
GL11.glPopMatrix();
} else {
CraftGUI.Render.item(IPoint.ZERO, itemStack, rotating);
CraftGUI.render.item(IPoint.ZERO, itemStack, rotating);
}
}
@@ -72,18 +72,18 @@ public class ControlLiquidTank extends Control implements ITooltip {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(horizontal ? CraftGUITexture.HorizontalLiquidTank : CraftGUITexture.LiquidTank, IPoint.ZERO);
CraftGUI.render.texture(horizontal ? CraftGUITexture.HorizontalLiquidTank : CraftGUITexture.LiquidTank, IPoint.ZERO);
if (isMouseOver() && Window.get(this).getGui().isHelpMode()) {
int c = 0xaa000000 + MinecraftTooltip.getOutline(Tooltip.Type.HELP);
CraftGUI.Render.gradientRect(getArea().inset(1), c, c);
CraftGUI.render.gradientRect(getArea().inset(1), c, c);
} else if (ControlLiquidTank.tankError.contains(tankID)) {
int c = 0xaa000000 + MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR);
CraftGUI.Render.gradientRect(getArea().inset(1), c, c);
CraftGUI.render.gradientRect(getArea().inset(1), c, c);
} else if (getSuperParent().getMousedOverWidget() == this) {
if (Window.get(this).getGui().getDraggedItem() != null) {
CraftGUI.Render.gradientRect(getArea().inset(1), 0xaaff9999, 0xaaff9999);
CraftGUI.render.gradientRect(getArea().inset(1), 0xaaff9999, 0xaaff9999);
} else {
CraftGUI.Render.gradientRect(getArea().inset(1), 0x80ffffff, 0x80ffffff);
CraftGUI.render.gradientRect(getArea().inset(1), 0x80ffffff, 0x80ffffff);
}
}
@@ -96,8 +96,8 @@ public class ControlLiquidTank extends Control implements ITooltip {
int g = (hex & 0xFF00) >> 8;
int b = hex & 0xFF;
GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f);
GL11.glEnable(3042);
GL11.glBlendFunc(770, 771);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
IPoint pos = getAbsolutePosition();
IPoint offset = new IPoint(0.0f, height - squaled);
IArea limited = getArea().inset(1);
@@ -105,34 +105,35 @@ public class ControlLiquidTank extends Control implements ITooltip {
limited.setSize(new IPoint(limited.w() - 1.0f, limited.h()));
}
CraftGUI.Render.limitArea(new IArea(limited.pos().add(pos).add(offset), limited.size().sub(offset)));
GL11.glEnable(3089);
CraftGUI.render.limitArea(new IArea(limited.pos().add(pos).add(offset), limited.size().sub(offset)));
GL11.glEnable(GL11.GL_SCISSOR_TEST);
BinnieCore.proxy.bindTexture(TextureMap.locationItemsTexture);
for (int y = 0; y < height; y += 16) {
for (int x = 0; x < (horizontal ? 58 : 16); x += 16) {
IIcon icon = fluid.getIcon();
CraftGUI.Render.iconBlock(new IPoint(1 + x, 1 + y), icon);
CraftGUI.render.iconBlock(new IPoint(x + 1, y + 1), icon);
}
}
GL11.glDisable(3089);
GL11.glDisable(3042);
GL11.glDisable(GL11.GL_SCISSOR_TEST);
GL11.glDisable(GL11.GL_BLEND);
GL11.glColor4f(1, 1, 1, 1.0f);
}
}
@Override
public void onRenderForeground() {
CraftGUI.Render.texture(horizontal ? CraftGUITexture.HorizontalLiquidTankOverlay : CraftGUITexture.LiquidTankOverlay, IPoint.ZERO);
CraftGUI.render.texture(horizontal ? CraftGUITexture.HorizontalLiquidTankOverlay : CraftGUITexture.LiquidTankOverlay, IPoint.ZERO);
if (isMouseOver() && Window.get(this).getGui().isHelpMode()) {
IArea area = getArea();
CraftGUI.Render.color(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
CraftGUI.render.color(MinecraftTooltip.getOutline(Tooltip.Type.HELP));
CraftGUI.render.texture(CraftGUITexture.Outline, area.outset(1));
}
if (ControlLiquidTank.tankError.contains(tankID)) {
IArea area = getArea();
CraftGUI.Render.color(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
CraftGUI.render.color(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR));
CraftGUI.render.texture(CraftGUITexture.Outline, area.outset(1));
}
}
@@ -21,7 +21,7 @@ public class ControlPowerSystem extends Control implements ITooltip {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.PowerButton, getArea());
CraftGUI.render.texture(CraftGUITexture.PowerButton, getArea());
}
@Override
@@ -20,7 +20,7 @@ public class ControlProgress extends ControlProgressBase {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(progressBlank, getArea());
CraftGUI.Render.texturePercentage(progressBar, getArea(), direction, progress);
CraftGUI.render.texture(progressBlank, getArea());
CraftGUI.render.texturePercentage(progressBar, getArea(), direction, progress);
}
}
@@ -37,17 +37,17 @@ public class ControlSlide extends Control {
public void onRenderBackground() {
super.onRenderBackground();
if (label != null) {
float lw = CraftGUI.Render.textWidth(label) + 16;
float lh = CraftGUI.Render.textHeight() + 16;
float lw = CraftGUI.render.textWidth(label) + 16;
float lh = CraftGUI.render.textHeight() + 16;
boolean hor = anchor.x() != 0;
IArea ar = isSlideActive() ? expanded : shrunk;
IArea tabArea = new IArea(hor ? (-lh / 2.0f) : (-lw / 2.0f), hor ? (-lw / 2.0f) : (-lh / 2.0f), hor ? lh : lw, hor ? lw : lh);
IPoint shift = new IPoint(ar.w() * (1 - anchor.x()) / 2.0f, ar.h() * (1 - anchor.y()) / 2.0f);
tabArea = tabArea.shift(shift.x() - (-3.0f + lh / 2.0f) * anchor.x(), shift.y() - (-3.0f + lh / 2.0f) * anchor.y());
Texture texture = CraftGUI.Render.getTexture(isSlideActive() ? CraftGUITexture.Tab : CraftGUITexture.TabDisabled).crop(anchor.opposite(), 8.0f);
CraftGUI.Render.texture(texture, tabArea);
texture = CraftGUI.Render.getTexture(CraftGUITexture.TabOutline).crop(anchor.opposite(), 8.0f);
CraftGUI.Render.texture(texture, tabArea.inset(2));
Texture texture = CraftGUI.render.getTexture(isSlideActive() ? CraftGUITexture.Tab : CraftGUITexture.TabDisabled).crop(anchor.opposite(), 8.0f);
CraftGUI.render.texture(texture, tabArea);
texture = CraftGUI.render.getTexture(CraftGUITexture.TabOutline).crop(anchor.opposite(), 8.0f);
CraftGUI.render.texture(texture, tabArea.inset(2));
IArea labelArea = new IArea(-lw / 2.0f, 0.0f, lw, lh);
GL11.glPushMatrix();
GL11.glTranslatef(shift.x() + anchor.x() * 2.0f, shift.y() + anchor.y() * 2.0f, 0.0f);
@@ -57,12 +57,12 @@ public class ControlSlide extends Control {
if (anchor.y() > 0) {
GL11.glTranslatef(0.0f, -lh, 0.0f);
}
CraftGUI.Render.text(labelArea, TextJustification.MIDDLE_CENTER, label, 16777215);
CraftGUI.render.text(labelArea, TextJustification.MIDDLE_CENTER, label, 16777215);
GL11.glPopMatrix();
}
CraftGUI.Render.texture(CraftGUITexture.Window, getArea());
CraftGUI.render.texture(CraftGUITexture.Window, getArea());
Object slideTexture = (anchor == Position.BOTTOM) ? CraftGUITexture.SlideDown : ((anchor == Position.TOP) ? CraftGUITexture.SlideUp : ((anchor == Position.LEFT) ? CraftGUITexture.SlideLeft : CraftGUITexture.SlideRight));
CraftGUI.Render.texture(slideTexture, new IPoint((anchor.x() + 1.0f) * w() / 2.0f - 8.0f, (anchor.y() + 1.0f) * h() / 2.0f - 8.0f));
CraftGUI.render.texture(slideTexture, new IPoint((anchor.x() + 1.0f) * w() / 2.0f - 8.0f, (anchor.y() + 1.0f) * h() / 2.0f - 8.0f));
}
public boolean isSlideActive() {
@@ -66,7 +66,7 @@ public class ControlSlot extends ControlSlotBase {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.Slot, IPoint.ZERO);
CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO);
if (slot == null) {
return;
}
@@ -75,7 +75,7 @@ public class ControlSlot extends ControlSlotBase {
if (islot != null && islot.getValidator() != null) {
IIcon icon = islot.getValidator().getIcon(!islot.getInputSides().isEmpty());
if (icon != null) {
CraftGUI.Render.iconItem(new IPoint(1.0f, 1.0f), icon);
CraftGUI.render.iconItem(new IPoint(1.0f, 1.0f), icon);
}
}
@@ -90,13 +90,13 @@ public class ControlSlot extends ControlSlotBase {
highlighted = true;
int c = 0xaa000000 + Math.min(highlight.getKey().getColour(), 0xffffff);
CraftGUI.Render.gradientRect(new IArea(1.0f, 1.0f, 16.0f, 16.0f), c, c);
CraftGUI.render.gradientRect(new IArea(1.0f, 1.0f, 16.0f, 16.0f), c, c);
}
if (!highlighted && getSuperParent().getMousedOverWidget() == this) {
if (Window.get(this).getGui().getDraggedItem() != null && !slot.isItemValid(Window.get(this).getGui().getDraggedItem())) {
CraftGUI.Render.gradientRect(new IArea(1.0f, 1.0f, 16.0f, 16.0f), 0xaaff9999, 0xaaff9999);
CraftGUI.render.gradientRect(new IArea(1.0f, 1.0f, 16.0f, 16.0f), 0xaaff9999, 0xaaff9999);
} else {
CraftGUI.Render.gradientRect(new IArea(1.0f, 1.0f, 16.0f, 16.0f), 0x80ffffff, 0x80ffffff);
CraftGUI.render.gradientRect(new IArea(1.0f, 1.0f, 16.0f, 16.0f), 0x80ffffff, 0x80ffffff);
}
}
}
@@ -123,8 +123,8 @@ public class ControlSlot extends ControlSlotBase {
area = getParent().getArea();
area.setPosition(IPoint.ZERO.sub(getPosition()));
}
CraftGUI.Render.color(c);
CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1));
CraftGUI.render.color(c);
CraftGUI.render.texture(CraftGUITexture.Outline, area.outset(1));
}
}
@@ -40,9 +40,9 @@ public abstract class ControlSlotBase extends Control implements ITooltip {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.Slot, getArea());
CraftGUI.render.texture(CraftGUITexture.Slot, getArea());
if (getSuperParent().getMousedOverWidget() == this) {
CraftGUI.Render.gradientRect(new IArea(new IPoint(1.0f, 1.0f), getArea().size().sub(new IPoint(2.0f, 2.0f))), 0x80ffffff, 0x80ffffff);
CraftGUI.render.gradientRect(new IArea(new IPoint(1.0f, 1.0f), getArea().size().sub(new IPoint(2.0f, 2.0f))), 0x80ffffff, 0x80ffffff);
}
}
@@ -25,8 +25,8 @@ public class ControlSlotCharge extends Control {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.PanelBlack, getArea());
CraftGUI.Render.texturePercentage(CraftGUI.Render.getTexture(CraftGUITexture.SlotCharge), getArea().inset(1), Position.BOTTOM, getCharge());
CraftGUI.render.texture(CraftGUITexture.PanelBlack, getArea());
CraftGUI.render.texturePercentage(CraftGUI.render.getTexture(CraftGUITexture.SlotCharge), getArea().inset(1), Position.BOTTOM, getCharge());
}
@Override
@@ -23,7 +23,7 @@ public class ControlUser extends Control implements ITooltip {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.UserButton, getArea());
CraftGUI.render.texture(CraftGUITexture.UserButton, getArea());
}
@Override
@@ -18,12 +18,12 @@ import java.util.List;
public class Renderer {
protected GuiCraftGUI gui;
protected int currentColour;
protected int currentColor;
protected Texture currentTexture;
protected IStyleSheet stylesheet;
public Renderer(GuiCraftGUI gui) {
currentColour = 16777215;
currentColor = 0xffffff;
this.gui = gui;
}
@@ -31,37 +31,39 @@ public class Renderer {
GL11.glPushMatrix();
GL11.glTranslatef(widget.getPosition().x(), widget.getPosition().y(), 0.0f);
color(widget.getColor());
if (widget.isCroppedWidet()) {
if (widget.isCroppedWidget()) {
IWidget cropRelative = (widget.getCropWidget() != null) ? widget.getCropWidget() : widget;
IPoint pos = cropRelative.getAbsolutePosition();
IArea cropZone = widget.getCroppedZone();
GL11.glEnable(3089);
GL11.glEnable(GL11.GL_SCISSOR_TEST);
limitArea(new IArea(pos.add(cropZone.pos()), cropZone.size()));
}
GL11.glDisable(2929);
GL11.glDisable(GL11.GL_DEPTH_TEST);
}
public void postRender(IWidget widget) {
if (widget.isCroppedWidet()) {
GL11.glDisable(3089);
if (widget.isCroppedWidget()) {
GL11.glDisable(GL11.GL_SCISSOR_TEST);
}
GL11.glEnable(2929);
GL11.glEnable(GL11.GL_DEPTH_TEST);
GL11.glPopMatrix();
}
public void color(int hex) {
currentColour = hex;
currentColor = hex;
int a = (hex & 0xFF000000) >> 24;
int r = (hex & 0xFF0000) >> 16;
int g = (hex & 0xFF00) >> 8;
int b = hex & 0xFF;
if (a < 0) {
a += 256;
}
if (a > 0 && a != 255) {
GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f);
GL11.glEnable(3042);
GL11.glEnable(GL11.GL_BLEND);
} else {
GL11.glColor3f(r / 255.0f, g / 255.0f, b / 255.0f);
}
@@ -78,7 +80,7 @@ public class Renderer {
if (texture != currentTexture && texture != null) {
BinnieCore.proxy.bindTexture(texture.getFilename());
}
color(currentColour);
color(currentColor);
}
public void texture(Object texture, IPoint position) {
@@ -89,6 +91,7 @@ public class Renderer {
if (texture == null) {
return;
}
setTexture(texture);
IPoint point = position.sub(new IPoint(texture.getBorder().l(), texture.getBorder().t()));
IArea textureArea = texture.getArea().outset(texture.getBorder());
@@ -103,6 +106,7 @@ public class Renderer {
if (texture == null) {
return;
}
setTexture(texture);
IArea textureArea = texture.getArea().outset(texture.getBorder());
IArea targetArea = area.outset(texture.getBorder());
@@ -146,7 +150,7 @@ public class Renderer {
float stringWidth = textWidth(string);
float posX = area.size().x() - stringWidth;
posX *= justification.getXOffset();
GL11.glDisable(2929);
GL11.glDisable(GL11.GL_DEPTH_TEST);
gui.getFontRenderer().drawString(string, (int) (pos.x() + posX), (int) posY, colour);
posY += textHeight();
}
@@ -16,7 +16,7 @@ public class StyleSheetManager {
private static class DefaultStyleSheet implements IStyleSheet {
@Override
public Texture getTexture(Object key) {
return CraftGUI.ResourceManager.getTexture(key.toString());
return CraftGUI.resourceManager.getTexture(key.toString());
}
}
}
@@ -34,7 +34,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener {
public CraftGUIResourceManager() {
textureSheets = new HashMap<>();
textures = new HashMap<>();
CraftGUI.ResourceManager = this;
CraftGUI.resourceManager = this;
}
@Override
@@ -26,6 +26,6 @@ public enum CraftGUITextureSheet implements IBinnieTexture {
if (BinnieCore.proxy.isServer()) {
return null;
}
return CraftGUI.ResourceManager.getTextureSheet(name).getTexture();
return CraftGUI.resourceManager.getTextureSheet(name).getTexture();
}
}
@@ -25,23 +25,23 @@ public class Panel extends Control {
if (panelType instanceof MinecraftGUI.PanelType) {
switch ((MinecraftGUI.PanelType) panelType) {
case Black:
CraftGUI.Render.texture(CraftGUITexture.PanelBlack, getArea());
CraftGUI.render.texture(CraftGUITexture.PanelBlack, getArea());
break;
case Gray:
CraftGUI.Render.texture(CraftGUITexture.PanelGray, getArea());
CraftGUI.render.texture(CraftGUITexture.PanelGray, getArea());
break;
case Tinted:
CraftGUI.Render.texture(CraftGUITexture.PanelTinted, getArea());
CraftGUI.render.texture(CraftGUITexture.PanelTinted, getArea());
break;
case Outline:
CraftGUI.Render.texture(CraftGUITexture.Outline, getArea());
CraftGUI.render.texture(CraftGUITexture.Outline, getArea());
break;
case TabOutline:
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea());
CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea());
break;
}
}
@@ -37,6 +37,6 @@ class ControlColourSelector extends Control implements ITooltip, IControlValue<E
@Override
public void onRenderBackground() {
super.onRenderBackground();
CraftGUI.Render.gradientRect(getArea(), 0xff000000 + value.getColor(), 0xff000000 + value.getColor());
CraftGUI.render.gradientRect(getArea(), 0xff000000 + value.getColor(), 0xff000000 + value.getColor());
}
}
@@ -162,9 +162,9 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
Panel panel = new Panel(thisPage, 0.0f, 0.0f, thisPage.w(), thisPage.h(), MinecraftGUI.PanelType.Black) {
@Override
public void onRenderForeground() {
Texture iTexture = CraftGUI.Render.getTexture(CraftGUITexture.TabOutline);
CraftGUI.Render.color(getTab(panels.get(this)).getColor().getColor());
CraftGUI.Render.texture(iTexture, getArea().inset(3));
Texture iTexture = CraftGUI.render.getTexture(CraftGUITexture.TabOutline);
CraftGUI.render.color(getTab(panels.get(this)).getColor().getColor());
CraftGUI.render.texture(iTexture, getArea().inset(3));
}
};
@@ -314,8 +314,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
ControlScrollableContent<IWidget> scroll = new ControlScrollableContent<IWidget>(this, 124.0f, 16.0f, 116.0f, 92.0f, 6.0f) {
@Override
public void onRenderBackground() {
CraftGUI.Render.color(11184810);
CraftGUI.Render.texture(CraftGUITexture.Outline, getArea().inset(new IBorder(0.0f, 6.0f, 0.0f, 0.0f)));
CraftGUI.render.color(11184810);
CraftGUI.render.texture(CraftGUITexture.Outline, getArea().inset(new IBorder(0.0f, 6.0f, 0.0f, 0.0f)));
}
};
slotGrid = new Control(scroll, 1.0f, 1.0f, 108.0f, 18.0f);
@@ -482,7 +482,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
@Override
public void onRenderBackground() {
Object texture = isMouseOver() ? CraftGUITexture.TabHighlighted : CraftGUITexture.Tab;
CraftGUI.Render.texture(CraftGUI.Render.getTexture(texture).crop(Position.BOTTOM, 8.0f), getArea());
CraftGUI.render.texture(CraftGUI.render.getTexture(texture).crop(Position.BOTTOM, 8.0f), getArea());
}
}
}
@@ -70,7 +70,7 @@ public class ControlClimateBar extends Control implements ITooltip {
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.EnergyBarBack, getArea());
CraftGUI.render.texture(CraftGUITexture.EnergyBarBack, getArea());
int types = isHumidity ? 3 : 6;
int w = (int) ((getSize().x() - 2.0f) / types);
for (int i = 0; i < types; ++i) {
@@ -82,10 +82,10 @@ public class ControlClimateBar extends Control implements ITooltip {
} else {
color = TEMP_COLORS[i];
}
CraftGUI.Render.solid(new IArea(x + 1, 1.0f, w, getSize().y() - 2.0f), color.getRGB());
CraftGUI.render.solid(new IArea(x + 1, 1.0f, w, getSize().y() - 2.0f), color.getRGB());
}
}
CraftGUI.Render.texture(CraftGUITexture.EnergyBarGlass, getArea());
CraftGUI.render.texture(CraftGUITexture.EnergyBarGlass, getArea());
}
public void setSpecies(IAlleleBeeSpecies species) {
@@ -218,7 +218,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
int meta = TileEntityMetadata.getItemDamage(stack);
String typeName = getDoorType(meta).getName();
String woodName = WoodManager.getPlankType(meta & 0xFF).getName();
if (typeName.equals("")) {
if (typeName.isEmpty()) {
return I18N.localise("extratrees.block.door.name", woodName);
}
return I18N.localise("extratrees.block.door.name.adv", woodName, typeName);
@@ -16,6 +16,6 @@ public class ControlBlockIconDisplay extends Control {
@Override
public void onRenderBackground() {
CraftGUI.Render.iconBlock(IPoint.ZERO, icon);
CraftGUI.render.iconBlock(IPoint.ZERO, icon);
}
}
@@ -68,10 +68,10 @@ public class ControlFluidDisplay extends Control implements ITooltip {
GL11.glPushMatrix();
float scale = getSize().x() / 16.0f;
GL11.glScalef(scale, scale, 1.0f);
CraftGUI.Render.iconBlock(IPoint.ZERO, itemStack.getFluid().getIcon(itemStack));
CraftGUI.render.iconBlock(IPoint.ZERO, itemStack.getFluid().getIcon(itemStack));
GL11.glPopMatrix();
} else {
CraftGUI.Render.iconBlock(IPoint.ZERO, itemStack.getFluid().getIcon(itemStack));
CraftGUI.render.iconBlock(IPoint.ZERO, itemStack.getFluid().getIcon(itemStack));
}
GL11.glDisable(3042);
}
@@ -45,7 +45,7 @@ public class ControlLumbermillProgress extends ControlProgressBase {
public void onRenderForeground() {
GL11.glDisable(2896);
int sawX = (int) (63.0f * progress);
CraftGUI.Render.texture(ControlLumbermillProgress.saw, new IPoint(sawX, -8.0f + 6.0f * (float) Math.sin(animation)));
CraftGUI.render.texture(ControlLumbermillProgress.saw, new IPoint(sawX, -8.0f + 6.0f * (float) Math.sin(animation)));
ItemStack item = Window.get(this).getInventory().getStackInSlot(Lumbermill.SLOT_WOOD);
if (item == null) {
return;
@@ -62,7 +62,7 @@ public class ControlLumbermillProgress extends ControlProgressBase {
IIcon icon = block.getIcon(2, item.getItemDamage());
for (int i = 0; i < 4; ++i) {
CraftGUI.Render.iconBlock(new IPoint(1 + i * 16, 1.0f), icon);
CraftGUI.render.iconBlock(new IPoint(1 + i * 16, 1.0f), icon);
}
ItemStack result = Lumbermill.getPlankProduct(item);
if (result == null) {
@@ -79,12 +79,12 @@ public class ControlLumbermillProgress extends ControlProgressBase {
IIcon icon2 = block2.getIcon(2, result.getItemDamage());
IPoint pos = getAbsolutePosition();
CraftGUI.Render.limitArea(new IArea(pos.add(new IPoint(0.0f, 0.0f)), new IPoint(progress * 64.0f + 2.0f, 18.0f)));
CraftGUI.render.limitArea(new IArea(pos.add(new IPoint(0.0f, 0.0f)), new IPoint(progress * 64.0f + 2.0f, 18.0f)));
GL11.glEnable(3089);
for (int j = 0; j < 4; ++j) {
CraftGUI.Render.iconBlock(new IPoint(1 + j * 16, 1.0f), icon2);
CraftGUI.render.iconBlock(new IPoint(1 + j * 16, 1.0f), icon2);
}
GL11.glDisable(3089);
CraftGUI.Render.texture(ControlLumbermillProgress.saw2, new IPoint(sawX + 2, -8.0f + 6.0f * (float) Math.sin(animation)));
CraftGUI.render.texture(ControlLumbermillProgress.saw2, new IPoint(sawX + 2, -8.0f + 6.0f * (float) Math.sin(animation)));
}
}
@@ -38,9 +38,9 @@ public class ControlSlotFluid extends Control implements ITooltip {
@Override
public void onRenderBackground() {
int size = (int) getSize().x();
CraftGUI.Render.texture(CraftGUITexture.Slot, getArea());
CraftGUI.render.texture(CraftGUITexture.Slot, getArea());
if (getSuperParent().getMousedOverWidget() == this) {
CraftGUI.Render.gradientRect(new IArea(new IPoint(1.0f, 1.0f), getArea().size().sub(new IPoint(2.0f, 2.0f))), 0x80ffffff, 0x80ffffff);
CraftGUI.render.gradientRect(new IArea(new IPoint(1.0f, 1.0f), getArea().size().sub(new IPoint(2.0f, 2.0f))), 0x80ffffff, 0x80ffffff);
}
}
@@ -147,21 +147,21 @@ public class ControlTileSelect extends Control implements IControlValue<IDesign>
@Override
public void onRenderBackground() {
CraftGUI.Render.texture(CraftGUITexture.Slot, IPoint.ZERO);
CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO);
}
@Override
public void onRenderForeground() {
ItemStack image = ((WindowWoodworker) getSuperParent()).getDesignerType().getDisplayStack(getValue());
CraftGUI.Render.item(new IPoint(1.0f, 1.0f), image);
CraftGUI.render.item(new IPoint(1.0f, 1.0f), image);
if (((IControlValue) getParent()).getValue() == getValue()) {
return;
}
if (Window.get(this).getMousedOverWidget() == this) {
CraftGUI.Render.gradientRect(getArea().inset(1), 0x44ffffff, 0x44ffffff);
CraftGUI.render.gradientRect(getArea().inset(1), 0x44ffffff, 0x44ffffff);
} else {
CraftGUI.Render.gradientRect(getArea().inset(1), 0xaa888888, 0xaa888888);
CraftGUI.render.gradientRect(getArea().inset(1), 0xaa888888, 0xaa888888);
}
}
@@ -70,7 +70,7 @@ public class PagePlanksOverview extends PageAbstract<ItemStack> {
controlDescription.setValue(descBody + EnumChatFormatting.RESET);
controlSignature.setValue(descSig + EnumChatFormatting.RESET);
float descHeight = CraftGUI.Render.textHeight(controlDescription.getValue(), controlDescription.getSize().x());
float descHeight = CraftGUI.render.textHeight(controlDescription.getValue(), controlDescription.getSize().x());
controlSignature.setPosition(new IPoint(controlSignature.pos().x(), controlDescription.getPosition().y() + descHeight + 10.0f));
}
}
@@ -67,12 +67,12 @@ public class ControlGene extends Control implements IControlValue<IGene>, IToolt
@Override
public void onRenderBackground() {
if (isMouseOver() && canFill(Window.get(this).getHeldItemStack())) {
CraftGUI.Render.solid(getArea(), 0xffffffff);
CraftGUI.Render.solid(getArea().inset(1), 0xff444444);
CraftGUI.render.solid(getArea(), 0xffffffff);
CraftGUI.render.solid(getArea().inset(1), 0xff444444);
}
CraftGUI.Render.color(0xffffffff);
CraftGUI.Render.iconItem(IPoint.ZERO, GeneticsTexture.dnaIcon.getIcon());
CraftGUI.render.color(0xffffffff);
CraftGUI.render.iconItem(IPoint.ZERO, GeneticsTexture.dnaIcon.getIcon());
}
private class MouseDownHandler extends EventMouse.Down.Handler {
@@ -42,10 +42,10 @@ public class ControlSplicerProgress extends ControlProgressBase {
c2 += alpha;
c3 += alpha;
c4 += alpha;
CraftGUI.Render.solidAlpha(new IArea(w() / 2.0f + y, offMovement * percentView, 4.0f, h / 2.0f), c1);
CraftGUI.Render.solidAlpha(new IArea(w() / 2.0f + y, offMovement * percentView + 4.0f, 4.0f, h / 2.0f), (y < 0.0f) ? c2 : c3);
CraftGUI.Render.solidAlpha(new IArea(w() / 2.0f + y, h() - offMovement * percentView - 8.0f, 4.0f, h / 2.0f), (y < 0.0f) ? c3 : c2);
CraftGUI.Render.solidAlpha(new IArea(w() / 2.0f + y, h() - offMovement * percentView - 4.0f, 4.0f, h / 2.0f), c4);
CraftGUI.render.solidAlpha(new IArea(w() / 2.0f + y, offMovement * percentView, 4.0f, h / 2.0f), c1);
CraftGUI.render.solidAlpha(new IArea(w() / 2.0f + y, offMovement * percentView + 4.0f, 4.0f, h / 2.0f), (y < 0.0f) ? c2 : c3);
CraftGUI.render.solidAlpha(new IArea(w() / 2.0f + y, h() - offMovement * percentView - 8.0f, 4.0f, h / 2.0f), (y < 0.0f) ? c3 : c2);
CraftGUI.render.solidAlpha(new IArea(w() / 2.0f + y, h() - offMovement * percentView - 4.0f, 4.0f, h / 2.0f), c4);
}
}
}
@@ -45,24 +45,24 @@ public class AnalystPageAppearance extends ControlAnalystPage {
float scale = w / 16.0f;
float dy = (sections > 1) ? 16.0f : 0.0f;
GL11.glScalef(scale, scale, 1.0f);
CraftGUI.Render.color(ind.getGenome().getStemColor().getColor(false));
CraftGUI.render.color(ind.getGenome().getStemColor().getColor(false));
if (sections > 1) {
CraftGUI.Render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 1));
CraftGUI.render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 1));
}
CraftGUI.Render.iconBlock(new IPoint(0.0f, dy), ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 0));
CraftGUI.Render.color(ind.getGenome().getPrimaryColor().getColor(false));
CraftGUI.render.iconBlock(new IPoint(0.0f, dy), ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 0));
CraftGUI.render.color(ind.getGenome().getPrimaryColor().getColor(false));
if (sections > 1) {
CraftGUI.Render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 1));
CraftGUI.render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 1));
}
CraftGUI.Render.iconBlock(new IPoint(0.0f, dy), ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 0));
CraftGUI.Render.color(ind.getGenome().getSecondaryColor().getColor(false));
CraftGUI.render.iconBlock(new IPoint(0.0f, dy), ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 0));
CraftGUI.render.color(ind.getGenome().getSecondaryColor().getColor(false));
if (sections > 1) {
CraftGUI.Render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getVariantIcon(EnumFlowerStage.FLOWER, true, 1));
CraftGUI.render.iconBlock(new IPoint(0.0f, 0.0f), ind.getGenome().getType().getVariantIcon(EnumFlowerStage.FLOWER, true, 1));
}
CraftGUI.Render.iconBlock(new IPoint(0.0f, dy), ind.getGenome().getType().getVariantIcon(EnumFlowerStage.FLOWER, true, 0));
CraftGUI.render.iconBlock(new IPoint(0.0f, dy), ind.getGenome().getType().getVariantIcon(EnumFlowerStage.FLOWER, true, 0));
GL11.glPopMatrix();
}
};
@@ -48,7 +48,7 @@ public class AnalystPageBehaviour extends ControlAnalystPage {
new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 0.0f), loc, TextJustification.TOP_CENTER)
.setColor(getColor());
y += (int) (CraftGUI.Render.textHeight(loc, w() - 8.0f) + 1.0f);
y += (int) (CraftGUI.render.textHeight(loc, w() - 8.0f) + 1.0f);
new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.behaviour.withinBlocks", (int) (t[0] / 2.0f)))
.setColor(getColor());
@@ -64,10 +64,10 @@ public class AnalystPageDatabase extends ControlAnalystPage {
@Override
public void onRenderBackground() {
CraftGUI.Render.color(0x555555);
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().inset(1));
CraftGUI.Render.color(AnalystPageDatabase.this.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea());
CraftGUI.render.color(0x555555);
CraftGUI.render.texture(CraftGUITexture.TabSolid, getArea().inset(1));
CraftGUI.render.color(AnalystPageDatabase.this.getColor());
CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea());
super.renderTextField();
}
};
@@ -98,7 +98,7 @@ public class AnalystPageDatabase extends ControlAnalystPage {
@Override
public void onRenderBackground() {
CraftGUI.Render.text(getArea(), TextJustification.MIDDLE_CENTER, value.getName(), 0xffffff);
CraftGUI.render.text(getArea(), TextJustification.MIDDLE_CENTER, value.getName(), 0xffffff);
}
};
}
@@ -113,8 +113,8 @@ public class AnalystPageDatabase extends ControlAnalystPage {
if (!isEnabled()) {
return;
}
CraftGUI.Render.gradientRect(getArea(), 0x44000000 + AnalystPageDatabase.this.getColor(), 0x44000000 + AnalystPageDatabase.this.getColor());
CraftGUI.Render.solid(getRenderArea(), AnalystPageDatabase.this.getColor());
CraftGUI.render.gradientRect(getArea(), 0x44000000 + AnalystPageDatabase.this.getColor(), 0x44000000 + AnalystPageDatabase.this.getColor());
CraftGUI.render.solid(getRenderArea(), AnalystPageDatabase.this.getColor());
}
};
}
@@ -145,13 +145,13 @@ public class AnalystPageDatabase extends ControlAnalystPage {
public void onRenderBackground() {
WindowAnalyst window = (WindowAnalyst) AnalystPageDatabase.this.getSuperParent();
if (window.getIndividual() != null && window.getIndividual().getGenome().getPrimary() == species) {
CraftGUI.Render.color(0xeeeeee);
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().outset(1));
CraftGUI.Render.color(AnalystPageDatabase.this.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().outset(1));
CraftGUI.render.color(0xeeeeee);
CraftGUI.render.texture(CraftGUITexture.TabSolid, getArea().outset(1));
CraftGUI.render.color(AnalystPageDatabase.this.getColor());
CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea().outset(1));
} else if (calculateIsMouseOver()) {
CraftGUI.Render.color(0xeeeeee);
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().outset(1));
CraftGUI.render.color(0xeeeeee);
CraftGUI.render.texture(CraftGUITexture.TabSolid, getArea().outset(1));
}
super.onRenderBackground();
}
@@ -64,7 +64,7 @@ public class AnalystPageDescription extends ControlAnalystPage {
new ControlTextCentered(this, y, EnumChatFormatting.BOLD + I18N.localise("genetics.gui.analyst.description.discoveredBy", authority) + EnumChatFormatting.RESET)
.setColor(getColor());
y += (int) (3.0f + CraftGUI.Render.textHeight(EnumChatFormatting.BOLD + I18N.localise("genetics.gui.analyst.description.discoveredBy", authority) + EnumChatFormatting.RESET, w()));
y += (int) (3.0f + CraftGUI.render.textHeight(EnumChatFormatting.BOLD + I18N.localise("genetics.gui.analyst.description.discoveredBy", authority) + EnumChatFormatting.RESET, w()));
new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.description.complexity", species.getComplexity()))
.setColor(getColor());
@@ -73,7 +73,7 @@ public class AnalystPageDescription extends ControlAnalystPage {
IWidget signatureText = new ControlText(this, new IArea(8.0f, y, w() - 16.0f, 0.0f), descSig + EnumChatFormatting.RESET, TextJustification.BOTTOM_RIGHT);
descText.setColor(getColor());
signatureText.setColor(getColor());
float descHeight = CraftGUI.Render.textHeight(descText.getValue(), descText.getSize().x());
float descHeight = CraftGUI.render.textHeight(descText.getValue(), descText.getSize().x());
signatureText.setPosition(new IPoint(signatureText.pos().x(), descText.getPosition().y() + descHeight + 10.0f));
setSize(new IPoint(w(), 20.0f + signatureText.y()));
}
@@ -48,7 +48,7 @@ public class AnalystPageGenome extends ControlAnalystPage {
for (IChromosomeType chromo : system.getActiveKaryotype()) {
IAllele allele = active ? ind.getGenome().getActiveAllele(chromo) : ind.getGenome().getInactiveAllele(chromo);
String alleleName = system.getAlleleName(chromo, allele);
float height = CraftGUI.Render.textHeight(alleleName, w() / 2.0f - 2.0f);
float height = CraftGUI.render.textHeight(alleleName, w() / 2.0f - 2.0f);
new ControlText(scaled, new IArea(0.0f, y + (height - 9.0f) / 2.0f, w() / 2.0f - 2.0f, 0.0f), system.getChromosomeShortName(chromo) + " :", TextJustification.TOP_RIGHT)
.setColor(getColor());
new ControlText(scaled, new IArea(w() / 2.0f + 2.0f, y, w() / 2.0f - 2.0f, 0.0f), alleleName, TextJustification.TOP_LEFT)
@@ -138,16 +138,16 @@ public class AnalystPageMutations extends ControlAnalystPage {
@Override
public void onRenderBackground() {
CraftGUI.Render.item(new IPoint(0.0f, 0.0f), system.getDefaultMember(mutation.getAllele0().getUID()));
CraftGUI.Render.item(new IPoint(28.0f, 0.0f), system.getDefaultMember(mutation.getAllele1().getUID()));
CraftGUI.render.item(new IPoint(0.0f, 0.0f), system.getDefaultMember(mutation.getAllele0().getUID()));
CraftGUI.render.item(new IPoint(28.0f, 0.0f), system.getDefaultMember(mutation.getAllele1().getUID()));
if (specificChance != mutation.getBaseChance()) {
CraftGUI.Render.color(getMutationColor(mutation.getBaseChance()).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd0.getIcon());
CraftGUI.Render.color(getMutationColor(specificChance).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd1.getIcon());
CraftGUI.render.color(getMutationColor(mutation.getBaseChance()).getColor());
CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd0.getIcon());
CraftGUI.render.color(getMutationColor(specificChance).getColor());
CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd1.getIcon());
} else {
CraftGUI.Render.color(getMutationColor(mutation.getBaseChance()).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd.getIcon());
CraftGUI.render.color(getMutationColor(mutation.getBaseChance()).getColor());
CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd.getIcon());
}
}
};
@@ -200,17 +200,17 @@ public class AnalystPageMutations extends ControlAnalystPage {
@Override
public void onRenderBackground() {
CraftGUI.Render.item(new IPoint(0.0f, 0.0f), system.getDefaultMember(speciesComb.getUID()));
CraftGUI.Render.item(new IPoint(28.0f, 0.0f), system.getDefaultMember(mutation.getTemplate()[0].getUID()));
CraftGUI.Render.color(getMutationColor(mutation.getBaseChance()).getColor());
CraftGUI.render.item(new IPoint(0.0f, 0.0f), system.getDefaultMember(speciesComb.getUID()));
CraftGUI.render.item(new IPoint(28.0f, 0.0f), system.getDefaultMember(mutation.getTemplate()[0].getUID()));
CraftGUI.render.color(getMutationColor(mutation.getBaseChance()).getColor());
if (specificChance2 != mutation.getBaseChance()) {
CraftGUI.Render.color(getMutationColor(mutation.getBaseChance()).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow0.getIcon());
CraftGUI.Render.color(getMutationColor(specificChance2).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow1.getIcon());
CraftGUI.render.color(getMutationColor(mutation.getBaseChance()).getColor());
CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow0.getIcon());
CraftGUI.render.color(getMutationColor(specificChance2).getColor());
CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow1.getIcon());
} else {
CraftGUI.Render.color(getMutationColor(mutation.getBaseChance()).getColor());
CraftGUI.Render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow.getIcon());
CraftGUI.render.color(getMutationColor(mutation.getBaseChance()).getColor());
CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow.getIcon());
}
}
};
@@ -271,7 +271,7 @@ public class AnalystPageMutations extends ControlAnalystPage {
@Override
public void onRenderBackground() {
CraftGUI.Render.text(getArea(), TextJustification.MIDDLE_CENTER, I18N.localise("genetics.gui.analyst.mutations.unknown"), 0xaaaaaa);
CraftGUI.render.text(getArea(), TextJustification.MIDDLE_CENTER, I18N.localise("genetics.gui.analyst.mutations.unknown"), 0xaaaaaa);
}
}
}
@@ -43,7 +43,7 @@ public class ControlAnalystChromosome extends Control implements ITooltip {
@Override
public void onRenderBackground() {
super.onRenderBackground();
CraftGUI.Render.texture(isHomozygous() ? Homozygous : Heterozygous, IPoint.ZERO);
CraftGUI.render.texture(isHomozygous() ? Homozygous : Heterozygous, IPoint.ZERO);
}
@Override
@@ -60,7 +60,7 @@ public class ControlBiome extends Control implements ITooltip {
iconCategory = "end";
}
IIcon icon = TextureManager.getInstance().getDefault("habitats/" + iconCategory);
CraftGUI.Render.iconItem(IPoint.ZERO, icon);
CraftGUI.render.iconItem(IPoint.ZERO, icon);
}
@Override
@@ -46,7 +46,7 @@ public class ControlChromoPicker extends Control implements ITooltip {
super.onRenderBackground();
boolean selected = isMouseOver();
Texture text = selected ? Selected : Texture;
CraftGUI.Render.texture(text, IPoint.ZERO);
CraftGUI.render.texture(text, IPoint.ZERO);
}
@Override
@@ -119,7 +119,7 @@ public class ControlChromosome extends Control implements IControlValue<IChromos
}
super.onRenderBackground();
Texture text = getTypeTexture();
CraftGUI.Render.texture(text, IPoint.ZERO);
CraftGUI.render.texture(text, IPoint.ZERO);
}
private Texture getTypeTexture() {
@@ -23,8 +23,8 @@ public class ControlGenesisOption extends ControlOption<Gene> {
@Override
public void onRenderBackground() {
super.onRenderBackground();
CraftGUI.Render.text(new IArea(0.0f, 0.0f, 70.0f, 22.0f), TextJustification.MIDDLE_CENTER, getChromosomeName(), getColor());
CraftGUI.Render.text(new IArea(75.0f, 0.0f, 80.0f, 22.0f), TextJustification.MIDDLE_CENTER, getAlleleName(), getColor());
CraftGUI.Render.solid(new IArea(70.0f, 2.0f, 1.0f, 16.0f), 0xff000000 + getColor());
CraftGUI.render.text(new IArea(0.0f, 0.0f, 70.0f, 22.0f), TextJustification.MIDDLE_CENTER, getChromosomeName(), getColor());
CraftGUI.render.text(new IArea(75.0f, 0.0f, 80.0f, 22.0f), TextJustification.MIDDLE_CENTER, getAlleleName(), getColor());
CraftGUI.render.solid(new IArea(70.0f, 2.0f, 1.0f, 16.0f), 0xff000000 + getColor());
}
}
@@ -48,13 +48,13 @@ public abstract class ControlToleranceBar<T extends Enum<T>> extends Control imp
@Override
public void onRenderBackground() {
CraftGUI.Render.gradientRect(getArea(), 0xaaaaaaaa, 0xaaaaaaaa);
CraftGUI.render.gradientRect(getArea(), 0xaaaaaaaa, 0xaaaaaaaa);
float w = getArea().w() / fullSet.size();
int t = 0;
for (T value : fullSet) {
int col = (tolerated.contains(value) ? 0xff000000 : 0x33000000) + getColor(value);
IBorder inset = new IBorder(tolerated.contains(value) ? 1.0f : 3.0f);
CraftGUI.Render.gradientRect(new IArea(w * t, 0.0f, w, h()).inset(inset), col, col);
CraftGUI.render.gradientRect(new IArea(w * t, 0.0f, w, h()).inset(inset), col, col);
++t;
}
}
@@ -150,14 +150,14 @@ public class WindowAnalyst extends Window {
@Override
public void onRenderBackground() {
CraftGUI.Render.color(syst.getColor());
CraftGUI.render.color(syst.getColor());
int outset = (getSystem() == syst) ? 1 : 0;
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().outset(outset));
CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea().outset(outset));
if (getSystem() == syst) {
CraftGUI.Render.color(1140850688 + syst.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().outset(outset));
CraftGUI.render.color(1140850688 + syst.getColor());
CraftGUI.render.texture(CraftGUITexture.TabSolid, getArea().outset(outset));
}
CraftGUI.Render.item(new IPoint(2.0f, 2.0f), syst.getItemStackRepresentative());
CraftGUI.render.item(new IPoint(2.0f, 2.0f), syst.getItemStackRepresentative());
}
};
x += 22;
@@ -173,7 +173,7 @@ public class WindowAnalyst extends Window {
analystPanel = new Panel(this, 16.0f, 54.0f, 280.0f, 164.0f, MinecraftGUI.PanelType.Outline) {
@Override
public void onRenderBackground() {
CraftGUI.Render.gradientRect(getArea(), 0x44ffffff, 0x66ffffff);
CraftGUI.render.gradientRect(getArea(), 0x44ffffff, 0x66ffffff);
super.onRenderBackground();
}
@@ -187,8 +187,8 @@ public class WindowAnalyst extends Window {
if (getContent() == null) {
return;
}
CraftGUI.Render.color(getContent().getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea());
CraftGUI.render.color(getContent().getColor());
CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea());
}
};
new ControlScrollBar(this, sectionWidth + 2.0f - 3.0f, 6.0f, 3.0f, h() - 8.0f + 2.0f - 6.0f, leftPage) {
@@ -200,8 +200,8 @@ public class WindowAnalyst extends Window {
if (leftPage.getContent() == null) {
return;
}
CraftGUI.Render.gradientRect(getArea(), 1140850688 + leftPage.getContent().getColor(), 0x44000000 + leftPage.getContent().getColor());
CraftGUI.Render.solid(getRenderArea(), leftPage.getContent().getColor());
CraftGUI.render.gradientRect(getArea(), 1140850688 + leftPage.getContent().getColor(), 0x44000000 + leftPage.getContent().getColor());
CraftGUI.render.solid(getRenderArea(), leftPage.getContent().getColor());
}
};
rightPage = new ControlScrollableContent<IWidget>(this, 3.0f + sectionWidth + 4.0f, 3.0f, sectionWidth + 2.0f, h() - 8.0f + 2.0f, 0.0f) {
@@ -210,8 +210,8 @@ public class WindowAnalyst extends Window {
if (getContent() == null) {
return;
}
CraftGUI.Render.color(getContent().getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea());
CraftGUI.render.color(getContent().getColor());
CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea());
}
};
new ControlScrollBar(this, sectionWidth + 2.0f - 3.0f + sectionWidth + 4.0f, 6.0f, 3.0f, h() - 8.0f + 2.0f - 6.0f, rightPage) {
@@ -223,8 +223,8 @@ public class WindowAnalyst extends Window {
if (rightPage.getContent() == null) {
return;
}
CraftGUI.Render.gradientRect(getArea(), 1140850688 + rightPage.getContent().getColor(), 0x44000000 + rightPage.getContent().getColor());
CraftGUI.Render.solid(getRenderArea(), rightPage.getContent().getColor());
CraftGUI.render.gradientRect(getArea(), 1140850688 + rightPage.getContent().getColor(), 0x44000000 + rightPage.getContent().getColor());
CraftGUI.render.solid(getRenderArea(), rightPage.getContent().getColor());
}
};
analystPageSize = new IArea(1.0f, 1.0f, sectionWidth, h() - 8.0f);
@@ -361,10 +361,10 @@ public class WindowAnalyst extends Window {
@Override
public void onRenderBackground() {
boolean active = value == leftPage.getContent() || value == rightPage.getContent();
CraftGUI.Render.color((active ? 0xff000000 : 0x44000000) + value.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().inset(1));
CraftGUI.Render.color(value.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().inset(1));
CraftGUI.render.color((active ? 0xff000000 : 0x44000000) + value.getColor());
CraftGUI.render.texture(CraftGUITexture.TabSolid, getArea().inset(1));
CraftGUI.render.color(value.getColor());
CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea().inset(1));
super.onRenderBackground();
}
};