upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-10-26 14:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change tab registry to srgnames

Browse Source
This commit is contained in:
mDiyo committed 2013-08-19 09:08:54 -07:00
1 parent 21153791dd
commit e78100c49e
5 files changed
+881 -716
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tconstruct/TConstruct.java
+1 -5
View File
@@ -42,7 +42,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry;
* @dependencies: IC2 API, MFR API
*/
@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.dev.28", dependencies = "required-after:Forge@[7.7.1.687,)")
@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.dev.28.1", dependencies = "required-after:Forge@[7.7.1.687,)")
@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class)
public class TConstruct
{
@@ -122,10 +122,6 @@ public class TConstruct
{
content.intermodCommunication();
GameRegistry.registerWorldGenerator(new SlimeIslandGen(TContent.slimePool.blockID, 0));
TabRegistry.registerTab(new InventoryTabVanilla());
TabRegistry.registerTab(new InventoryTabArmorExtended());
TabRegistry.registerTab(new InventoryTabKnapsack());
}
@EventHandler
tconstruct/blocks/logic/SmelteryLogic.java
+4 -4
View File
@@ -416,7 +416,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
needsUpdate = true;
if (moltenMetal.size() == 0)
{
moltenMetal.add(liquid);
moltenMetal.add(liquid.copy());
currentLiquid += liquid.amount;
return true;
}
@@ -446,9 +446,9 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
if (!added)
{
if (first)
moltenMetal.add(0, liquid);
moltenMetal.add(0, liquid.copy());
else
moltenMetal.add(liquid);
moltenMetal.add(liquid.copy());
}
return true;
}
@@ -912,7 +912,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
{
//liquid = null;
moltenMetal.remove(liquid);
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);RenderPlayerEvent
currentLiquid = 0;
needsUpdate = true;
}
tconstruct/client/TProxyClient.java
+872 -703
View File
File diff suppressed because it is too large. Load diff
tconstruct/client/tabs/TabRegistry.java
+3 -3
View File
@@ -29,13 +29,13 @@ public class TabRegistry
{
try
{
Field guiLeft = GuiContainer.class.getDeclaredField("p");
Field guiLeft = GuiContainer.class.getDeclaredField("field_74198_m");
guiLeft.setAccessible(true);
int cornerX = (Integer) guiLeft.get(gui);
Field ySize = GuiContainer.class.getDeclaredField("d");
Field ySize = GuiContainer.class.getDeclaredField("field_74195_c");
ySize.setAccessible(true);
int cornerY = (gui.height - (Integer) ySize.get(gui)) / 2;
Field buttonList = GuiScreen.class.getDeclaredField("i");
Field buttonList = GuiScreen.class.getDeclaredField("field_73887_h");
buttonList.setAccessible(true);
ArrayList listOfButtons = (ArrayList) buttonList.get(gui);
listOfButtons.clear();
tconstruct/common/TContent.java
+1 -1
View File
@@ -1087,7 +1087,7 @@ public class TContent implements IFuelHandler
void registerMaterials ()
{
TConstructRegistry.addToolMaterial(0, "Wood", "Wooden ", 0, 59, 200, 0, 1.0F, 0, 0f, "\u00A7e", "");
TConstructRegistry.addToolMaterial(0, "Wood", "Wooden ", 0, 59, 200, 0, 1.0F, 0, 0f, "\u00A7e", "");TProxyClient
TConstructRegistry.addToolMaterial(1, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, "", "Stonebound");
TConstructRegistry.addToolMaterial(2, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f", "");
TConstructRegistry.addToolMaterial(3, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, "\u00A78", "");