Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct

resources/assets/tinker/lang/de_DE.lang

@@ -240,6 +240,11 @@ item.tconstruct.ArmorPattern.chestplate.name=Brustpanzergussform
 item.tconstruct.ArmorPattern.leggings.name=Beinschutzgussform
 item.tconstruct.ArmorPattern.boots.name=Stiefelgussform
 
+item.tconstruct.helmetWood.name=Holzhelm
+item.tconstruct.chestplateWood.name=Holzbrustpanzer
+item.tconstruct.leggingsWood.name=Holzbeinschutz
+item.tconstruct.bootsWood.name=Holzstiefel
+
 item.tconstruct.jerky.beef.name=Rindfleisch-Charqui
 item.tconstruct.jerky.pig.name=Schweinefleisch-Charqui
 item.tconstruct.jerky.chicken.name=Hühnchen-Charqui

resources/assets/tinker/lang/it_IT.lang

@@ -235,6 +235,11 @@ item.tconstruct.Materials.BronzeNugget.name=Pepita di Bronzo
 item.tconstruct.Materials.AlumiteNugget.name=Pepita di Alumite
 item.tconstruct.Materials.SteelNugget.name=Pepita d'Acciaio
 
+item.tconstruct.helmetWood.name=Elmo di Legno
+item.tconstruct.chestplateWood.name=Corazza di Legno
+item.tconstruct.leggingsWood.name=Gambali di Legno
+item.tconstruct.bootsWood.name=Stivali di Legno
+
 item.tconstruct.ArmorPattern.helmet.name=Stampo di Elmo
 item.tconstruct.ArmorPattern.chestplate.name=Stampo di Corazza
 item.tconstruct.ArmorPattern.leggings.name=Stampo di Gambali

resources/mcmod.info

@@ -70,5 +70,24 @@
     "dependencies": [
       "TConstruct"
     ]
+  },
+  {
+    "modid": "TConstruct|PeaceOfMind",
+    "name": "TConstruct|PeaceOfMind",
+    "description": "",
+    "version": "1.0",
+    "mcversion": "@MCVERSION@",
+    "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct",
+    "updateUrl": "",
+    "authors": [
+      "mDiyo", "fuj1n", "ProgWML6", "Sunstrike"
+    ],
+    "credits": "Slime Knights",
+    "logoFile": "",
+    "screenshots": [],
+    "parent":"TConstruct",
+    "dependencies": [
+      "TConstruct"
+    ]
   }
 ]

src/tconstruct/TConstruct.java

@@ -23,12 +23,13 @@
 import tconstruct.worldgen.*;
 import tconstruct.worldgen.village.*;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Logger;
 
 /** TConstruct, the tool mod.
  * Craft your tools with style, then modify until the original is gone!
- * @author: mDiyo
- * @dependencies: IC2 API, MFR API
+ * @author mDiyo
  */
 
 @Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.0d", dependencies = "required-after:Forge@[8.9,)")
@@ -74,6 +75,8 @@ public TConstruct()
             else
                 TConstruct.logger.info("[TConstruct] Preparing to take over the world");
         }
+
+        EnvironmentChecks.verifyEnvironmentSanity();
     }
 
     @EventHandler
@@ -108,9 +111,12 @@ public void preInit (FMLPreInitializationEvent event)
         GameRegistry.registerCraftingHandler(new TCraftingHandler());
         NetworkRegistry.instance().registerGuiHandler(instance, proxy);
 
-        VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades());
         if (PHConstruct.addToVillages)
         {
+			// adds to the villager spawner egg
+			VillagerRegistry.instance().registerVillagerId(78943);
+			// moved down, not needed if 'addToVillages' is false
+			VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades());
             VillagerRegistry.instance().registerVillageCreationHandler(new VillageToolStationHandler());
             VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler());
             try

src/tconstruct/blocks/SmelteryBlock.java

@@ -205,7 +205,7 @@ public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer
         }
         else
         {
-            world.markBlockForUpdate(x, y, z);
+            //world.markBlockForUpdate(x, y, z);
             player.openGui(getModInstance(), integer, world, x, y, z);
             return true;
         }

src/tconstruct/blocks/SoilBlock.java

@@ -46,6 +46,11 @@ public float getBlockHardness (World world, int x, int y, int z)
             return Block.dirt.blockHardness;
         return this.blockHardness;
     }
+
+    public boolean isOpaqueCube()
+    {
+        return false;
+    }
 
     /*public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z)
     {

src/tconstruct/blocks/component/SmelteryScan.java

@@ -28,6 +28,15 @@ public void checkValidStructure ()
         lavaTanks.clear();
         super.checkValidStructure();
     }
+
+    protected boolean checkAir (int x, int y, int z)
+    {
+        Block block = Block.blocksList[world.getBlockId(x, y, z)];
+        if (block == null || block.isAirBlock(world, x, y, z) || block == TContent.tankAir)
+            return true;
+
+        return false;
+    }
 
     @Override
     protected boolean checkServant (int x, int y, int z)

src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java

@@ -509,7 +509,7 @@ public void readFromNBT (NBTTagCompound tags)
     public void readNetworkNBT (NBTTagCompound tags)
     {
         direction = tags.getByte("Direction");
-        inventory = new ItemStack[tags.getInteger("InvSize")];
+        adjustInventory(tags.getInteger("InvSize"), false);
         super.readInventoryFromNBT(tags);
 
         structure.readNetworkNBT(tags);

src/tconstruct/blocks/logic/MultiServantLogic.java

@@ -120,7 +120,7 @@ public void notifyMasterOfChange ()
 
     public void readCustomNBT (NBTTagCompound tags)
     {
-        hasMaster = tags.getBoolean("HasMaster");
+        hasMaster = tags.getBoolean("TiedToMaster");
         if (hasMaster)
         {
             int xCenter = tags.getInteger("xCenter");
@@ -134,7 +134,7 @@ public void readCustomNBT (NBTTagCompound tags)
 
     public void writeCustomNBT (NBTTagCompound tags)
     {
-        tags.setBoolean("HasMaster", hasMaster);
+        tags.setBoolean("TiedToMaster", hasMaster);
         if (hasMaster)
         {
             tags.setInteger("xCenter", master.x);

src/tconstruct/blocks/logic/TankAirLogic.java

@@ -97,8 +97,8 @@ public boolean setPotentialMaster (IMasterLogic master, World world, int xMaster
     @Override
     public boolean verifyMaster (IMasterLogic logic, World world, int xMaster, int yMaster, int zMaster)
     {
-        if (master != null)
-            return false;
+        /*if (master != null) //Is this even needed?
+            return false;*/
 
         master = new CoordTuple(xMaster, yMaster, zMaster);
         return true;

src/tconstruct/blocks/slime/SlimeGel.java

@@ -73,4 +73,9 @@ public boolean canSustainLeaves (World world, int x, int y, int z)
     {
         return true;
     }
+
+    public boolean isOpaqueCube()
+    {
+        return false;
+    }
 }

src/tconstruct/blocks/slime/SlimeLeaves.java

@@ -82,6 +82,12 @@ public void getSubBlocks (int id, CreativeTabs tab, List list)
             list.add(new ItemStack(id, 1, iter));
         }
     }
+
+    @Override
+    public boolean isLeaves(World world, int x, int y, int z)
+    {
+        return true;
+    }
 
     /* Drops */
 

src/tconstruct/client/TClientEvents.java

@@ -1,5 +1,6 @@
 package tconstruct.client;
 
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.relauncher.*;
 import java.util.Random;
 import net.minecraft.block.Block;
@@ -79,7 +80,7 @@ public void postStitch (TextureStitchEvent.Post event)
     @ForgeSubscribe
     public void renderHealthbar (RenderGameOverlayEvent.Pre event)
     {
-        if (event.type == ElementType.HEALTH)
+        if (event.type == ElementType.HEALTH && !Loader.isModLoaded("tukmc_Vz")) // Loader check to avoid conflicting with a GUI mod (thanks Vazkii!)
         {
             event.setCanceled(true);
             updateCounter++;

src/tconstruct/client/block/TankAirRender.java

@@ -35,7 +35,9 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block
                 if (item.getItem() instanceof ItemBlock)
                 {
                     Block inv = Block.blocksList[item.itemID];
+                    renderer.setOverrideBlockTexture(inv.getIcon(1, item.getItemDamage()));
                     renderer.renderBlockByRenderType(inv, x, y, z);
+                    renderer.clearOverrideBlockTexture();
                 }
             }
             else if (logic.hasFluids())