Merge branch 'master' of https://github.com/SlimeKnights/TinkersConst…

…ruct
SlimeKnights · Sep 20, 2014 · 11cd201 · 11cd201
2 parents ea67ebc + 2024846
commit 11cd201
Show file tree

Hide file tree

Showing 7 changed files with 415 additions and 52 deletions.
diff --git a/resources/assets/tinker/lang/ru_RU.lang b/resources/assets/tinker/lang/ru_RU.lang
diff --git a/src/main/java/tconstruct/armor/player/ArmorExtended.java b/src/main/java/tconstruct/armor/player/ArmorExtended.java
@@ -238,18 +238,19 @@ public void readFromNBT (NBTTagCompound tagCompound)
         }
     }
 
-    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

diff --git a/src/main/java/tconstruct/armor/player/KnapsackInventory.java b/src/main/java/tconstruct/armor/player/KnapsackInventory.java
@@ -158,18 +158,19 @@ public void readFromNBT (NBTTagCompound tagCompound)
         }
     }
 
-    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 ()

diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java
@@ -261,8 +261,8 @@ public void playerDrops (PlayerDropsEvent evt)
         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);
     }

diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java
@@ -97,7 +97,8 @@ public static Item getItem (String name)
      * 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>();
 

diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java
@@ -178,7 +178,7 @@ public void preInit (FMLPreInitializationEvent event)
         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++)
         {

diff --git a/src/main/java/tconstruct/tools/items/CreativeModifier.java b/src/main/java/tconstruct/tools/items/CreativeModifier.java
@@ -57,6 +57,7 @@ public void addInformation (ItemStack stack, EntityPlayer player, List list, boo
         {
             String targetLock = "None";
             targetLock = stack.getTagCompound().getString("TargetLock");
+            targetLock = StatCollector.translateToLocal("tool." + targetLock.toLowerCase());
             list.add(StatCollector.translateToLocal("creativeModLock.tooltip") + targetLock);
         }
     }