mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 04:09:40 +00:00
Merge branch '1.6.4' of https://github.com/SlimeKnights/TinkersConstruct into 1.6.4
This commit is contained in:
commit
a5aaa6f4b1
8 files changed
+129
-26
No files matched your search
@@ -223,8 +223,8 @@ item.tconstruct.Materials.CopperIngot.name=Copper Ingot
|
||||
item.tconstruct.Materials.TinIngot.name=Tin Ingot
|
||||
item.tconstruct.Materials.AluminumIngot.name=Aluminum Ingot
|
||||
item.tconstruct.Materials.RawAluminum.name=Raw Aluminum
|
||||
item.tconstruct.Materials.BronzeIngot.name=Tinker's Alloy Ingot
|
||||
item.tconstruct.Materials.AluBrassIngot.name=Tinker's Alloy Ingot
|
||||
item.tconstruct.Materials.BronzeIngot.name=Bronze Ingot
|
||||
item.tconstruct.Materials.AluBrassIngot.name=Aluminum Brass Ingot
|
||||
item.tconstruct.Materials.AlumiteIngot.name=Alumite Ingot
|
||||
item.tconstruct.Materials.SteelIngot.name=Steel Ingot
|
||||
item.tconstruct.Materials.BlueSlimeCrystal.name=Slime Crystal
|
||||
@@ -234,14 +234,14 @@ item.tconstruct.Materials.CopperNugget.name=Copper Nugget
|
||||
item.tconstruct.Materials.TinNugget.name=Tin Nugget
|
||||
item.tconstruct.Materials.AluminumNugget.name=Aluminum Nugget
|
||||
item.tconstruct.Materials.EssenceCrystal.name=Fake Essence Crystal
|
||||
item.tconstruct.Materials.AluBrassNugget.name=Tinker's Alloy Nugget
|
||||
item.tconstruct.Materials.AluBrassNugget.name=Aluminum Brass Nugget
|
||||
item.tconstruct.Materials.SilkyCloth.name=Silky Cloth
|
||||
item.tconstruct.Materials.SilkyJewel.name=Silky Jewel
|
||||
item.tconstruct.Materials.ObsidianNugget.name=Obsidian Nugget
|
||||
item.tconstruct.Materials.CobaltNugget.name=Cobalt Nugget
|
||||
item.tconstruct.Materials.ArditeNugget.name=Ardite Nugget
|
||||
item.tconstruct.Materials.ManyullynNugget.name=Manyullyn Nugget
|
||||
item.tconstruct.Materials.BronzeNugget.name=Tinker's Alloy Nugget
|
||||
item.tconstruct.Materials.BronzeNugget.name=Bronze Nugget
|
||||
item.tconstruct.Materials.AlumiteNugget.name=Alumite Nugget
|
||||
item.tconstruct.Materials.SteelNugget.name=Steel Nugget
|
||||
item.tconstruct.Materials.PigIronIngot.name=Pig Iron Ingot
|
||||
@@ -302,10 +302,10 @@ StorageMetals.Cobalt.name=Block of Cobalt
|
||||
StorageMetals.Ardite.name=Block of Ardite
|
||||
StorageMetals.Manyullyn.name=Block of Manyullyn
|
||||
StorageMetals.Copper.name=Block of Copper
|
||||
StorageMetals.Bronze.name=Block of Tinker's Alloy
|
||||
StorageMetals.Bronze.name=Block of Bronze
|
||||
StorageMetals.Tin.name=Block of Tin
|
||||
StorageMetals.Aluminum.name=Block of Aluminum
|
||||
StorageMetals.AlBrass.name=Block of Tinker's Alloy
|
||||
StorageMetals.AlBrass.name=Block of Aluminum Brass
|
||||
StorageMetals.Alumite.name=Block of Alumite
|
||||
StorageMetals.Steel.name=Block of Steel
|
||||
StorageMetals.Ender.name=Block of Solid Ender
|
||||
@@ -406,8 +406,8 @@ item.tconstruct.bucket.Tin.name=Molten Tin Bucket
|
||||
item.tconstruct.bucket.Aluminum.name=Molten Aluminum Bucket
|
||||
item.tconstruct.bucket.Cobalt.name=Molten Cobalt Bucket
|
||||
item.tconstruct.bucket.Ardite.name=Molten Ardite Bucket
|
||||
item.tconstruct.bucket.Bronze.name=Molten Tinker's Alloy Bucket
|
||||
item.tconstruct.bucket.AluBrass.name=Molten Tinker's Alloy Bucket
|
||||
item.tconstruct.bucket.Bronze.name=Molten Bronze Bucket
|
||||
item.tconstruct.bucket.AluBrass.name=Molten Aluminum Brass Bucket
|
||||
item.tconstruct.bucket.Manyullyn.name=Molten Manyullyn Bucket
|
||||
item.tconstruct.bucket.Alumite.name=Molten Alumite Bucket
|
||||
item.tconstruct.bucket.Obsidian.name=Molten Obsidian Bucket
|
||||
@@ -437,8 +437,8 @@ tile.metal.molten.tin.name=Liquid Tin
|
||||
tile.metal.molten.aluminum.name=Molten Aluminum
|
||||
tile.metal.molten.cobalt.name=Molten Cobalt
|
||||
tile.metal.molten.ardite.name=Molten Ardite
|
||||
tile.metal.molten.bronze.name=Molten Tinker's Alloy
|
||||
tile.metal.molten.alubrass.name=Molten Tinker's Alloy
|
||||
tile.metal.molten.bronze.name=Molten Bronze
|
||||
tile.metal.molten.alubrass.name=Molten Aluminum Brass
|
||||
tile.metal.molten.manyullyn.name=Molten Manyullyn
|
||||
tile.metal.molten.alumite.name=Molten Alumite
|
||||
tile.metal.molten.obsidian.name=Molten Obsidian
|
||||
@@ -463,8 +463,8 @@ LiquidMetal.Tin.name=Liquid Tin
|
||||
LiquidMetal.Aluminum.name=Molten Aluminum
|
||||
LiquidMetal.Cobalt.name=Molten Cobalt
|
||||
LiquidMetal.Ardite.name=Molten Ardite
|
||||
LiquidMetal.Bronze.name=Molten Tinker's Alloy
|
||||
LiquidMetal.AluBrass.name=Molten Tinker's Alloy
|
||||
LiquidMetal.Bronze.name=Molten Bronze
|
||||
LiquidMetal.AluBrass.name=Molten Aluminum Brass
|
||||
LiquidMetal.Manyullyn.name=Molten Manyullyn
|
||||
LiquidMetal.Alumite.name=Molten Alumite
|
||||
LiquidMetal.Obsidian.name=Molten Obsidian
|
||||
@@ -523,7 +523,7 @@ parttype.cobalt=Cobalt
|
||||
parttype.ardite=Ardite
|
||||
parttype.manyullyn=Manyullyn
|
||||
parttype.copper=Copper
|
||||
parttype.bronze=Tinker's Alloy
|
||||
parttype.bronze=Bronze
|
||||
parttype.alumite=Alumite
|
||||
parttype.steel=Steel
|
||||
parttype.blueslime=Slime
|
||||
@@ -564,8 +564,8 @@ fluid.tin.molten=Molten Tin
|
||||
fluid.aluminum.molten=Molten Aluminum
|
||||
fluid.cobalt.molten=Molten Cobalt
|
||||
fluid.ardite.molten=Molten Ardite
|
||||
fluid.bronze.molten=Molten Tinker's Alloy
|
||||
fluid.aluminumbrass.molten=Molten Tinker's Alloy
|
||||
fluid.bronze.molten=Molten Bronze
|
||||
fluid.aluminumbrass.molten=Molten Aluminum Brass
|
||||
fluid.manyullyn.molten=Molten Manyullyn
|
||||
fluid.alumite.molten=Molten Alumite
|
||||
fluid.obsidian.molten=Molten Obsidian
|
||||
|
||||
@@ -661,7 +661,7 @@ Class: Ranged Projectile Launcher</text>
|
||||
</page>
|
||||
|
||||
<page type="materialstats">
|
||||
<title>Tinker's Alloy</title>
|
||||
<title>Bronze</title>
|
||||
<icon>bronzeaxe</icon>
|
||||
<text>A common alloy. It's a bit better than iron.
|
||||
- Requires the Smeltery</text>
|
||||
|
||||
@@ -116,11 +116,11 @@ Other liquid removal objects will work, but are frowned upon. An example picture
|
||||
<page type="sidebar">
|
||||
<text>Alloys are made when two or more metals are mixed in precise proportions. Currently known alloys are:</text>
|
||||
<item>
|
||||
<text>Tinker's Alloy, made from Copper(3) and Tin(1)</text>
|
||||
<text>Bronze, made from Copper(3) and Tin(1)</text>
|
||||
<icon>bronzeingot</icon>
|
||||
</item>
|
||||
<item>
|
||||
<text>Tinker's Alloy, made from Aluminum(3) and Copper(1)</text>
|
||||
<text>Aluminum Brass, made from Aluminum(3) and Copper(1)</text>
|
||||
<icon>alubrassingot</icon>
|
||||
</item>
|
||||
<item>
|
||||
|
||||
@@ -16,13 +16,13 @@ public class ArmorExtendedContainer extends ActiveContainer
|
||||
invPlayer = inventoryplayer;
|
||||
this.armor = armor;
|
||||
|
||||
this.addSlotToContainer(new Slot(armor, 0, 80, 17));
|
||||
this.addSlotToContainer(new Slot(armor, 1, 80, 35));
|
||||
this.addSlotToContainer(new Slot(armor, 2, 116, 17));
|
||||
this.addSlotToContainer(new Slot(armor, 3, 116, 35));
|
||||
this.addSlotToContainer(new Slot(armor, 4, 152, 17));
|
||||
this.addSlotToContainer(new Slot(armor, 5, 152, 35));
|
||||
this.addSlotToContainer(new Slot(armor, 6, 152, 53));
|
||||
this.addSlotToContainer(new SlotUnused(armor, 0, 80, 17));
|
||||
this.addSlotToContainer(new SlotUnused(armor, 1, 80, 35));
|
||||
this.addSlotToContainer(new SlotKnapsack(armor, 2, 116, 17));
|
||||
this.addSlotToContainer(new SlotUnused(armor, 3, 116, 35));
|
||||
this.addSlotToContainer(new SlotUnused(armor, 4, 152, 17));
|
||||
this.addSlotToContainer(new SlotUnused(armor, 5, 152, 35));
|
||||
this.addSlotToContainer(new SlotCanister(armor, 6, 152, 53));
|
||||
|
||||
/* Player inventory */
|
||||
for (int playerArmor = 0; playerArmor < 4; ++playerArmor)
|
||||
|
||||
@@ -5,6 +5,7 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
@@ -44,7 +45,11 @@ public class SlotArmorCopy extends Slot
|
||||
public boolean isItemValid (ItemStack par1ItemStack)
|
||||
{
|
||||
Item item = (par1ItemStack == null ? null : par1ItemStack.getItem());
|
||||
return item != null;// && item.isValidArmor(par1ItemStack, armorType, parent.thePlayer);
|
||||
boolean isValidArmor = false;
|
||||
if (item instanceof ItemArmor) {
|
||||
isValidArmor = (((ItemArmor)item).armorType == armorType);
|
||||
}
|
||||
return item != null && (isValidArmor || (item instanceof ItemBlock && armorType == 0));
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
package tconstruct.inventory;
|
||||
|
||||
import tconstruct.items.armor.HeartCanister;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
public class SlotCanister extends Slot
|
||||
{
|
||||
public SlotCanister(IInventory par2IInventory, int par3, int par4, int par5)
|
||||
{
|
||||
super(par2IInventory, par3, par4, par5);
|
||||
//this.parent = container;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case
|
||||
* of armor slots)
|
||||
*/
|
||||
public int getSlotStackLimit ()
|
||||
{
|
||||
return 10;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the stack is a valid item for this slot. Always true beside for the armor slots.
|
||||
*/
|
||||
public boolean isItemValid (ItemStack par1ItemStack)
|
||||
{
|
||||
Item item = (par1ItemStack == null ? null : par1ItemStack.getItem());
|
||||
return item != null && (item instanceof HeartCanister);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package tconstruct.inventory;
|
||||
|
||||
import tconstruct.items.armor.Knapsack;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
public class SlotKnapsack extends Slot
|
||||
{
|
||||
public SlotKnapsack(IInventory par2IInventory, int par3, int par4, int par5)
|
||||
{
|
||||
super(par2IInventory, par3, par4, par5);
|
||||
//this.parent = container;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case
|
||||
* of armor slots)
|
||||
*/
|
||||
public int getSlotStackLimit ()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the stack is a valid item for this slot. Always true beside for the armor slots.
|
||||
*/
|
||||
public boolean isItemValid (ItemStack par1ItemStack)
|
||||
{
|
||||
Item item = (par1ItemStack == null ? null : par1ItemStack.getItem());
|
||||
return item != null && (item instanceof Knapsack);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package tconstruct.inventory;
|
||||
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class SlotUnused extends Slot
|
||||
{
|
||||
public SlotUnused(IInventory par2IInventory, int par3, int par4, int par5)
|
||||
{
|
||||
super(par2IInventory, par3, par4, par5);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case
|
||||
* of armor slots)
|
||||
*/
|
||||
public int getSlotStackLimit ()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the stack is a valid item for this slot. Always true beside for the armor slots.
|
||||
*/
|
||||
public boolean isItemValid (ItemStack par1ItemStack)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user