fix lots of rendering mappings. rename toolmaterial to ttoolmaterial to avoid conflicts w/ a SRG name for something in vanilla

This commit is contained in:
Progwml6 committed 2014-01-08 22:39:27 -05:00
1 parent f7a86a7377
commit ab73bafc15
28 files changed
+140 -139

No files matched your search

@@ -113,7 +113,7 @@ public class TClientEvents
int scaledHeight = scaledresolution.getScaledHeight();
int xBasePos = scaledWidth / 2 - 91;
int yBasePos = scaledHeight - 39;
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(mc.thePlayer.username);
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(mc.thePlayer.getDisplayName());
boolean highlight = mc.thePlayer.hurtResistantTime / 3 % 2 == 1;
@@ -344,9 +344,9 @@ public class FancyItemRender extends Render
}
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
this.itemRenderBlocks.useInventoryTint = this.renderWithColor;
this.itemRenderBlocks.field_147844_c = this.renderWithColor;
this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F);
this.itemRenderBlocks.useInventoryTint = true;
this.itemRenderBlocks.field_147844_c = true;
GL11.glPopMatrix();
}
else if (Item.itemsList[k].requiresMultipleRenderPasses())
@@ -336,9 +336,9 @@ public class DaggerRender extends Render
}
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
this.itemRenderBlocks.useInventoryTint = this.renderWithColor;
this.itemRenderBlocks.field_147844_c = this.renderWithColor;
this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F);
this.itemRenderBlocks.useInventoryTint = true;
this.itemRenderBlocks.field_147844_c = true;
GL11.glPopMatrix();
}
else if (Item.itemsList[k].requiresMultipleRenderPasses())
@@ -427,7 +427,7 @@ public class DaggerRender extends Render
{
if (par3ItemStack != null)
{
if (!ForgeHooksClient.renderInventoryItem(renderBlocks, par2TextureManager, par3ItemStack, renderWithColor, zLevel, (float) par4, (float) par5))
if (!ForgeHooksClient.renderInventoryItem(field_147909_c, par2TextureManager, par3ItemStack, renderWithColor, zLevel, (float) par4, (float) par5))
{
this.renderItemIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, true);
}
@@ -62,10 +62,10 @@ public class AdaptiveSmelteryGui extends NewContainerGui
int topo = this.guiTop;
int xScroll = lefto + 67;
int yScroll = topo + 8;
int scrollWidth = xScroll + 14;
int scrollHeight = yScroll + 144;
int scrollfield_146294_l = xScroll + 14;
int scrollfield_146295_m = yScroll + 144;
if (!this.wasClicking && mouseDown && mouseX >= xScroll && mouseY >= yScroll && mouseX < scrollWidth && mouseY < scrollHeight)
if (!this.wasClicking && mouseDown && mouseX >= xScroll && mouseY >= yScroll && mouseX < scrollfield_146294_l && mouseY < scrollfield_146295_m)
{
this.isScrolling = true;
}
@@ -84,7 +84,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui
if (this.isScrolling)
{
this.currentScroll = (mouseY - yScroll - 7.5F) / (scrollHeight - yScroll - 15.0F);
this.currentScroll = (mouseY - yScroll - 7.5F) / (scrollfield_146295_m - yScroll - 15.0F);
if (this.currentScroll < 0.0F)
{
@@ -110,8 +110,8 @@ public class AdaptiveSmelteryGui extends NewContainerGui
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 90, (ySize - 96) + 2, 0x404040);
int base = 0;
int cornerX = (width - xSize) / 2 + 36;
int cornerY = (height - ySize) / 2;
int cornerX = (field_146294_l - xSize) / 2 + 36;
int cornerY = (field_146295_m - ySize) / 2;
FluidTankInfo[] info = logic.getTankInfo(ForgeDirection.UNKNOWN);
int capacity = 0;
@@ -170,8 +170,8 @@ public class AdaptiveSmelteryGui extends NewContainerGui
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(background);
int cornerX = (width - xSize) / 2 + 36;
int cornerY = (height - ySize) / 2;
int cornerX = (field_146294_l - xSize) / 2 + 36;
int cornerY = (field_146295_m - ySize) / 2;
drawTexturedModalRect(cornerX + 46, cornerY, 0, 0, 176, ySize);
//Fuel - Lava
@@ -359,7 +359,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui
while (iterator.hasNext())
{
String s = (String) iterator.next();
int l = this.field_146289_q.getStringWidth(s);
int l = this.field_146289_q.getStringfield_146294_l(s);
if (l > k)
{
@@ -376,14 +376,14 @@ public class AdaptiveSmelteryGui extends NewContainerGui
k1 += 2 + (par1List.size() - 1) * 10;
}
if (i1 + k > this.width)
if (i1 + k > this.field_146294_l)
{
i1 -= 28 + k;
}
if (j1 + k1 + 6 > this.height)
if (j1 + k1 + 6 > this.field_146295_m)
{
j1 = this.height - k1 - 6;
j1 = this.field_146295_m - k1 - 6;
}
this.zLevel = 300.0F;
@@ -436,8 +436,8 @@ public class AdaptiveSmelteryGui extends NewContainerGui
super.mouseClicked(mouseX, mouseY, mouseButton);
int base = 0;
int cornerX = (width - xSize) / 2 + 36;
int cornerY = (height - ySize) / 2;
int cornerX = (field_146294_l - xSize) / 2 + 36;
int cornerY = (field_146295_m - ySize) / 2;
int fluidToBeBroughtUp = -1;
for (FluidStack liquid : multitank.getAllFluids())
@@ -339,8 +339,8 @@ public class CraftingStationGui extends GuiContainer
// Draw the background
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(background);
int cornerX = (this.width - this.xSize) / 2;
int cornerY = (this.height - this.ySize) / 2;
int cornerX = (this.field_146294_l - this.xSize) / 2;
int cornerY = (this.field_146295_m - this.ySize) / 2;
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize);
if (active)
@@ -373,8 +373,8 @@ public class CraftingStationGui extends GuiContainer
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(description);
cornerX = (this.width + this.xSize) / 2;
cornerY = (this.height - this.ySize) / 2;
cornerX = (this.field_146294_l + this.xSize) / 2;
cornerY = (this.field_146295_m - this.ySize) / 2;
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.ySize + 30);
}
@@ -32,8 +32,8 @@ public class FrypanGui extends GuiContainer
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(background);
int cornerX = (width - xSize) / 2;
int cornerY = (height - ySize) / 2;
int cornerX = (field_146294_l - xSize) / 2;
int cornerY = (field_146295_m - ySize) / 2;
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
if (logic.fuel > 0)
{
@@ -30,7 +30,7 @@ public class FurnaceGui extends GuiContainer
protected void drawGuiContainerForegroundLayer (int par1, int par2)
{
String s = this.logic.isInvNameLocalized() ? this.logic.getInvName() : I18n.getStringParams(this.logic.getInvName());
this.field_146289_q.drawString(s, this.xSize / 2 - this.field_146289_q.getStringWidth(s) / 2, 6, 4210752);
this.field_146289_q.drawString(s, this.xSize / 2 - this.field_146289_q.getStringfield_146294_l(s) / 2, 6, 4210752);
this.field_146289_q.drawString(I18n.getStringParams("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
}
@@ -41,8 +41,8 @@ public class FurnaceGui extends GuiContainer
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(furnaceGuiTextures);
int k = (this.width - this.xSize) / 2;
int l = (this.height - this.ySize) / 2;
int k = (this.field_146294_l - this.xSize) / 2;
int l = (this.field_146295_m - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int i1;
@@ -78,8 +78,8 @@ public class GuiLandmine extends GuiContainer
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
field_146297_k.renderEngine.bindTexture(background);
int x = (width - xSize) / 2;
int y = (height - ySize) / 2;
int x = (field_146294_l - xSize) / 2;
int y = (field_146295_m - ySize) / 2;
this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
}
@@ -90,8 +90,8 @@ public abstract class NewContainerGui extends GuiScreen
{
super.initGui();
this.field_146297_k.thePlayer.openContainer = this.container;
this.guiLeft = (this.width - this.xSize) / 2;
this.guiTop = (this.height - this.ySize) / 2;
this.guiLeft = (this.field_146294_l - this.xSize) / 2;
this.guiTop = (this.field_146295_m - this.ySize) / 2;
}
/**
@@ -279,7 +279,7 @@ public abstract class NewContainerGui extends GuiScreen
while (iterator.hasNext())
{
String s = (String) iterator.next();
int l = this.field_146289_q.getStringWidth(s);
int l = this.field_146289_q.getStringfield_146294_l(s);
if (l > k)
{
@@ -296,14 +296,14 @@ public abstract class NewContainerGui extends GuiScreen
k1 += 2 + (par1List.size() - 1) * 10;
}
if (i1 + k > this.width)
if (i1 + k > this.field_146294_l)
{
i1 -= 28 + k;
}
if (j1 + k1 + 6 > this.height)
if (j1 + k1 + 6 > this.field_146295_m)
{
j1 = this.height - k1 - 6;
j1 = this.field_146295_m - k1 - 6;
}
this.zLevel = 300.0F;
@@ -803,7 +803,7 @@ public abstract class NewContainerGui extends GuiScreen
}
/**
* Args: left, top, width, height, pointX, pointY. Note: left, top are local to Gui, pointX, pointY are local to
* Args: left, top, field_146294_l, field_146295_m, pointX, pointY. Note: left, top are local to Gui, pointX, pointY are local to
* screen
*/
protected boolean isPointInRegion (int par1, int par2, int par3, int par4, int par5, int par6)
@@ -17,7 +17,7 @@ import tconstruct.inventory.ActiveContainer;
import tconstruct.inventory.PartCrafterChestContainer;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.PatternBuilder;
import tconstruct.library.tools.ToolMaterial;
import tconstruct.library.tools.TToolMaterial;
public class PartCrafterGui extends NewContainerGui
{
@@ -26,7 +26,7 @@ public class PartCrafterGui extends NewContainerGui
boolean drawChestPart;
boolean hasTop, hasBottom;
ItemStack topMaterial, bottomMaterial;
ToolMaterial topEnum, bottomEnum;
TToolMaterial topEnum, bottomEnum;
public PartCrafterGui(InventoryPlayer inventoryplayer, PartBuilderLogic partlogic, World world, int x, int y, int z)
{
@@ -157,8 +157,8 @@ public class PartCrafterGui extends NewContainerGui
// Draw the background
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(background);
int cornerX = (this.width - this.xSize) / 2;
int cornerY = (this.height - this.ySize) / 2;
int cornerX = (this.field_146294_l - this.xSize) / 2;
int cornerY = (this.field_146295_m - this.ySize) / 2;
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize);
// Draw Slots
@@ -191,8 +191,8 @@ public class PartCrafterGui extends NewContainerGui
// Draw description
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(description);
cornerX = (this.width + this.xSize) / 2;
cornerY = (this.height - this.ySize) / 2;
cornerX = (this.field_146294_l + this.xSize) / 2;
cornerY = (this.field_146295_m - this.ySize) / 2;
this.drawTexturedModalRect(cornerX, cornerY, 126, 0, 126, this.ySize);
}
@@ -34,8 +34,8 @@ public class PatternChestGui extends GuiContainer
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(background);
int cornerX = (width - xSize) / 2;
int cornerY = (height - ySize) / 2;
int cornerX = (field_146294_l - xSize) / 2;
int cornerY = (field_146295_m - ySize) / 2;
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
}
}
@@ -58,10 +58,10 @@ public class SmelteryGui extends NewContainerGui
int topo = this.guiTop;
int xScroll = lefto + 67;
int yScroll = topo + 8;
int scrollWidth = xScroll + 14;
int scrollHeight = yScroll + 144;
int scrollfield_146294_l = xScroll + 14;
int scrollfield_146295_m = yScroll + 144;
if (!this.wasClicking && mouseDown && mouseX >= xScroll && mouseY >= yScroll && mouseX < scrollWidth && mouseY < scrollHeight)
if (!this.wasClicking && mouseDown && mouseX >= xScroll && mouseY >= yScroll && mouseX < scrollfield_146294_l && mouseY < scrollfield_146295_m)
{
this.isScrolling = true;
}
@@ -80,7 +80,7 @@ public class SmelteryGui extends NewContainerGui
if (this.isScrolling)
{
this.currentScroll = (mouseY - yScroll - 7.5F) / (scrollHeight - yScroll - 15.0F);
this.currentScroll = (mouseY - yScroll - 7.5F) / (scrollfield_146295_m - yScroll - 15.0F);
if (this.currentScroll < 0.0F)
{
@@ -106,8 +106,8 @@ public class SmelteryGui extends NewContainerGui
field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 90, (ySize - 96) + 2, 0x404040);
int base = 0;
int cornerX = (width - xSize) / 2 + 36;
int cornerY = (height - ySize) / 2;
int cornerX = (field_146294_l - xSize) / 2 + 36;
int cornerY = (field_146295_m - ySize) / 2;
for (FluidStack liquid : logic.moltenMetal)
{
@@ -159,8 +159,8 @@ public class SmelteryGui extends NewContainerGui
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(background);
int cornerX = (width - xSize) / 2 + 36;
int cornerY = (height - ySize) / 2;
int cornerX = (field_146294_l - xSize) / 2 + 36;
int cornerY = (field_146295_m - ySize) / 2;
drawTexturedModalRect(cornerX + 46, cornerY, 0, 0, 176, ySize);
//Fuel - Lava
@@ -344,7 +344,7 @@ public class SmelteryGui extends NewContainerGui
while (iterator.hasNext())
{
String s = (String) iterator.next();
int l = this.field_146289_q.getStringWidth(s);
int l = this.field_146289_q.getStringfield_146294_l(s);
if (l > k)
{
@@ -361,14 +361,14 @@ public class SmelteryGui extends NewContainerGui
k1 += 2 + (par1List.size() - 1) * 10;
}
if (i1 + k > this.width)
if (i1 + k > this.field_146294_l)
{
i1 -= 28 + k;
}
if (j1 + k1 + 6 > this.height)
if (j1 + k1 + 6 > this.field_146295_m)
{
j1 = this.height - k1 - 6;
j1 = this.field_146295_m - k1 - 6;
}
this.zLevel = 300.0F;
@@ -421,8 +421,8 @@ public class SmelteryGui extends NewContainerGui
super.mouseClicked(mouseX, mouseY, mouseButton);
int base = 0;
int cornerX = (width - xSize) / 2 + 36;
int cornerY = (height - ySize) / 2;
int cornerX = (field_146294_l - xSize) / 2 + 36;
int cornerY = (field_146295_m - ySize) / 2;
int fluidToBeBroughtUp = -1;
for (FluidStack liquid : logic.moltenMetal)
@@ -51,8 +51,8 @@ public class StencilTableGui extends GuiContainer
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(background);
int cornerX = (this.width - this.xSize) / 2;
int cornerY = (this.height - this.ySize) / 2;
int cornerX = (this.field_146294_l - this.xSize) / 2;
int cornerY = (this.field_146295_m - this.ySize) / 2;
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize);
if (!logic.isStackInSlot(0))
{
@@ -63,8 +63,8 @@ public class StencilTableGui extends GuiContainer
public void initGui ()
{
super.initGui();
int cornerX = (this.width - this.xSize) / 2;
int cornerY = (this.height - this.ySize) / 2;
int cornerX = (this.field_146294_l - this.xSize) / 2;
int cornerY = (this.field_146295_m - this.ySize) / 2;
this.buttonList.clear();
/*ToolGuiElement repair = TConstruct.toolButtons.get(0);
@@ -27,17 +27,17 @@ public class ToolForgeGui extends ToolStationGui
{
int gLeft = this.guiLeft + 68;
int gTop = this.guiTop + 6;
int gWidth = 102;
int gHeight = 12;
active = mouseX > gLeft && mouseX < gLeft + gWidth && mouseY > gTop && mouseY < gTop + gHeight;
int gfield_146294_l = 102;
int gfield_146295_m = 12;
active = mouseX > gLeft && mouseX < gLeft + gfield_146294_l && mouseY > gTop && mouseY < gTop + gfield_146295_m;
}
}
public void initGui ()
{
super.initGui();
int cornerX = (this.width - this.xSize) / 2;
int cornerY = (this.height - this.ySize) / 2;
int cornerX = (this.field_146294_l - this.xSize) / 2;
int cornerY = (this.field_146295_m - this.ySize) / 2;
this.buttonList.clear();
ToolGuiElement repair = TConstructClientRegistry.toolButtons.get(0);
@@ -67,9 +67,9 @@ public class ToolStationGui extends NewContainerGui
{
int gLeft = this.guiLeft + 68;
int gTop = this.guiTop + 6;
int gWidth = 102;
int gHeight = 12;
active = mouseX > gLeft && mouseX < gLeft + gWidth && mouseY > gTop && mouseY < gTop + gHeight;
int gfield_146294_l = 102;
int gfield_146295_m = 12;
active = mouseX > gLeft && mouseX < gLeft + gfield_146294_l && mouseY > gTop && mouseY < gTop + gfield_146295_m;
}
}
@@ -87,8 +87,8 @@ public class ToolStationGui extends NewContainerGui
public void initGui ()
{
super.initGui();
int cornerX = (this.width - this.xSize) / 2;
int cornerY = (this.height - this.ySize) / 2;
int cornerX = (this.field_146294_l - this.xSize) / 2;
int cornerY = (this.field_146295_m - this.ySize) / 2;
this.buttonList.clear();
ToolGuiElement repair = TConstructClientRegistry.toolButtons.get(0);
@@ -431,8 +431,8 @@ public class ToolStationGui extends NewContainerGui
// Draw the background
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(background);
int cornerX = (this.width - this.xSize) / 2;
int cornerY = (this.height - this.ySize) / 2;
int cornerX = (this.field_146294_l - this.xSize) / 2;
int cornerY = (this.field_146295_m - this.ySize) / 2;
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize);
if (active)
@@ -456,8 +456,8 @@ public class ToolStationGui extends NewContainerGui
// Draw description
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(description);
cornerX = (this.width + this.xSize) / 2;
cornerY = (this.height - this.ySize) / 2;
cornerX = (this.field_146294_l + this.xSize) / 2;
cornerY = (this.field_146295_m - this.ySize) / 2;
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.ySize + 30);
}
@@ -14,14 +14,14 @@ import tconstruct.client.gui.PartCrafterGui;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.client.TConstructClientRegistry;
import tconstruct.library.crafting.PatternBuilder;
import tconstruct.library.tools.ToolMaterial;
import tconstruct.library.tools.TToolMaterial;
public class MaterialPage extends BookPage
{
String title;
ItemStack[] icons;
String iconText;
ToolMaterial material;
TToolMaterial material;
@Override
public void readPageFromXML (Element element)
@@ -52,7 +52,7 @@ public abstract class AbstractTab extends GuiButton
@Override
public boolean mousePressed (Minecraft mc, int mouseX, int mouseY)
{
boolean inWindow = this.enabled && this.drawButton && mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height;
boolean inWindow = this.enabled && this.drawButton && mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.field_146294_l && mouseY < this.yPosition + this.field_146295_m;
if (inWindow)
{