Fixed blood drop behavior, misc other fixes

SlimeKnights · Jan 2, 2014 · 5e281b8 · 5e281b8
1 parent a5aaa6f
commit 5e281b8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java
@@ -50,7 +50,7 @@
 public class TContent implements IFuelHandler
 {
     // Supresses console spam when iguana's tweaks remove stuff
-    public static boolean supressMissingToolLogs = false;
+    public static boolean supressMissingToolLogs = PHConstruct.forceToolLogsOff;
 
     //Patterns and other materials
     public static Item blankPattern;

diff --git a/src/tconstruct/items/Jerky.java b/src/tconstruct/items/Jerky.java
@@ -19,7 +19,7 @@ public class Jerky extends SpecialFood
     public static String[] textureNames = new String[] { "beef", "chicken", "pork", "mutton", "fish", "monster", "blueslime", "blood" };
     public static String[] itemNames = new String[] { "jerky.beef", "jerky.chicken", "jerky.pig", "jerky.sheep", "jerky.fish", "jerky.zombie", "jerky.blueslime", "jerky.blood" };
     public static int[] hunger = new int[] { 8, 6, 8, 6, 5, 4, 6, 4 };
-    public static float[] saturation = new float[] { 1.0f, 0.8f, 1.0f, 0.8f, 0.8f, 0.4f, 1.0f, 0.25f };
+    public static float[] saturation = new float[] { 1.0f, 0.8f, 1.0f, 0.8f, 0.8f, 0.4f, 1.0f, 0.4f };
     public static int[] overhaulHunger = new int[] { 1, 1, 1, 1, 1, 1, 1, 1 };
 
     public Jerky(int id, boolean hungerOverhaul)
@@ -51,11 +51,11 @@ protected void onFoodEaten (ItemStack stack, World world, EntityPlayer player)
     {
         if (stack.getItemDamage() == 7)
         {
-            int duration = 20 * 30;
-            PotionEffect potion = player.getActivePotionEffect(Potion.regeneration);
+            int duration = 0;
+            PotionEffect potion = player.getActivePotionEffect(Potion.field_76434_w);
             if (potion != null)
                 duration = potion.duration;
-            player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, duration + 20 * 30, 0));
+            player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, duration + 20 * 60, 1));
         }
     }
 

diff --git a/src/tconstruct/items/blocks/LavaTankItemBlock.java b/src/tconstruct/items/blocks/LavaTankItemBlock.java
@@ -38,7 +38,7 @@ public void addInformation (ItemStack stack, EntityPlayer player, List list, boo
             NBTTagCompound liquidTag = stack.getTagCompound().getCompoundTag("Fluid");
             if (liquidTag != null)
             {
-                list.add(StatCollector.translateToLocal("searedtank1.tooltip") + StatCollector.translateToLocal(liquidTag.getString("FluidName")));
+                list.add(StatCollector.translateToLocal("searedtank1.tooltip") + " " + StatCollector.translateToLocal(liquidTag.getString("FluidName")));
                 list.add(liquidTag.getInteger("Amount") + " mB");
             }
         }

diff --git a/src/tconstruct/library/blocks/IDrawbridgeLogicBase.java b/src/tconstruct/library/blocks/IDrawbridgeLogicBase.java
@@ -2,7 +2,6 @@
 
 public interface IDrawbridgeLogicBase
 {
-
     public boolean hasExtended ();
-
+    public byte getPlacementDirection ();
 }
diff --git a/src/tconstruct/library/tools/ToolCore.java b/src/tconstruct/library/tools/ToolCore.java
@@ -569,7 +569,7 @@ public void buildTool (int id, String name, List list)
             boolean supress = false;
             try
             {
-                clazz = Class.forName(tconstruct.common.TContent.class.getName());
+                clazz = Class.forName("tconstruct.common.TContent"); //TODO: Make sure this is still working in 1.7.
                 fld = clazz.getField("supressMissingToolLogs");
                 supress = fld.getBoolean(fld);
             }

diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java
@@ -42,6 +42,7 @@ public static void initProps (File location)
          */
 
 		superfunWorld = config.get("Superfun", "All the world is Superfun", false).getBoolean(false);
+		forceToolLogsOff = config.get("Logging", "Disable tool build messages", false).getBoolean(false);
 
         keepHunger = config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true);
         keepLevels = config.get("Difficulty Changes", "Keep levels on death", true).getBoolean(true);
@@ -165,19 +166,6 @@ public static void initProps (File location)
         slimeLeaves = config.getBlock("Slime Grass Leaves", 3240).getInt(3240);
         slimeSapling = config.getBlock("Slime Tree Sapling", 3241).getInt(3241);
 
-        meatBlock = config.getBlock("Meat Block", 3242).getInt(3242);
-        woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243);
-        woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244);
-        woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245);
-        castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249);
-
-        slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235);
-        slimeGel = config.getBlock("Congealed Slime", 3237).getInt(3237);
-        slimeGrass = config.getBlock("Slime Grass", 3238).getInt(3238);
-        slimeTallGrass = config.getBlock("Slime Tall Grass", 3239).getInt(3239);
-        slimeLeaves = config.getBlock("Slime Grass Leaves", 3240).getInt(3240);
-        slimeSapling = config.getBlock("Slime Tree Sapling", 3241).getInt(3241);
-
         meatBlock = config.getBlock("Meat Block", 3242).getInt(3242);
         woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243);
         woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244);
@@ -726,6 +714,7 @@ public static void initProps (File location)
 
     public static boolean gregtech;
     public static boolean lavaFortuneInteraction;
+    public static boolean forceToolLogsOff;
 
     public static int islandRarity;