This commit is contained in:
Bernhard Bonigl committed 2014-09-20 23:15:04 +02:00
commit 11cd2011e8
7 files changed
+415 -52

No files matched your search

@@ -238,18 +238,19 @@ public class ArmorExtended implements IInventory
}
}
public void dropItems (ArrayList<EntityItem> drops)
public void dropItems ()
{
EntityPlayer player = parent.get();
player.captureDrops = true;
for (int i = 0; i < 4; ++i)
{
if (this.inventory[i] != null)
{
EntityItem entityItem = player.func_146097_a(this.inventory[i], true, false);
drops.add(entityItem);
player.func_146097_a(this.inventory[i], true, false);
this.inventory[i] = null;
}
}
player.captureDrops = false;
}
@Override
@@ -158,18 +158,19 @@ public class KnapsackInventory implements IInventory
}
}
public void dropItems (ArrayList<EntityItem> drops)
public void dropItems ()
{
EntityPlayer player = parent.get();
player.captureDrops = true;
for (int i = 0; i < inventory.length; ++i)
{
if (this.inventory[i] != null)
{
EntityItem entityItem = player.func_146097_a(this.inventory[i], true, false);
drops.add(entityItem);
player.func_146097_a(this.inventory[i], true, false);
this.inventory[i] = null;
}
}
player.captureDrops = false;
}
public void unequipItems ()
@@ -261,8 +261,8 @@ public class TPlayerHandler
else
stats.hunger = evt.entityPlayer.getFoodStats().getFoodLevel();
stats.armor.dropItems(evt.drops);
stats.knapsack.dropItems(evt.drops);
stats.armor.dropItems();
stats.knapsack.dropItems();
playerStats.put(evt.entityPlayer.getPersistentID(), stats);
}
@@ -97,7 +97,8 @@ public class TConstructRegistry
* ingot, toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade,
* wideGuard, handGuard, crossbar, binding, frypanHead, signHead,
* knifeBlade, chiselHead, toughRod, toughBinding, largePlate, broadAxeHead,
* scytheHead, excavatorHead, largeBlade, hammerHead, fullGuard, bowstring
* scytheHead, excavatorHead, largeBlade, hammerHead, fullGuard, bowString,
* fletching, arrowHead
*/
static HashMap<String, ItemStack> itemstackDirectory = new HashMap<String, ItemStack>();
@@ -178,7 +178,7 @@ public class TinkerTools
TConstructRegistry.addItemToDirectory("blankPattern", TinkerTools.blankPattern);
TConstructRegistry.addItemToDirectory("woodPattern", TinkerTools.woodPattern);
String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" };
String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard", "bowString", "fletching", "arrowHead" };
for (int i = 1; i < patternTypes.length; i++)
{
@@ -57,6 +57,7 @@ public class CreativeModifier extends Item
{
String targetLock = "None";
targetLock = stack.getTagCompound().getString("TargetLock");
targetLock = StatCollector.translateToLocal("tool." + targetLock.toLowerCase());
list.add(StatCollector.translateToLocal("creativeModLock.tooltip") + targetLock);
}
}