Merge pull request #63 from fuj1n/16working

More bug fixes :D
This commit is contained in:
mDiyo committed 2013-07-28 16:08:39 -07:00
commit 8a4e2c95bf
6 files changed
+85 -38

No files matched your search

+17 -17
View File
@@ -264,23 +264,23 @@
<entry key="item.tconstruct.bowstring.string.name">Bowstring</entry>
<entry key="item.tconstruct.bowstring.enchantedfabriI donc.name">Enchanted Bowstring</entry>
<entry key="LiquidMetal.Iron.name">Molten Iron</entry>
<entry key="LiquidMetal.Gold.name">Molten Gold</entry>
<entry key="LiquidMetal.Copper.name">Molten Copper</entry>
<entry key="LiquidMetal.Tin.name">Liquid Tin</entry>
<entry key="LiquidMetal.Aluminum.name">Molten Aluminum</entry>
<entry key="LiquidMetal.Cobalt.name">Molten Cobalt</entry>
<entry key="LiquidMetal.Ardite.name">Molten Ardite</entry>
<entry key="LiquidMetal.Bronze.name">Molten Bronze</entry>
<entry key="LiquidMetal.AluBrass.name">Molten Aluminum Brass</entry>
<entry key="LiquidMetal.Manyullyn.name">Molten Manyullyn</entry>
<entry key="LiquidMetal.Alumite.name">Molten Alumite</entry>
<entry key="LiquidMetal.Obsidian.name">Molten Obsidian</entry>
<entry key="LiquidMetal.Steel.name">Molten Steel</entry>
<entry key="LiquidMetal.Glass.name">Molten Glass</entry>
<entry key="LiquidMetal.Stone.name">Seared Stone</entry>
<entry key="LiquidMetal.Villager.name">Liquified Emerald</entry>
<entry key="LiquidMetal.Cow.name">Blood</entry>
<entry key="tile.metal.molten.iron.name">Molten Iron</entry>
<entry key="tile.metal.molten.gold.name">Molten Gold</entry>
<entry key="tile.metal.molten.copper.name">Molten Copper</entry>
<entry key="tile.metal.molten.tin.name">Liquid Tin</entry>
<entry key="tile.metal.molten.aluminum.name">Molten Aluminum</entry>
<entry key="tile.metal.molten.cobalt.name">Molten Cobalt</entry>
<entry key="tile.metal.molten.ardite.name">Molten Ardite</entry>
<entry key="tile.metal.molten.bronze.name">Molten Bronze</entry>
<entry key="tile.metal.molten.alubrass.name">Molten Aluminum Brass</entry>
<entry key="tile.metal.molten.manyullyn.name">Molten Manyullyn</entry>
<entry key="tile.metal.molten.alumite.name">Molten Alumite</entry>
<entry key="tile.metal.molten.obsidian.name">Molten Obsidian</entry>
<entry key="tile.metal.molten.steel.name">Molten Steel</entry>
<entry key="tile.metal.molten.glass.name">Molten Glass</entry>
<entry key="tile.molten.stone.name">Seared Stone</entry>
<entry key="tile.molten.emerald.name">Liquified Emerald</entry>
<entry key="tile.molten.blood.name">Blood</entry>
<entry key="item.food.apple.diamond.name">Jeweled Apple</entry>
<entry key="item.tconstruct.strangefood.edibleslime.name">Gelatinous Slime</entry>
@@ -616,4 +616,9 @@ public class GlassBlockConnected extends Block
icons[14] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_3_r");
icons[15] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_4");
}
@Override
public boolean canPlaceTorchOnTop(World world, int x, int y, int z) {
return true;
}
}
@@ -7,6 +7,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
/** @author fuj1n
*
@@ -90,4 +91,9 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected
return par1;
}
@Override
public boolean canPlaceTorchOnTop(World world, int x, int y, int z) {
return true;
}
}
+33 -20
View File
@@ -1,6 +1,7 @@
package tconstruct.client;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -11,6 +12,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.gui.inventory.GuiInventory;
import net.minecraft.client.model.ModelSlime;
@@ -308,24 +310,35 @@ public class TProxyClient extends TProxyCommon
mc = Minecraft.getMinecraft();*/
if (gui.getClass() == GuiInventory.class || classMatches(gui, "micdoodle8.mods.galacticraft.core.client.gui.GCCoreGuiInventory"))
{
int cornerX = gui.guiLeft;
int cornerY = (gui.height - gui.ySize) / 2;
gui.buttonList.clear();
InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0);
tab.enabled = false;
gui.buttonList.add(tab);
tab = new InventoryTab(3, cornerX + 28, cornerY - 28, new ItemStack(Item.plateDiamond), 1);
gui.buttonList.add(tab);
if (armorExtended.inventory[2] != null && armorExtended.inventory[2].getItem() == TContent.knapsack)
{
if (gui.buttonList.size() < 3)
{
tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1);
gui.buttonList.add(tab);
}
}
}
try{
Field guiLeft = GuiContainer.class.getDeclaredField("guiLeft");
guiLeft.setAccessible(true);
int cornerX = (Integer)guiLeft.get(gui);
Field ySize = GuiContainer.class.getDeclaredField("ySize");
ySize.setAccessible(true);
int cornerY = (gui.height - (Integer)ySize.get(gui)) / 2;
Field buttonList = GuiScreen.class.getDeclaredField("buttonList");
buttonList.setAccessible(true);
ArrayList listOfButtons = (ArrayList)buttonList.get(gui);
listOfButtons.clear();
InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0);
tab.enabled = false;
listOfButtons.add(tab);
tab = new InventoryTab(3, cornerX + 28, cornerY - 28, new ItemStack(Item.plateDiamond), 1);
listOfButtons.add(tab);
if (armorExtended.inventory[2] != null && armorExtended.inventory[2].getItem() == TContent.knapsack)
{
if (listOfButtons.size() < 3)
{
tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1);
listOfButtons.add(tab);
}
}
}catch(Exception e){
e.printStackTrace();
}
}
}
public static boolean classMatches (Object paramObject, String paramString)
@@ -783,12 +796,12 @@ public class TProxyClient extends TProxyCommon
void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body)
{
TConstructClientRegistry.addToolButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, "tinker", title, body, "/mods/tinker/textures/gui/icons.png"));
TConstructClientRegistry.addToolButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, "tinker", title, "tinker", "textures/gui/icons.png"));
}
void addTierTwoButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body)
{
TConstructClientRegistry.addTierTwoButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, "tinker", title, body, "/mods/tinker/textures/gui/icons.png"));
TConstructClientRegistry.addTierTwoButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, "tinker", title, "tinker", "textures/gui/icons.png"));
}
void addRenderMappings ()
+1 -1
View File
@@ -21,7 +21,7 @@ public class InventoryTab extends GuiButton
int textureX;
//String texture = "/gui/allitems.png";
ItemStack renderStack;
private static final ResourceLocation background = new ResourceLocation("gui/allitems.png");
private static final ResourceLocation background = new ResourceLocation("textures/gui/container/creative_inventory/tabs.png");
public InventoryTab(int id, int posX, int posY, ItemStack stack, int texX)
{
+23
View File
@@ -564,6 +564,7 @@ public class TContent implements IFuelHandler
moltenIronFluid = new Fluid("Molten Iron");
moltenIron = new LiquidMetalFinite(PHConstruct.moltenIron, moltenIronFluid, "liquid_iron").setUnlocalizedName("metal.molten.iron");
GameRegistry.registerBlock(moltenIron, "metal.molten.iron");
moltenIronFluid.setBlockID(moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[0] = moltenIronFluid;
fluidBlocks[0] = moltenIron;
@@ -572,6 +573,7 @@ public class TContent implements IFuelHandler
moltenGoldFluid = new Fluid("Molten Gold");
moltenGold = new LiquidMetalFinite(PHConstruct.moltenGold, moltenGoldFluid, "liquid_gold").setUnlocalizedName("metal.molten.gold");
GameRegistry.registerBlock(moltenGold, "metal.molten.gold");
moltenGoldFluid.setBlockID(moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[1] = moltenGoldFluid;
fluidBlocks[1] = moltenGold;
@@ -580,6 +582,7 @@ public class TContent implements IFuelHandler
moltenCopperFluid = new Fluid("Molten Copper");
moltenCopper = new LiquidMetalFinite(PHConstruct.moltenCopper, moltenCopperFluid, "liquid_copper").setUnlocalizedName("metal.molten.copper");
GameRegistry.registerBlock(moltenCopper, "metal.molten.copper");
moltenCopperFluid.setBlockID(moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[2] = moltenCopperFluid;
fluidBlocks[2] = moltenCopper;
@@ -588,6 +591,7 @@ public class TContent implements IFuelHandler
moltenTinFluid = new Fluid("Molten Tin");
moltenTin = new LiquidMetalFinite(PHConstruct.moltenTin, moltenTinFluid, "liquid_tin").setUnlocalizedName("metal.molten.tin");
GameRegistry.registerBlock(moltenTin, "metal.molten.tin");
moltenTinFluid.setBlockID(moltenTin).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[3] = moltenTinFluid;
fluidBlocks[3] = moltenTin;
@@ -596,6 +600,7 @@ public class TContent implements IFuelHandler
moltenAluminumFluid = new Fluid("Molten Aluminum");
moltenAluminum = new LiquidMetalFinite(PHConstruct.moltenAluminum, moltenAluminumFluid, "liquid_aluminum").setUnlocalizedName("metal.molten.aluminum");
GameRegistry.registerBlock(moltenAluminum, "metal.molten.aluminum");
moltenAluminumFluid.setBlockID(moltenAluminum).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[4] = moltenAluminumFluid;
fluidBlocks[4] = moltenAluminum;
@@ -604,6 +609,7 @@ public class TContent implements IFuelHandler
moltenCobaltFluid = new Fluid("Molten Cobalt");
moltenCobalt = new LiquidMetalFinite(PHConstruct.moltenCobalt, moltenCobaltFluid, "liquid_cobalt").setUnlocalizedName("metal.molten.cobalt");
GameRegistry.registerBlock(moltenCobalt, "metal.molten.cobalt");
moltenCobaltFluid.setBlockID(moltenCobalt).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[5] = moltenCobaltFluid;
fluidBlocks[5] = moltenCobalt;
@@ -612,6 +618,7 @@ public class TContent implements IFuelHandler
moltenArditeFluid = new Fluid("Molten Ardite");
moltenArdite = new LiquidMetalFinite(PHConstruct.moltenArdite, moltenArditeFluid, "liquid_ardite").setUnlocalizedName("metal.molten.ardite");
GameRegistry.registerBlock(moltenArdite, "metal.molten.ardite");
moltenArditeFluid.setBlockID(moltenArdite).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[6] = moltenArditeFluid;
fluidBlocks[6] = moltenArdite;
@@ -620,6 +627,7 @@ public class TContent implements IFuelHandler
moltenBronzeFluid = new Fluid("Molten Bronze");
moltenBronze = new LiquidMetalFinite(PHConstruct.moltenBronze, moltenBronzeFluid, "liquid_bronze").setUnlocalizedName("metal.molten.bronze");
GameRegistry.registerBlock(moltenBronze, "metal.molten.bronze");
moltenBronzeFluid.setBlockID(moltenBronze).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[7] = moltenBronzeFluid;
fluidBlocks[7] = moltenBronze;
@@ -628,6 +636,7 @@ public class TContent implements IFuelHandler
moltenAlubrassFluid = new Fluid("Molten Aluminum Brass");
moltenAlubrass = new LiquidMetalFinite(PHConstruct.moltenAlubrass, moltenAlubrassFluid, "liquid_alubrass").setUnlocalizedName("metal.molten.alubrass");
GameRegistry.registerBlock(moltenAlubrass, "metal.molten.alubrass");
moltenAlubrassFluid.setBlockID(moltenAlubrass).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[8] = moltenAlubrassFluid;
fluidBlocks[8] = moltenAlubrass;
@@ -636,6 +645,7 @@ public class TContent implements IFuelHandler
moltenManyullynFluid = new Fluid("Molten Manyullyn");
moltenManyullyn = new LiquidMetalFinite(PHConstruct.moltenManyullyn, moltenManyullynFluid, "liquid_manyullyn").setUnlocalizedName("metal.molten.manyullyn");
GameRegistry.registerBlock(moltenManyullyn, "metal.molten.manyullyn");
moltenManyullynFluid.setBlockID(moltenManyullyn).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[9] = moltenManyullynFluid;
fluidBlocks[9] = moltenManyullyn;
@@ -644,6 +654,7 @@ public class TContent implements IFuelHandler
moltenAlumiteFluid = new Fluid("Molten Alumite");
moltenAlumite = new LiquidMetalFinite(PHConstruct.moltenAlumite, moltenAlumiteFluid, "liquid_alumite").setUnlocalizedName("metal.molten.alumite");
GameRegistry.registerBlock(moltenAlumite, "metal.molten.alumite");
moltenAlumiteFluid.setBlockID(moltenAlumite).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[10] = moltenAlumiteFluid;
fluidBlocks[10] = moltenAlumite;
@@ -652,6 +663,7 @@ public class TContent implements IFuelHandler
moltenObsidianFluid = new Fluid("Molten Obsidian");
moltenObsidian = new LiquidMetalFinite(PHConstruct.moltenObsidian, moltenObsidianFluid, "liquid_obsidian").setUnlocalizedName("metal.molten.obsidian");
GameRegistry.registerBlock(moltenObsidian, "metal.molten.obsidian");
moltenObsidianFluid.setBlockID(moltenObsidian).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[11] = moltenObsidianFluid;
fluidBlocks[11] = moltenObsidian;
@@ -660,6 +672,7 @@ public class TContent implements IFuelHandler
moltenSteelFluid = new Fluid("Molten Steel");
moltenSteel = new LiquidMetalFinite(PHConstruct.moltenSteel, moltenSteelFluid, "liquid_steel").setUnlocalizedName("metal.molten.steel");
GameRegistry.registerBlock(moltenSteel, "metal.molten.steel");
moltenSteelFluid.setBlockID(moltenSteel).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[12] = moltenSteelFluid;
fluidBlocks[12] = moltenSteel;
@@ -668,6 +681,7 @@ public class TContent implements IFuelHandler
moltenGlassFluid = new Fluid("Molten Glass");
moltenGlass = new LiquidMetalFinite(PHConstruct.moltenGlass, moltenGlassFluid, "liquid_glass").setUnlocalizedName("metal.molten.glass");
GameRegistry.registerBlock(moltenGlass, "metal.molten.glass");
moltenGlassFluid.setBlockID(moltenGlass).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[13] = moltenGlassFluid;
fluidBlocks[13] = moltenGlass;
@@ -676,6 +690,7 @@ public class TContent implements IFuelHandler
moltenStoneFluid = new Fluid("Seared Stone");
moltenStone = new LiquidMetalFinite(PHConstruct.moltenStone, moltenStoneFluid, "liquid_stone").setUnlocalizedName("molten.stone");
GameRegistry.registerBlock(moltenStone, "molten.stone");
moltenStoneFluid.setBlockID(moltenStone).setLuminosity(12).setDensity(3000).setViscosity(6000);
fluids[14] = moltenStoneFluid;
fluidBlocks[14] = moltenStone;
@@ -684,6 +699,7 @@ public class TContent implements IFuelHandler
moltenEmeraldFluid = new Fluid("Molten Emerald");
moltenEmerald = new LiquidMetalFinite(PHConstruct.moltenEmerald, moltenEmeraldFluid, "liquid_villager").setUnlocalizedName("molten.emerald");
GameRegistry.registerBlock(moltenEmerald, "molten.emerald");
moltenEmeraldFluid.setBlockID(moltenEmerald).setDensity(3000).setViscosity(6000);
fluids[15] = moltenEmeraldFluid;
fluidBlocks[15] = moltenEmerald;
@@ -692,6 +708,7 @@ public class TContent implements IFuelHandler
bloodFluid = new Fluid("Blood");
blood = new LiquidMetalFinite(PHConstruct.blood, bloodFluid, "liquid_cow").setUnlocalizedName("liquid.blood");
GameRegistry.registerBlock(blood, "liquid.blood");
bloodFluid.setBlockID(blood).setDensity(3000).setViscosity(6000);
fluids[16] = bloodFluid;
fluidBlocks[16] = blood;
@@ -700,6 +717,7 @@ public class TContent implements IFuelHandler
moltenNickelFluid = new Fluid("Molten Nickel");
moltenNickel = new LiquidMetalFinite(PHConstruct.moltenNickel, moltenNickelFluid, "liquid_ferrous").setUnlocalizedName("metal.molten.nickel");
GameRegistry.registerBlock(moltenNickel, "metal.molten.nickel");
moltenNickelFluid.setBlockID(moltenNickel).setDensity(3000).setViscosity(6000);
fluids[17] = moltenNickelFluid;
fluidBlocks[17] = moltenNickel;
@@ -708,6 +726,7 @@ public class TContent implements IFuelHandler
moltenLeadFluid = new Fluid("Molten Lead");
moltenLead = new LiquidMetalFinite(PHConstruct.moltenLead, moltenLeadFluid, "liquid_lead").setUnlocalizedName("metal.molten.lead");
GameRegistry.registerBlock(moltenLead, "metal.molten.lead");
moltenLeadFluid.setBlockID(moltenLead).setDensity(3000).setViscosity(6000);
fluids[18] = moltenLeadFluid;
fluidBlocks[18] = moltenLead;
@@ -716,6 +735,7 @@ public class TContent implements IFuelHandler
moltenSilverFluid = new Fluid("Molten Silver");
moltenSilver = new LiquidMetalFinite(PHConstruct.moltenSilver, moltenSilverFluid, "liquid_silver").setUnlocalizedName("metal.molten.silver");
GameRegistry.registerBlock(moltenSilver, "metal.molten.silver");
moltenSilverFluid.setBlockID(moltenSilver).setDensity(3000).setViscosity(6000);
fluids[19] = moltenSilverFluid;
fluidBlocks[19] = moltenSilver;
@@ -724,6 +744,7 @@ public class TContent implements IFuelHandler
moltenShinyFluid = new Fluid("Molten Platinum");
moltenShiny = new LiquidMetalFinite(PHConstruct.moltenShiny, moltenShinyFluid, "liquid_shiny").setUnlocalizedName("metal.molten.shiny");
GameRegistry.registerBlock(moltenShiny, "metal.molten.shiny");
moltenShinyFluid.setBlockID(moltenShiny).setDensity(3000).setViscosity(6000);
fluids[20] = moltenLeadFluid;
fluidBlocks[20] = moltenShiny;
@@ -732,6 +753,7 @@ public class TContent implements IFuelHandler
moltenInvarFluid = new Fluid("Molten Invar");
moltenInvar = new LiquidMetalFinite(PHConstruct.moltenInvar, moltenInvarFluid, "liquid_invar").setUnlocalizedName("metal.molten.invar");
GameRegistry.registerBlock(moltenInvar, "metal.molten.invar");
moltenInvarFluid.setBlockID(moltenInvar).setDensity(3000).setViscosity(6000);
fluids[21] = moltenInvarFluid;
fluidBlocks[21] = moltenInvar;
@@ -740,6 +762,7 @@ public class TContent implements IFuelHandler
moltenElectrumFluid = new Fluid("Molten Electrum");
moltenElectrum = new LiquidMetalFinite(PHConstruct.moltenElectrum, moltenElectrumFluid, "liquid_electrum").setUnlocalizedName("metal.molten.electrum");
GameRegistry.registerBlock(moltenElectrum, "metal.molten.electrum");
moltenElectrumFluid.setBlockID(moltenElectrum).setDensity(3000).setViscosity(6000);
fluids[22] = moltenElectrumFluid;
fluidBlocks[22] = moltenElectrum;