manual merges of up to 9a578fc

resources/assets/tinker/lang/en_US.lang

@@ -31,6 +31,8 @@ CraftedSoil.ConsecratedSoil.name=Consecrated Soil
 tile.CastingChannel.name=Casting Channel
 tile.slime.channel.name=Slime Channel
 tile.slime.pad.name=Bounce Pad
+tile.blood.channel.name=Blood Channel
+
 
 MetalOre.NetherSlag.name=Netherack Slag
 MetalOre.Cobalt.name=Cobalt Ore
@@ -271,6 +273,8 @@ item.tconstruct.jerky.chicken.name=Chicken Jerky
 item.tconstruct.jerky.sheep.name=Mutton Jerky
 item.tconstruct.jerky.fish.name=Fish Jerky
 item.tconstruct.jerky.zombie.name=Monster Jerky
+item.tconstruct.jerky.blueslime.name=Gelatinous Slime Drop
+item.tconstruct.jerky.blood.name=Coagulated Blood Drop
 
 Smeltery.Controller.name=Smeltery Controller
 Smeltery.Drain.name=Smeltery Drain
@@ -483,6 +487,7 @@ LiquidMetal.Ender.name=Liquified Ender
 
 item.food.apple.diamond.name=Jeweled Apple
 item.tconstruct.strangefood.edibleslime.name=Gelatinous Slime
+item.tconstruct.strangefood.edibleblood.name=Coagulated Blood
 item.tconstruct.canister.empty.name=Empty Canister
 item.tconstruct.canister.miniheart.red.name=Miniature Red Heart
 item.tconstruct.canister.heart.name=Heart Canister
@@ -606,6 +611,10 @@ achievement.tconstruct.dualConvenience.desc=Kill a mob with a frying pan, and th
 knapsack.tooltip=A Knapsack to hold your things.
 strangefood1.tooltip=It smells terrible, but if you
 strangefood2.tooltip=have nothing else to eat...
+strangefood3.tooltip=It seems edible, but somehow
+strangefood4.tooltip=it's just not appealing.
+strangefood5.tooltip=Stretchy food!
+strangefood6.tooltip=One vampiric appetizer
 hambone1.tooltip=Hambone!
 hambone2.tooltip=Usable for Beacon bases
 metalblock.tooltip=Usable for Beacon bases

src/main/java/tconstruct/blocks/ConveyorBase.java

@@ -20,11 +20,14 @@
 
 public class ConveyorBase extends MantleBlock
 {
-    public ConveyorBase(int ID, Material material)
+    String texturename;
+
+    public ConveyorBase(int ID, Material material, String name)
     {
         super(ID, material);
         this.setCreativeTab(TConstructRegistry.blockTab);
         setBlockBounds(0f, 0f, 0f, 1f, 0.5f, 1f);
+        texturename = name;
     }
 
     public boolean isBlockReplaceable (World world, int x, int y, int z)
@@ -135,7 +138,7 @@ public int getRenderType ()
     @Override
     public void registerIcons (IconRegister iconRegister)
     {
-        String[] textureNames = new String[] { "greencurrent", "greencurrent_flow" };
+        String[] textureNames = new String[] { texturename, texturename + "_flow" };
         this.icons = new Icon[textureNames.length];
 
         for (int i = 0; i < this.icons.length; ++i)

src/main/java/tconstruct/blocks/LavaTankBlock.java

@@ -29,6 +29,7 @@
 public class LavaTankBlock extends BlockContainer
 {
     public Icon[] icons;
+    String texturePrefix = "";
 
     public LavaTankBlock(int id)
     {
@@ -40,10 +41,20 @@ public LavaTankBlock(int id)
         setStepSound(Block.soundGlassFootstep);
     }
 
+    public LavaTankBlock(int id, String prefix)
+    {
+        this(id);
+        texturePrefix = prefix;
+    }
+
     public String[] getTextureNames ()
     {
         String[] textureNames = { "lavatank_side", "lavatank_top", "searedgague_top", "searedgague_side", "searedgague_bottom", "searedwindow_top", "searedwindow_side", "searedwindow_bottom" };
 
+        if (!texturePrefix.equals(""))
+            for (int i = 0; i < textureNames.length; i++)
+                textureNames[i] = texturePrefix + "_" + textureNames[i];
+
         return textureNames;
     }
 

src/main/java/tconstruct/blocks/SearedBlock.java

@@ -33,6 +33,12 @@ public SearedBlock(int id)
         setStepSound(soundMetalFootstep);
     }
 
+    public SearedBlock(int id, String texture)
+    {
+        this(id);
+        this.texturePrefix = texture;
+    }
+
     @Override
     public TileEntity createTileEntity (World world, int metadata)
     {
@@ -181,11 +187,17 @@ public int getRenderType ()
         return SearedRender.searedModel;
     }
 
+    String texturePrefix = "";
+
     @Override
     public String[] getTextureNames ()
     {
         String[] textureNames = { "castingtable_top", "castingtable_side", "castingtable_bottom", "faucet", "blockcast_top", "blockcast_side", "blockcast_bottom" };
 
+        if (!texturePrefix.equals(""))
+            for (int i = 0; i < textureNames.length; i++)
+                textureNames[i] = texturePrefix + "_" + textureNames[i];
+
         return textureNames;
     }
 

src/main/java/tconstruct/blocks/SmelteryBlock.java

@@ -29,6 +29,7 @@
 public class SmelteryBlock extends InventoryBlock
 {
     Random rand;
+    String texturePrefix = "";
 
     public SmelteryBlock(int id)
     {
@@ -41,6 +42,12 @@ public SmelteryBlock(int id)
         this.setUnlocalizedName("tconstruct.Smeltery");
     }
 
+    public SmelteryBlock(int id, String prefix)
+    {
+        this(id);
+        texturePrefix = prefix;
+    }
+
     /* Rendering */
 
     @Override
@@ -55,6 +62,10 @@ public String[] getTextureNames ()
         String[] textureNames = { "smeltery_side", "smeltery_inactive", "smeltery_active", "drain_side", "drain_out", "drain_basin", "searedbrick", "searedstone", "searedcobble", "searedpaver",
                 "searedbrickcracked", "searedroad", "searedbrickfancy", "searedbricksquare", "searedcreeper" };
 
+        if (!texturePrefix.equals(""))
+            for (int i = 0; i < textureNames.length; i++)
+                textureNames[i] = texturePrefix + "_" + textureNames[i];
+
         return textureNames;
     }
 

src/main/java/tconstruct/blocks/SoilBlock.java

@@ -13,7 +13,7 @@
 
 public class SoilBlock extends TConstructBlock
 {
-    static String[] soilTypes = new String[] { "slimesand", "grout", "slimesandblue", "graveyardsoil", "consecratedsoil", "slimedirt_blue" };
+    static String[] soilTypes = new String[] { "slimesand", "grout", "slimesandblue", "graveyardsoil", "consecratedsoil", "slimedirt_blue", "nether_grout" };
 
     public SoilBlock(int id)
     {

src/main/java/tconstruct/blocks/logic/SmelteryLogic.java

@@ -865,7 +865,7 @@ public int recurseStructureDown (int x, int y, int z, int count)
                 Block block = Block.blocksList[blockID];
                 if (block != null && !block.isAirBlock(worldObj, xPos, y, zPos))
                 {
-                    if (blockID == TRepo.smeltery.blockID)
+                    if (validBlockID(blockID))
                         return validateBottom(x, y, z, count);
                     else
                         return count;
@@ -900,7 +900,7 @@ public int validateBottom (int x, int y, int z, int count)
         {
             for (int zPos = z - 1; zPos <= z + 1; zPos++)
             {
-                if (worldObj.getBlockId(xPos, y, zPos) == TRepo.smeltery.blockID && (worldObj.getBlockMetadata(xPos, y, zPos) >= 2))
+                if (validBlockID(worldObj.getBlockId(xPos, y, zPos)) && (worldObj.getBlockMetadata(xPos, y, zPos) >= 2))
                     bottomBricks++;
             }
         }
@@ -920,7 +920,7 @@ int checkBricks (int x, int y, int z)
     {
         int tempBricks = 0;
         int blockID = worldObj.getBlockId(x, y, z);
-        if (blockID == TRepo.smeltery.blockID || blockID == TRepo.lavaTank.blockID)
+        if (validBlockID(blockID) || validTankID(blockID))
         {
             TileEntity te = worldObj.getBlockTileEntity(x, y, z);
             if (te == this)
@@ -949,6 +949,16 @@ else if (servant.setMaster(this.xCoord, this.yCoord, this.zCoord))
         return tempBricks;
     }
 
+    boolean validBlockID (int blockID)
+    {
+        return blockID == TRepo.smeltery.blockID || blockID == TRepo.smelteryNether.blockID;
+    }
+
+    boolean validTankID (int blockID)
+    {
+        return blockID == TRepo.lavaTank.blockID || blockID == TRepo.lavaTankNether.blockID;
+    }
+
     public int getCapacity ()
     {
         return maxLiquid;
@@ -1155,7 +1165,8 @@ public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
 
     // IDebuggable
     @Override
-    public DebugData getDebugInfo(EntityPlayer player) {
+    public DebugData getDebugInfo (EntityPlayer player)
+    {
         List<String> str = new ArrayList<String>(Arrays.asList(super.getDebugInfo(player).strings));
         str.add("layers: " + layers + ", liquid: " + currentLiquid + "/" + maxLiquid + ", direction: " + direction);
         str.add("inUse: " + inUse + ", tick: " + tick);

src/main/java/tconstruct/blocks/slime/SlimeGrass.java

@@ -138,8 +138,8 @@ else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9)
     public int idDropped (int metadata, Random random, int fortune)
     {
         if (metadata == 1)
-            return TRepo.craftedSoil.blockID;
-        else
             return Block.dirt.blockID;
+        else
+            return TRepo.craftedSoil.blockID;
     }
 }

src/main/java/tconstruct/common/TContent.java

@@ -116,6 +116,7 @@ void registerBlocks ()
 
         //Smeltery
         TRepo.smeltery = new SmelteryBlock(PHConstruct.smeltery).setUnlocalizedName("Smeltery");
+        TRepo.smelteryNether = new SmelteryBlock(PHConstruct.smelteryNether, "nether").setUnlocalizedName("Smeltery");
         TRepo.lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setUnlocalizedName("LavaTank");
         TRepo.lavaTank.setStepSound(Block.soundGlassFootstep);
 
@@ -375,8 +376,10 @@ void registerBlocks ()
         TRepo.slimeTallGrass = new SlimeTallGrass(PHConstruct.slimeTallGrass).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("slime.grass.tall");
         TRepo.slimeLeaves = (SlimeLeaves) new SlimeLeaves(PHConstruct.slimeLeaves).setStepSound(TRepo.slimeStep).setLightOpacity(0).setUnlocalizedName("slime.leaves");
         TRepo.slimeSapling = (SlimeSapling) new SlimeSapling(PHConstruct.slimeSapling).setStepSound(TRepo.slimeStep).setUnlocalizedName("slime.sapling");
-        TRepo.slimeChannel = new ConveyorBase(PHConstruct.slimeChannel, Material.water).setStepSound(TRepo.slimeStep).setUnlocalizedName("slime.channel");
-        TRepo.slimePad = new SlimePad(PHConstruct.slimePad, Material.cloth).setStepSound(TRepo.slimeStep).setUnlocalizedName("slime.pad");
+        TRepo.slimeChannel = new ConveyorBase(PHConstruct.slimeChannel, Material.water, "greencurrent").setHardness(0.3f).setStepSound(TRepo.slimeStep).setUnlocalizedName("slime.channel");
+        TRepo.bloodChannel = new ConveyorBase(PHConstruct.bloodChannel, Material.water, "liquid_cow").setHardness(0.3f).setStepSound(TRepo.slimeStep).setUnlocalizedName("blood.channel");
+        TRepo.slimePad = new SlimePad(PHConstruct.slimePad, Material.cloth).setStepSound(TRepo.slimeStep).setHardness(0.3f).setUnlocalizedName("slime.pad");
+
 
         //Decoration
         TRepo.stoneTorch = new StoneTorch(PHConstruct.stoneTorch).setUnlocalizedName("decoration.stonetorch");