boom more items!

DoubleDoorDevelopment · Aug 17, 2014 · 90fb380 · 90fb380
1 parent 7e6cd43
commit 90fb380
Show file tree

Hide file tree

Showing 23 changed files with 34 additions and 12 deletions.
diff --git a/src/main/java/net/doubledoordev/lumberjack/Lumberjack.java b/src/main/java/net/doubledoordev/lumberjack/Lumberjack.java
@@ -98,8 +98,14 @@ public void init(FMLInitializationEvent event)
         HashSet<Item> items = new HashSet<>(Item.ToolMaterial.values().length);
         for (Item.ToolMaterial material : Item.ToolMaterial.values())
         {
-            if (material.func_150995_f() == null && debug) logger.warn("The ToolMaterial " + material + " doesn't have a crafting item set. No LumberAxe from that!");
-            else if (items.contains(material.func_150995_f()) && debug) logger.warn("The ToolMaterial " + material + " uses an item that has already been used.");
+            if (material.func_150995_f() == null)
+            {
+                if (debug) logger.warn("The ToolMaterial " + material + " doesn't have a crafting item set. No LumberAxe from that!");
+            }
+            else if (items.contains(material.func_150995_f()))
+            {
+                if (debug) logger.warn("The ToolMaterial " + material + " uses an item that has already been used.");
+            }
             else
             {
                 try

diff --git a/src/main/resources/assets/lumberjack/lang/en_US.lang b/src/main/resources/assets/lumberjack/lang/en_US.lang
@@ -1,16 +1,32 @@
-item.lumberaxeWood.name=Wooden Lumberaxe
-item.lumberaxeStone.name=Stone Lumberaxe
-item.lumberaxeIron.name=Iron Lumberaxe
-item.lumberaxeDiamond.name=Diamond Lumberaxe
-item.lumberaxeGold.name=Golden Lumberaxe
-
-item.lumberaxeBronze.name=Bronze Lumberaxe
+item.lumberaxeAdmin.name=Admin Lumberaxe
+item.lumberaxeAether.name=Aether Lumberaxe
 item.lumberaxeAluminium.name=Aluminium Lumberaxe
+item.lumberaxeBrass.name=Brass Lumberaxe
+item.lumberaxeBronze.name=Bronze Lumberaxe
 item.lumberaxeCopper.name=Copper Lumberaxe
+item.lumberaxeCrystal.name=Crystal Lumberaxe
+item.lumberaxeDawnstar.name=Dawnstar Lumberaxe
+item.lumberaxeDiamond.name=Diamond Lumberaxe
+item.lumberaxeEmerald.name=Emerald Lumberaxe
+item.lumberaxeEnder.name=Ender Lumberaxe
+item.lumberaxeFlint.name=Flint Lumberaxe
+item.lumberaxeGlacial.name=Glacial Lumberaxe
+item.lumberaxeGold.name=Golden Lumberaxe
+item.lumberaxeHoliday.name=Holiday Lumberaxe
+item.lumberaxeInvar.name=Invar Lumberaxe
+item.lumberaxeIron.name=Iron Lumberaxe
+item.lumberaxeLapis.name=Lapis Lumberaxe
 item.lumberaxeLead.name=Lead Lumberaxe
+item.lumberaxeObsidian.name=Obsidian Lumberaxe
+item.lumberaxePeridot.name=Peridot Lumberaxe
+item.lumberaxeQuartz.name=Quartz Lumberaxe
+item.lumberaxeRuby.name=Ruby Lumberaxe
+item.lumberaxeSapphire.name=Sapphire Lumberaxe
 item.lumberaxeSilver.name=Silver Lumberaxe
 item.lumberaxeSteel.name=Steel Lumberaxe
+item.lumberaxeStone.name=Stone Lumberaxe
 item.lumberaxeTin.name=Tin Lumberaxe
-item.lumberaxeQuartz.name=Quartz Lumberaxe
-item.lumberaxeObsidian.name=Obsidian Lumberaxe
-item.lumberaxeInvar.name=Invar Lumberaxe
+item.lumberaxeUnstable.name=Unstable Lumberaxe
+item.lumberaxeVampiric.name=Vampiric Lumberaxe
+item.lumberaxeWither.name=Wither Lumberaxe
+item.lumberaxeWood.name=Wooden Lumberaxe
diff --git a/src/main/resources/assets/lumberjack/textures/items/admin_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/admin_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/aether_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/aether_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/aluminium_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/aluminium_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/brass_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/brass_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/crystal_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/crystal_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/dawnstar_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/dawnstar_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/emerald_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/emerald_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/ender_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/ender_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/flint_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/flint_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/glacial_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/glacial_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/holiday_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/holiday_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/lapis_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/lapis_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/peridot_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/peridot_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/ruby_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/ruby_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/sapphire_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/sapphire_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/silver_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/silver_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/steel_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/steel_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/tin_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/tin_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/unstable_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/unstable_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/vampiric_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/vampiric_lumberaxe.png
diff --git a/src/main/resources/assets/lumberjack/textures/items/wither_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/wither_lumberaxe.png