Add Jerky, fix Drying Rack

SlimeKnights · Sep 9, 2013 · 83c9127 · 83c9127
1 parent 71ba72a
commit 83c9127
Show file tree

Hide file tree

Showing 25 changed files with 96 additions and 422 deletions.
diff --git a/resources/assets/tinker/lang/en_US.xml b/resources/assets/tinker/lang/en_US.xml
@@ -185,6 +185,13 @@
   <entry key="item.tconstruct.Materials.AlumiteNugget.name">Alumite Nugget</entry>
   <entry key="item.tconstruct.Materials.SteelNugget.name">Steel Nugget</entry>
 
+  <entry key="item.tconstruct.jerky.beef.name">Beef Jerky</entry>
+  <entry key="item.tconstruct.jerky.pig.name">Bacon Jerky</entry>
+  <entry key="item.tconstruct.jerky.chicken.name">Chicken Jerky</entry>
+  <entry key="item.tconstruct.jerky.sheep.name">Mutton Jerky</entry>
+  <entry key="item.tconstruct.jerky.fish.name">Fish Jerky</entry>
+  <entry key="item.tconstruct.jerky.zombie.name">Monster Jerky</entry>
+
   <entry key="item.tconstruct.crystal.essence.name">Essence Crystal</entry>
 
   <entry key="Smeltery.Controller.name">Smeltery Controller</entry>

diff --git a/...s/tinker/textures/items/apple_diamond.png → ...ker/textures/items/food/apple_diamond.png b/...s/tinker/textures/items/apple_diamond.png → ...ker/textures/items/food/apple_diamond.png
diff --git a/...ets/tinker/textures/items/edibleslime.png → ...inker/textures/items/food/edibleslime.png b/...ets/tinker/textures/items/edibleslime.png → ...inker/textures/items/food/edibleslime.png
diff --git a/resources/assets/tinker/textures/items/food/jerky_beef.png b/resources/assets/tinker/textures/items/food/jerky_beef.png
diff --git a/resources/assets/tinker/textures/items/food/jerky_chicken.png b/resources/assets/tinker/textures/items/food/jerky_chicken.png
diff --git a/resources/assets/tinker/textures/items/food/jerky_fish.png b/resources/assets/tinker/textures/items/food/jerky_fish.png
diff --git a/resources/assets/tinker/textures/items/food/jerky_monster.png b/resources/assets/tinker/textures/items/food/jerky_monster.png
diff --git a/resources/assets/tinker/textures/items/food/jerky_mutton.png b/resources/assets/tinker/textures/items/food/jerky_mutton.png
diff --git a/resources/assets/tinker/textures/items/food/jerky_pork.png b/resources/assets/tinker/textures/items/food/jerky_pork.png
diff --git a/resources/assets/tinker/textures/items/food/mutton_cooked.png b/resources/assets/tinker/textures/items/food/mutton_cooked.png
diff --git a/resources/assets/tinker/textures/items/food/mutton_raw.png b/resources/assets/tinker/textures/items/food/mutton_raw.png
diff --git a/src/tconstruct/TConstruct.java b/src/tconstruct/TConstruct.java
@@ -40,7 +40,7 @@
  * @dependencies: IC2 API, MFR API
  */
 
-@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.5d1", dependencies = "required-after:Forge@[7.7.1.687,)")
+@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.5d4", dependencies = "required-after:Forge@[7.7.1.687,)")
 @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class)
 public class TConstruct
 {

diff --git a/src/tconstruct/blocks/DryingRack.java b/src/tconstruct/blocks/DryingRack.java
@@ -27,25 +27,15 @@ public class DryingRack extends InventoryBlock
 
     public DryingRack(int id)
     {
-        super(id, Material.rock);
+        super(id, Material.wood);
         this.setCreativeTab(TConstructRegistry.blockTab);
-        setHardness(12);
+        setHardness(2.0f);
         setStepSound(soundMetalFootstep);
     }
 
     @Override
     public TileEntity createTileEntity (World world, int metadata)
     {
-        /*switch (metadata)
-        {
-        case 0:
-        case 1:
-            return new FaucetLogic();
-        case 2:
-            return new CastingBasinLogic();
-        default:
-            return null;
-        }*/
         return new DryingRackLogic();
     }
 

diff --git a/src/tconstruct/client/TProxyClient.java b/src/tconstruct/client/TProxyClient.java
@@ -356,11 +356,11 @@ public void registerRenderer ()
         RenderingRegistry.registerEntityRenderingHandler(SlimeClone.class, new SlimeCloneRender(new CloneHeadModel(0), new CloneHeadModel(1f), 0.25F));
 
         RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender());
-        RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRenderCustom());
         RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender());
         RenderingRegistry.registerEntityRenderingHandler(MiniGardy.class, new MiniGardyRender());
         RenderingRegistry.registerEntityRenderingHandler(Automaton.class, new CrystalGuardianRender());
         RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Item.potion, 16384));
+        RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRenderCustom());
         RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRenderCustom());
         // RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class,
         // new PlayerArmorRender()); // <-- Works, woo!
@@ -369,29 +369,8 @@ public void registerRenderer ()
         VillagerRegistry.instance().registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png"));
 
         ToolCoreRenderer renderer = new ToolCoreRenderer();
-        /*MinecraftForgeClient.registerItemRenderer(TContent.arrow.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.battleaxe.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.battlesign.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.broadsword.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.chisel.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.cleaver.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.cutlass.itemID, renderer);*/
-        MinecraftForgeClient.registerItemRenderer(TContent.dagger.itemID, renderer);
-        /*MinecraftForgeClient.registerItemRenderer(TContent.excavator.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.cutlass.itemID, renderer);
+        MinecraftForgeClient.registerItemRenderer(TContent.arrow.itemID, renderer);
         MinecraftForgeClient.registerItemRenderer(TContent.dagger.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.excavator.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.frypan.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.hammer.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.hatchet.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.longsword.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.lumberaxe.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.mattock.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.pickaxe.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.rapier.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.scythe.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.shortbow.itemID, renderer);
-        MinecraftForgeClient.registerItemRenderer(TContent.shovel.itemID, renderer);*/
 
         addRenderMappings();
         addToolButtons();