mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
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:
1 parent
f7a86a7377
commit
ab73bafc15
28 files changed
+140
-139
No files matched your search
@@ -101,7 +101,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory
|
||||
{
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
writeToNBT(nbt);
|
||||
return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 0, nbt);
|
||||
return new Packet132TileEntityData(xCoord, field_145848_d, field_145849_e, 0, nbt);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -211,7 +211,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory
|
||||
@Override
|
||||
public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer)
|
||||
{
|
||||
return this.field_145850_b.getBlockTileEntity(this.field_145851_c, this.field_145848_d, this.field_145849_e) != this ? false : par1EntityPlayer.getDistanceSq((double) this.field_145851_c + 0.5D, (double) this.field_145848_d + 0.5D,
|
||||
return this.field_145850_b.getBlockTileEntity(this.xCoord, this.field_145848_d, this.field_145849_e) != this ? false : par1EntityPlayer.getDistanceSq((double) this.xCoord + 0.5D, (double) this.field_145848_d + 0.5D,
|
||||
(double) this.field_145849_e + 0.5D) <= 64.0D;
|
||||
}
|
||||
|
||||
@@ -229,7 +229,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory
|
||||
public void onInventoryChanged ()
|
||||
{
|
||||
super.onInventoryChanged();
|
||||
this.field_145850_b.markBlockForUpdate(field_145851_c, field_145848_d, field_145849_e);
|
||||
this.field_145850_b.markBlockForUpdate(xCoord, field_145848_d, field_145849_e);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -259,7 +259,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory
|
||||
{
|
||||
if (shouldUpdateLogic)
|
||||
{
|
||||
field_145850_b.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e);
|
||||
field_145850_b.markBlockForRenderUpdate(xCoord, field_145848_d, field_145849_e);
|
||||
shouldUpdateLogic = false;
|
||||
}
|
||||
if (soundcountything > 0)
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -64,12 +64,12 @@ public class TProxyCommon implements IGuiHandler
|
||||
}
|
||||
if (ID == armorGuiID)
|
||||
{
|
||||
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
|
||||
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
|
||||
return new ArmorExtendedContainer(player.inventory, stats.armor);
|
||||
}
|
||||
if (ID == knapsackGuiID)
|
||||
{
|
||||
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
|
||||
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
|
||||
return new KnapsackContainer(player.inventory, stats.knapsack);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,12 +98,12 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
|
||||
this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI);
|
||||
}
|
||||
|
||||
int i = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile);
|
||||
int i = this.worldObj.getBlockId(this.field_145791_d, this.field_145792_e, this.field_145789_f);
|
||||
|
||||
if (i > 0)
|
||||
{
|
||||
Block.blocksList[i].setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile);
|
||||
AxisAlignedBB axisalignedbb = Block.blocksList[i].getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile);
|
||||
Block.blocksList[i].setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
|
||||
AxisAlignedBB axisalignedbb = Block.blocksList[i].getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
|
||||
|
||||
if (axisalignedbb != null && axisalignedbb.isVecInside(this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ)))
|
||||
{
|
||||
@@ -120,8 +120,8 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
|
||||
{
|
||||
if (!worldObj.isRemote)
|
||||
{
|
||||
int j = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile);
|
||||
int k = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile);
|
||||
int j = this.worldObj.getBlockId(this.field_145791_d, this.field_145792_e, this.field_145789_f);
|
||||
int k = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f);
|
||||
|
||||
if (j == this.inTile && k == this.inData)
|
||||
{
|
||||
@@ -325,11 +325,11 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
|
||||
}
|
||||
else
|
||||
{
|
||||
this.xTile = movingobjectposition.blockX;
|
||||
this.yTile = movingobjectposition.blockY;
|
||||
this.zTile = movingobjectposition.blockZ;
|
||||
this.inTile = this.worldObj.getBlockId(this.xTile, this.yTile, this.zTile);
|
||||
this.inData = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile);
|
||||
this.field_145791_d = movingobjectposition.blockX;
|
||||
this.field_145792_e = movingobjectposition.blockY;
|
||||
this.field_145789_f = movingobjectposition.blockZ;
|
||||
this.inTile = this.worldObj.getBlockId(this.field_145791_d, this.field_145792_e, this.field_145789_f);
|
||||
this.inData = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f);
|
||||
this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX));
|
||||
this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY));
|
||||
this.motionZ = (double) ((float) (movingobjectposition.hitVec.zCoord - this.posZ));
|
||||
@@ -344,7 +344,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
|
||||
|
||||
if (this.inTile != 0)
|
||||
{
|
||||
Block.blocksList[this.inTile].onEntityCollidedWithBlock(this.worldObj, this.xTile, this.yTile, this.zTile, this);
|
||||
Block.blocksList[this.inTile].onEntityCollidedWithBlock(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ public class HeartCanister extends CraftingItem
|
||||
{
|
||||
if (!world.isRemote && stack.getItemDamage() == 2)
|
||||
{
|
||||
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
|
||||
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
|
||||
if (stats != null)
|
||||
{
|
||||
ArmorExtended armor = stats.armor;
|
||||
|
||||
@@ -39,7 +39,7 @@ public class Knapsack extends CraftingItem
|
||||
@Override
|
||||
public void onArmorTickUpdate (World world, EntityPlayer player, ItemStack itemStack)
|
||||
{
|
||||
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
|
||||
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
|
||||
KnapsackInventory inv = stats.knapsack;
|
||||
|
||||
if (stats != null && inv != null)
|
||||
|
||||
@@ -16,7 +16,7 @@ import tconstruct.library.tools.BowstringMaterial;
|
||||
import tconstruct.library.tools.CustomMaterial;
|
||||
import tconstruct.library.tools.FletchingMaterial;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.library.tools.ToolMaterial;
|
||||
import tconstruct.library.tools.TToolMaterial;
|
||||
import tconstruct.library.util.TabTools;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -206,8 +206,8 @@ public class TConstructRegistry
|
||||
}
|
||||
|
||||
//Materials
|
||||
public static HashMap<Integer, ToolMaterial> toolMaterials = new HashMap<Integer, ToolMaterial>(40);
|
||||
public static HashMap<String, ToolMaterial> toolMaterialStrings = new HashMap<String, ToolMaterial>(40);
|
||||
public static HashMap<Integer, TToolMaterial> toolMaterials = new HashMap<Integer, TToolMaterial>(40);
|
||||
public static HashMap<String, TToolMaterial> toolMaterialStrings = new HashMap<String, TToolMaterial>(40);
|
||||
|
||||
/** Adds a tool material to the registry
|
||||
*
|
||||
@@ -226,10 +226,10 @@ public class TConstructRegistry
|
||||
public static void addToolMaterial (int materialID, String materialName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound,
|
||||
String style, String ability)
|
||||
{
|
||||
ToolMaterial mat = toolMaterials.get(materialID);
|
||||
TToolMaterial mat = toolMaterials.get(materialID);
|
||||
if (mat == null)
|
||||
{
|
||||
mat = new ToolMaterial(materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style, ability);
|
||||
mat = new TToolMaterial(materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style, ability);
|
||||
toolMaterials.put(materialID, mat);
|
||||
toolMaterialStrings.put(materialName, mat);
|
||||
}
|
||||
@@ -255,10 +255,10 @@ public class TConstructRegistry
|
||||
public static void addToolMaterial (int materialID, String materialName, String displayName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced,
|
||||
float stonebound, String style, String ability)
|
||||
{
|
||||
ToolMaterial mat = toolMaterials.get(materialID);
|
||||
TToolMaterial mat = toolMaterials.get(materialID);
|
||||
if (mat == null)
|
||||
{
|
||||
mat = new ToolMaterial(materialName, displayName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style, ability);
|
||||
mat = new TToolMaterial(materialName, displayName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style, ability);
|
||||
toolMaterials.put(materialID, mat);
|
||||
toolMaterialStrings.put(materialName, mat);
|
||||
}
|
||||
@@ -273,9 +273,9 @@ public class TConstructRegistry
|
||||
* @param material Complete tool material to add. Uses the name in the material for lookup purposes.
|
||||
*/
|
||||
|
||||
public static void addtoolMaterial (int materialID, ToolMaterial material)
|
||||
public static void addtoolMaterial (int materialID, TToolMaterial material)
|
||||
{
|
||||
ToolMaterial mat = toolMaterials.get(materialID);
|
||||
TToolMaterial mat = toolMaterials.get(materialID);
|
||||
if (mat == null)
|
||||
{
|
||||
toolMaterials.put(materialID, mat);
|
||||
@@ -291,7 +291,7 @@ public class TConstructRegistry
|
||||
* @return Tool Material
|
||||
*/
|
||||
|
||||
public static ToolMaterial getMaterial (int key)
|
||||
public static TToolMaterial getMaterial (int key)
|
||||
{
|
||||
return (toolMaterials.get(key));
|
||||
}
|
||||
@@ -302,7 +302,7 @@ public class TConstructRegistry
|
||||
* @return Tool Material
|
||||
*/
|
||||
|
||||
public static ToolMaterial getMaterial (String key)
|
||||
public static TToolMaterial getMaterial (String key)
|
||||
{
|
||||
return (toolMaterialStrings.get(key));
|
||||
}
|
||||
@@ -520,7 +520,8 @@ public class TConstructRegistry
|
||||
|
||||
static void initializeDrawbridgeState ()
|
||||
{
|
||||
drawbridgeState[Blocks.stone] = 1;
|
||||
//TODO fix this mess and move to TMech
|
||||
/* drawbridgeState[Blocks.stone] = 1;
|
||||
drawbridgeState[Blocks.grass] = 1;
|
||||
drawbridgeState[Blocks.dirt] = 1;
|
||||
drawbridgeState[Blocks.cobblestone] = 1;
|
||||
@@ -674,6 +675,7 @@ public class TConstructRegistry
|
||||
drawbridgeState[Blocks.dropper] = 3;
|
||||
interchangableBlockMapping[Blocks.dirt] = Blocks.grass;
|
||||
interchangableBlockMapping[Blocks.grass] = Blocks.dirt;
|
||||
*/
|
||||
}
|
||||
|
||||
static
|
||||
|
||||
@@ -17,7 +17,7 @@ import tconstruct.library.armor.ArmorCore;
|
||||
import tconstruct.library.armor.ArmorMod;
|
||||
import tconstruct.library.event.ToolCraftEvent;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.library.tools.ToolMaterial;
|
||||
import tconstruct.library.tools.TToolMaterial;
|
||||
import tconstruct.library.tools.ToolMod;
|
||||
import tconstruct.library.util.IToolPart;
|
||||
|
||||
@@ -196,7 +196,7 @@ public class ToolBuilder
|
||||
if (item == null)
|
||||
return null;
|
||||
|
||||
ToolMaterial headMat = null, handleMat = null, accessoryMat = null, extraMat = null;
|
||||
TToolMaterial headMat = null, handleMat = null, accessoryMat = null, extraMat = null;
|
||||
headMat = TConstructRegistry.getMaterial(head);
|
||||
handleMat = TConstructRegistry.getMaterial(handle);
|
||||
|
||||
@@ -332,7 +332,7 @@ public class ToolBuilder
|
||||
compound.getCompoundTag("display").setString("Name", "\u00A7f" + name);
|
||||
}
|
||||
|
||||
ToolCraftEvent.NormalTool event = new ToolCraftEvent.NormalTool(item, compound, new ToolMaterial[] { headMat, handleMat, accessoryMat, extraMat });
|
||||
ToolCraftEvent.NormalTool event = new ToolCraftEvent.NormalTool(item, compound, new TToolMaterial[] { headMat, handleMat, accessoryMat, extraMat });
|
||||
MinecraftForge.EVENT_BUS.post(event);
|
||||
|
||||
if (event.getResult() == Result.DEFAULT)
|
||||
@@ -449,7 +449,7 @@ public class ToolBuilder
|
||||
return null;
|
||||
}
|
||||
|
||||
int buildReinforced (ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat)
|
||||
int buildReinforced (TToolMaterial headMat, TToolMaterial handleMat, TToolMaterial accessoryMat, TToolMaterial extraMat)
|
||||
{
|
||||
int reinforced = 0;
|
||||
|
||||
@@ -474,7 +474,7 @@ public class ToolBuilder
|
||||
return reinforced;
|
||||
}
|
||||
|
||||
float buildShoddy (ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat)
|
||||
float buildShoddy (TToolMaterial headMat, TToolMaterial handleMat, TToolMaterial accessoryMat, TToolMaterial extraMat)
|
||||
{
|
||||
float sHead = headMat.shoddy();
|
||||
float sHandle = handleMat.shoddy();
|
||||
|
||||
@@ -2,7 +2,7 @@ package tconstruct.library.event;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.library.tools.ToolMaterial;
|
||||
import tconstruct.library.tools.TToolMaterial;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
@@ -14,10 +14,10 @@ public class ToolCraftEvent extends Event
|
||||
{
|
||||
public final ToolCore tool;
|
||||
public final NBTTagCompound toolTag;
|
||||
public final ToolMaterial[] materials;
|
||||
public final TToolMaterial[] materials;
|
||||
protected ItemStack resultStack;
|
||||
|
||||
public ToolCraftEvent(ToolCore tool, NBTTagCompound toolTag, ToolMaterial[] materials)
|
||||
public ToolCraftEvent(ToolCore tool, NBTTagCompound toolTag, TToolMaterial[] materials)
|
||||
{
|
||||
this.tool = tool;
|
||||
this.toolTag = toolTag;
|
||||
@@ -27,7 +27,7 @@ public class ToolCraftEvent extends Event
|
||||
@HasResult
|
||||
public static class NormalTool extends ToolCraftEvent
|
||||
{
|
||||
public NormalTool(ToolCore tool, NBTTagCompound toolTag, ToolMaterial[] materials)
|
||||
public NormalTool(ToolCore tool, NBTTagCompound toolTag, TToolMaterial[] materials)
|
||||
{
|
||||
super(tool, toolTag, materials);
|
||||
}
|
||||
|
||||
+3
-3
@@ -3,7 +3,7 @@ package tconstruct.library.tools;
|
||||
/*
|
||||
* Dynamic substitute for an enum. It carries a lot of information
|
||||
*/
|
||||
public class ToolMaterial
|
||||
public class TToolMaterial
|
||||
{
|
||||
//mining level, durability, mining speed, baseDamage, handle modifier, Reinforced level, shoddy/spiny level, color/style on name
|
||||
|
||||
@@ -19,12 +19,12 @@ public class ToolMaterial
|
||||
public final String tipStyle;
|
||||
public final String ability;
|
||||
|
||||
public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability)
|
||||
public TToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability)
|
||||
{
|
||||
this(name, name + " ", level, durability, speed, damage, handle, reinforced, stonebound, style, ability);
|
||||
}
|
||||
|
||||
public ToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability)
|
||||
public TToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability)
|
||||
{
|
||||
this.materialName = name;
|
||||
this.displayName = displayName;
|
||||
@@ -68,7 +68,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
public static IIcon blankSprite;
|
||||
public static IIcon emptyIcon;
|
||||
|
||||
public ToolCore( int baseDamage)
|
||||
public ToolCore(int baseDamage)
|
||||
{
|
||||
super();
|
||||
this.maxStackSize = 1;
|
||||
@@ -425,10 +425,10 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
|
||||
public String getReinforcedName (int head, int handle, int accessory, int extra, int unbreaking)
|
||||
{
|
||||
ToolMaterial headMat = TConstructRegistry.getMaterial(head);
|
||||
ToolMaterial handleMat = TConstructRegistry.getMaterial(handle);
|
||||
ToolMaterial accessoryMat = TConstructRegistry.getMaterial(accessory);
|
||||
ToolMaterial extraMat = TConstructRegistry.getMaterial(extra);
|
||||
TToolMaterial headMat = TConstructRegistry.getMaterial(TToolMaterial)head);
|
||||
TToolMaterial handleMat = TConstructRegistry.getMaterial(handle);
|
||||
TToolMaterial accessoryMat = TConstructRegistry.getMaterial(accessory);
|
||||
TToolMaterial extraMat = TConstructRegistry.getMaterial(extra);
|
||||
|
||||
int reinforced = 0;
|
||||
String style = "";
|
||||
@@ -455,7 +455,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
}
|
||||
if (getPartAmount() >= 4)
|
||||
{
|
||||
current = extraMat.reinforced();
|
||||
current = extraMat.reinforced();
|
||||
if (current > 0 && current > reinforced)
|
||||
{
|
||||
style = extraMat.style();
|
||||
@@ -527,7 +527,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
while (iter.hasNext())
|
||||
{
|
||||
Map.Entry pairs = (Map.Entry) iter.next();
|
||||
ToolMaterial material = (ToolMaterial) pairs.getValue();
|
||||
TToolMaterial material = (TToolMaterial) pairs.getValue();
|
||||
buildTool((Integer) pairs.getKey(), material.displayName, list);
|
||||
}
|
||||
}
|
||||
@@ -844,8 +844,6 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
return tags.getCompoundTag("InfiTool").getInteger("Damage");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Battlegear support, IBattlegearWeapon */
|
||||
|
||||
@Override
|
||||
@@ -961,6 +959,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
|
||||
}
|
||||
return tags.getInteger("Energy");
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxEnergyStored (ItemStack container)
|
||||
{
|
||||
|
||||
@@ -36,8 +36,8 @@ public class EnvironmentGui extends GuiScreen
|
||||
{
|
||||
Keyboard.enableRepeatEvents(true);
|
||||
this.buttonList.clear();
|
||||
this.buttonList.add(new GuiButton(0, this.width / 2 - 175, this.height / 4 + 96 + 24, 350, 20, I18n.getStringParams("I accept responsibility for all cross-mod bugs in this modpack.")));
|
||||
this.buttonList.add(new GuiButton(1, this.width / 2 - 175, this.height / 4 + 120 + 24, 350, 20, I18n.getStringParams("I do not want to run these mods together. (Exits Minecraft)")));
|
||||
this.buttonList.add(new GuiButton(0, this.field_146294_l / 2 - 175, this.field_146295_m / 4 + 96 + 24, 350, 20, I18n.getStringParams("I accept responsibility for all cross-mod bugs in this modpack.")));
|
||||
this.buttonList.add(new GuiButton(1, this.field_146294_l / 2 - 175, this.field_146295_m / 4 + 120 + 24, 350, 20, I18n.getStringParams("I do not want to run these mods together. (Exits Minecraft)")));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -76,12 +76,12 @@ public class EnvironmentGui extends GuiScreen
|
||||
builder.setLength(0);
|
||||
this.drawDefaultBackground();
|
||||
String mod = mods.get(count);
|
||||
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("Tinkers' Construct is not compatible with "+mod), this.width / 2, 20, 0xFFFFFF);
|
||||
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("The following reasons are given:"), this.width / 2, 32, 0xFFFFFF);
|
||||
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("Tinkers' Construct is not compatible with "+mod), this.field_146294_l / 2, 20, 0xFFFFFF);
|
||||
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("The following reasons are given:"), this.field_146294_l / 2, 32, 0xFFFFFF);
|
||||
field_146289_q.drawSplitString(I18n.getStringParams(EnvironmentChecks.modCompatDetails(mod, false)), 20, 52, 400, 0xffffff);
|
||||
|
||||
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("The Tinkers' Construct team will not accept bug reports with this mod installed."), this.width / 2, 153, 0xFFFFFF);
|
||||
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("We apologize for any inconvenience this may cause you."), this.width / 2, 165, 0xFFFFFF);
|
||||
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("The Tinkers' Construct team will not accept bug reports with this mod installed."), this.field_146294_l / 2, 153, 0xFFFFFF);
|
||||
this.drawCenteredString(this.field_146289_q, I18n.getStringParams("We apologize for any inconvenience this may cause you."), this.field_146294_l / 2, 165, 0xFFFFFF);
|
||||
super.drawScreen(par1, par2, par3);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user