diff --git a/assets/tinker/lang/en_US.xml b/assets/tinker/lang/en_US.xml
index 8992373d..10c456be 100644
--- a/assets/tinker/lang/en_US.xml
+++ b/assets/tinker/lang/en_US.xml
@@ -186,6 +186,7 @@
Fancy Seared Bricks
Chiseled Seared Bricks
Chiseled Seared Bricks
+ Casting Channel
Seared Tank
Seared Glass
@@ -411,6 +412,7 @@
Blue Slime
King Slime
Gardeslime
+ Gardeslime
Armor Gui
Reload Capes
diff --git a/mods/tinker/textures/blocks/craftingstation_slab_side.png b/mods/tinker/textures/blocks/craftingstation_slab_side.png
new file mode 100644
index 00000000..a7b05200
Binary files /dev/null and b/mods/tinker/textures/blocks/craftingstation_slab_side.png differ
diff --git a/mods/tinker/textures/blocks/ham_bone.png b/mods/tinker/textures/blocks/ham_bone.png
new file mode 100644
index 00000000..6a27e1d5
Binary files /dev/null and b/mods/tinker/textures/blocks/ham_bone.png differ
diff --git a/mods/tinker/textures/blocks/ham_skin.png b/mods/tinker/textures/blocks/ham_skin.png
new file mode 100644
index 00000000..df722ae2
Binary files /dev/null and b/mods/tinker/textures/blocks/ham_skin.png differ
diff --git a/mods/tinker/textures/blocks/partbuilder_slab_side.png b/mods/tinker/textures/blocks/partbuilder_slab_side.png
new file mode 100644
index 00000000..e3f0bda7
Binary files /dev/null and b/mods/tinker/textures/blocks/partbuilder_slab_side.png differ
diff --git a/mods/tinker/textures/blocks/patternchest_slab_side.png b/mods/tinker/textures/blocks/patternchest_slab_side.png
new file mode 100644
index 00000000..658ef27f
Binary files /dev/null and b/mods/tinker/textures/blocks/patternchest_slab_side.png differ
diff --git a/mods/tinker/textures/blocks/stenciltable_slab_side.png b/mods/tinker/textures/blocks/stenciltable_slab_side.png
new file mode 100644
index 00000000..5342f060
Binary files /dev/null and b/mods/tinker/textures/blocks/stenciltable_slab_side.png differ
diff --git a/mods/tinker/textures/blocks/toolforge_slab_side.png b/mods/tinker/textures/blocks/toolforge_slab_side.png
new file mode 100644
index 00000000..106a5942
Binary files /dev/null and b/mods/tinker/textures/blocks/toolforge_slab_side.png differ
diff --git a/mods/tinker/textures/blocks/toolstation_slab_side.png b/mods/tinker/textures/blocks/toolstation_slab_side.png
new file mode 100644
index 00000000..35b32924
Binary files /dev/null and b/mods/tinker/textures/blocks/toolstation_slab_side.png differ
diff --git a/mods/tinker/textures/mob/googirl_blue.png b/mods/tinker/textures/mob/googirl_blue.png
new file mode 100644
index 00000000..8e431911
Binary files /dev/null and b/mods/tinker/textures/mob/googirl_blue.png differ
diff --git a/tconstruct/blocks/Aggregator.java b/tconstruct/blocks/Aggregator.java
index bf9616e1..3f069be5 100644
--- a/tconstruct/blocks/Aggregator.java
+++ b/tconstruct/blocks/Aggregator.java
@@ -113,7 +113,7 @@ public class Aggregator extends InventoryBlock
@Override
public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer)
{
- return TProxyCommon.glowstoneAggregatorGui;
+ return TProxyCommon.glowstoneAggregatorID;
}
@Override
diff --git a/tconstruct/blocks/CastingChannelBlock.java b/tconstruct/blocks/CastingChannelBlock.java
new file mode 100644
index 00000000..2c58eb36
--- /dev/null
+++ b/tconstruct/blocks/CastingChannelBlock.java
@@ -0,0 +1,107 @@
+package tconstruct.blocks;
+
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.ForgeDirection;
+import tconstruct.blocks.logic.CastingChannelLogic;
+import tconstruct.client.block.BlockRenderCastingChannel;
+import tconstruct.library.TConstructRegistry;
+
+/**
+ * @author BluSunrize
+ */
+
+public class CastingChannelBlock extends BlockContainer
+{
+
+ public CastingChannelBlock(int par1)
+ {
+ super(par1, Material.rock);
+ this.setHardness(1F);
+ this.setResistance(10);
+ this.setStepSound(soundStoneFootstep);
+ setCreativeTab(TConstructRegistry.blockTab);
+ }
+
+ @Override
+ public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
+ {
+ if (!world.isRemote)
+ {
+ CastingChannelLogic tile = (CastingChannelLogic) world.getBlockTileEntity(x, y, z);
+ if (player.isSneaking())
+ {
+ }
+ else
+ {
+ int amount = 0;
+ if (tile.getFluid() != null)
+ amount = tile.getLiquidAmount();
+ player.addChatMessage("LiquidAmount: " + amount);
+ tile.setActive(true);
+ }
+ }
+
+ ItemStack stack = player.getCurrentEquippedItem();
+ if (stack != null && stack.itemID == this.blockID)
+ return false;
+ return true;
+ }
+
+ @Override
+ public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z)
+ {
+ CastingChannelLogic tile = (CastingChannelLogic) world.getBlockTileEntity(x, y, z);
+ float minX = 0.3125F;
+ float maxX = 0.6875F;
+ float minZ = 0.3125F;
+ float maxZ = 0.6875F;
+ if (tile.hasTankConnected(ForgeDirection.NORTH))
+ minZ = 0F;
+ if (tile.hasTankConnected(ForgeDirection.SOUTH))
+ maxZ = 1F;
+ if (tile.hasTankConnected(ForgeDirection.WEST))
+ minX = 0F;
+ if (tile.hasTankConnected(ForgeDirection.EAST))
+ maxX = 1F;
+
+ this.setBlockBounds(minX, 0.375F, minZ, maxX, 0.625F, maxZ);
+ }
+
+ @Override
+ public boolean renderAsNormalBlock ()
+ {
+ return false;
+ }
+
+ @Override
+ public boolean isOpaqueCube ()
+ {
+ return false;
+ }
+
+ @Override
+ public int getRenderType ()
+ {
+ return BlockRenderCastingChannel.renderID;
+ }
+
+ @Override
+ public void registerIcons (IconRegister iconRegister)
+ {
+ this.blockIcon = iconRegister.registerIcon("tinker:searedstone");
+ }
+
+ @Override
+ public TileEntity createNewTileEntity (World var1)
+ {
+ return new CastingChannelLogic();
+ }
+
+}
\ No newline at end of file
diff --git a/tconstruct/blocks/EssenceExtractor.java b/tconstruct/blocks/EssenceExtractor.java
index a277bbf9..58e9f5a5 100644
--- a/tconstruct/blocks/EssenceExtractor.java
+++ b/tconstruct/blocks/EssenceExtractor.java
@@ -6,7 +6,6 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
-import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@@ -18,6 +17,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.FakePlayer;
import tconstruct.blocks.logic.EssenceExtractorLogic;
import tconstruct.common.TContent;
+import tconstruct.library.TConstructRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -33,7 +33,7 @@ public class EssenceExtractor extends BlockContainer
super(par1, Material.rock);
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.75F, 1.0F);
this.setLightOpacity(0);
- this.setCreativeTab(CreativeTabs.tabDecorations);
+ this.setCreativeTab(TConstructRegistry.blockTab);
}
/**
diff --git a/tconstruct/blocks/RedstoneMachine.java b/tconstruct/blocks/RedstoneMachine.java
index 4e9054f4..f81cb157 100644
--- a/tconstruct/blocks/RedstoneMachine.java
+++ b/tconstruct/blocks/RedstoneMachine.java
@@ -98,7 +98,7 @@ public class RedstoneMachine extends InventoryBlock
switch (meta)
{
case 0:
- return TConstruct.proxy.drawbridgeGui;
+ return TConstruct.proxy.drawbridgeID;
}
return null;
}
diff --git a/tconstruct/blocks/SlabBase.java b/tconstruct/blocks/SlabBase.java
index 12aa908a..577a6058 100644
--- a/tconstruct/blocks/SlabBase.java
+++ b/tconstruct/blocks/SlabBase.java
@@ -99,7 +99,7 @@ public class SlabBase extends Block
list.add(new ItemStack(id, 1, iter));
}
}
-
+
public int damageDropped (int meta)
{
return meta % 8;
diff --git a/tconstruct/blocks/ToolStationBlock.java b/tconstruct/blocks/ToolStationBlock.java
index 72d68210..088a0656 100644
--- a/tconstruct/blocks/ToolStationBlock.java
+++ b/tconstruct/blocks/ToolStationBlock.java
@@ -208,5 +208,6 @@ public class ToolStationBlock extends InventoryBlock
logic.setInventorySlotContents(13, new ItemStack(TContent.woodPattern, 1, 22));
}
}
+ super.onBlockPlacedBy(world, x, y, z, par5EntityLiving, par6ItemStack);
}
}
diff --git a/tconstruct/blocks/logic/CastingChannelLogic.java b/tconstruct/blocks/logic/CastingChannelLogic.java
new file mode 100644
index 00000000..cc314aef
--- /dev/null
+++ b/tconstruct/blocks/logic/CastingChannelLogic.java
@@ -0,0 +1,667 @@
+package tconstruct.blocks.logic;
+
+import java.util.HashMap;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.INetworkManager;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.Packet132TileEntityData;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidEvent;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.IFluidTank;
+import tconstruct.library.util.IActiveLogic;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/**
+ * @author BluSunrize
+ */
+
+public class CastingChannelLogic extends TileEntity implements IFluidTank, IFluidHandler, IActiveLogic
+{
+ public final static int fillMax = 288;
+ public final static int outputMax = 48;
+ public FluidStack liquid;
+ public ForgeDirection lastProvider;
+ private int ticks = 0;
+ private int ticksLPReset = 0;
+ public int recentlyFilledDelay;
+ boolean pullingLiquids;
+
+ public CastingChannelLogic()
+ {
+ recentlyFilledDelay = 0;
+ lastProvider = ForgeDirection.UNKNOWN;
+ }
+
+ @Override
+ public void updateEntity ()
+ {
+ if (this.worldObj.isRemote)
+ return;
+ ticks++;
+ ticksLPReset++;
+ if (!worldObj.isRemote)
+ {
+ if (this.pullingLiquids)
+ pullLiquids();
+ }
+ this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
+ if (ticks == 20)
+ {
+ if (recentlyFilledDelay != 0)
+ recentlyFilledDelay--;
+ if (recentlyFilledDelay == 0)
+ moveLiquidToTanks();
+ ticks = 0;
+ }
+ if (ticksLPReset == 60)
+ {
+ this.lastProvider = ForgeDirection.UNKNOWN;
+ ticksLPReset = 0;
+ }
+ }
+
+ void pullLiquids ()
+ {
+ if (pullLiquid(xCoord + 1, yCoord, zCoord, ForgeDirection.EAST) || pullLiquid(xCoord - 1, yCoord, zCoord, ForgeDirection.WEST) || pullLiquid(xCoord, yCoord, zCoord + 1, ForgeDirection.NORTH)
+ || pullLiquid(xCoord, yCoord, zCoord - 1, ForgeDirection.SOUTH))
+ {
+
+ }
+ else
+ {
+ pullingLiquids = false;
+ }
+ }
+
+ boolean pullLiquid (int x, int y, int z, ForgeDirection direction)
+ {
+ TileEntity tank = worldObj.getBlockTileEntity(x, y, z);
+ if (tank instanceof IFluidHandler && !(tank instanceof CastingChannelLogic))
+ {
+ FluidStack templiquid = ((IFluidHandler) tank).drain(direction, 3, false);
+ if (templiquid != null)
+ {
+ if (this.liquid == null)
+ {
+ if (templiquid.amount > fillMax)
+ templiquid.amount = fillMax;
+ this.liquid = ((IFluidHandler) tank).drain(direction, templiquid.amount, true);
+ return true;
+ }
+ else if (this.liquid.isFluidEqual(templiquid))
+ {
+ if (templiquid.amount + this.liquid.amount > fillMax)
+ templiquid.amount = fillMax - this.liquid.amount;
+ liquid.amount += ((IFluidHandler) tank).drain(direction, templiquid.amount, true).amount;
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ private void moveLiquidToChannels ()
+ {
+ if (this.liquid == null || this.liquid.amount <= 0)
+ {
+ return;
+ }
+ TileEntity tankXplus = null;
+ TileEntity tankXminus = null;
+ TileEntity tankZplus = null;
+ TileEntity tankZminus = null;
+ TileEntity tankYminus = null;
+ HashMap tankMap = this.getOutputs();
+ if (tankMap.size() <= 0)
+ {
+ //System.out.println("Nope, no connections to go to");
+ return;
+ }
+ boolean yFilled = false;
+ if (tankMap.containsKey("yMinus"))
+ {
+ tankYminus = (TileEntity) tankMap.get("yMinus");
+ FluidStack liquidToPush = this.drain(24, false);
+ if ((liquidToPush != null) && (liquidToPush.amount > 0))
+ {
+ int filled = ((IFluidHandler) tankYminus).fill(ForgeDirection.UP, liquidToPush, true);
+ if (filled > 0)
+ {
+ yFilled = true;
+ this.drain(filled, true);
+ }
+ }
+ }
+
+ if (!yFilled)
+ {
+ int divisionSurplus = (this.liquid.amount % tankMap.size());
+ int amountXp = (this.outputMax / tankMap.size());
+ int amountXm = (this.outputMax / tankMap.size());
+ int amountZp = (this.outputMax / tankMap.size());
+ int amountZm = (this.outputMax / tankMap.size());
+ if (divisionSurplus > 0)
+ amountXp++;
+ if (divisionSurplus > 1)
+ amountXm++;
+ if (divisionSurplus > 2)
+ amountZp++;
+
+ if (tankMap.containsKey("xPlus"))
+ {
+ tankXplus = (TileEntity) tankMap.get("xPlus");
+ FluidStack liquidToPush = this.drain(amountXp, false);
+ if ((liquidToPush != null) && (liquidToPush.amount > 0))
+ {
+ int filled = ((IFluidHandler) tankXplus).fill(ForgeDirection.WEST, liquidToPush, true);
+ this.drain(filled, true);
+ }
+ }
+ if (tankMap.containsKey("xMinus"))
+ {
+ tankXminus = (TileEntity) tankMap.get("xMinus");
+ FluidStack liquidToPush = this.drain(amountXm, false);
+ if ((liquidToPush != null) && (liquidToPush.amount > 0))
+ {
+ int filled = ((IFluidHandler) tankXminus).fill(ForgeDirection.EAST, liquidToPush, true);
+ this.drain(filled, true);
+ }
+ }
+ if (tankMap.containsKey("zPlus"))
+ {
+ tankZplus = (TileEntity) tankMap.get("zPlus");
+ FluidStack liquidToPush = this.drain(amountZp, false);
+ if ((liquidToPush != null) && (liquidToPush.amount > 0))
+ {
+ int filled = ((IFluidHandler) tankZplus).fill(ForgeDirection.NORTH, liquidToPush, true);
+ this.drain(filled, true);
+ }
+ }
+ if (tankMap.containsKey("zMinus"))
+ {
+ tankZminus = (TileEntity) tankMap.get("zMinus");
+ FluidStack liquidToPush = this.drain(amountZm, false);
+ if ((liquidToPush != null) && (liquidToPush.amount > 0))
+ {
+ int filled = ((IFluidHandler) tankZminus).fill(ForgeDirection.SOUTH, liquidToPush, true);
+ this.drain(filled, true);
+ }
+ }
+ }
+ }
+
+ private void moveLiquidToTanks ()
+ {
+ if (this.liquid == null || this.liquid.amount <= 0)
+ {
+ return;
+ }
+ TileEntity tankXplus = null;
+ TileEntity tankXminus = null;
+ TileEntity tankZplus = null;
+ TileEntity tankZminus = null;
+ TileEntity tankYminus = null;
+ HashMap tankMap = this.getOutputs();
+ if (tankMap.size() <= 0)
+ {
+ //System.out.println("Nope, no connections to go to");
+ return;
+ }
+ boolean yFilled = false;
+ if (tankMap.containsKey("yMinus"))
+ {
+ tankYminus = (TileEntity) tankMap.get("yMinus");
+ FluidStack liquidToPush = this.drain(24, false);
+ if ((liquidToPush != null) && (liquidToPush.amount > 0))
+ {
+ int filled = ((IFluidHandler) tankYminus).fill(ForgeDirection.UP, liquidToPush, true);
+ if (filled > 0)
+ {
+ yFilled = true;
+ this.drain(filled, true);
+ }
+ }
+ }
+
+ if (!yFilled)
+ {
+ int divisionSurplus = (this.liquid.amount % tankMap.size());
+ int amountXp = (this.outputMax / tankMap.size());
+ int amountXm = (this.outputMax / tankMap.size());
+ int amountZp = (this.outputMax / tankMap.size());
+ int amountZm = (this.outputMax / tankMap.size());
+ if (divisionSurplus > 0)
+ amountXp++;
+ if (divisionSurplus > 1)
+ amountXm++;
+ if (divisionSurplus > 2)
+ amountZp++;
+
+ if (tankMap.containsKey("xPlus"))
+ {
+ tankXplus = (TileEntity) tankMap.get("xPlus");
+ FluidStack liquidToPush = this.drain(amountXp, false);
+ if ((liquidToPush != null) && (liquidToPush.amount > 0))
+ {
+ int filled = ((IFluidHandler) tankXplus).fill(ForgeDirection.WEST, liquidToPush, true);
+ this.drain(filled, true);
+ }
+ }
+ if (tankMap.containsKey("xMinus"))
+ {
+ tankXminus = (TileEntity) tankMap.get("xMinus");
+ FluidStack liquidToPush = this.drain(amountXm, false);
+ if ((liquidToPush != null) && (liquidToPush.amount > 0))
+ {
+ int filled = ((IFluidHandler) tankXminus).fill(ForgeDirection.EAST, liquidToPush, true);
+ this.drain(filled, true);
+ }
+ }
+ if (tankMap.containsKey("zPlus"))
+ {
+ tankZplus = (TileEntity) tankMap.get("zPlus");
+ FluidStack liquidToPush = this.drain(amountZp, false);
+ if ((liquidToPush != null) && (liquidToPush.amount > 0))
+ {
+ int filled = ((IFluidHandler) tankZplus).fill(ForgeDirection.NORTH, liquidToPush, true);
+ this.drain(filled, true);
+ }
+ }
+ if (tankMap.containsKey("zMinus"))
+ {
+ tankZminus = (TileEntity) tankMap.get("zMinus");
+ FluidStack liquidToPush = this.drain(amountZm, false);
+ if ((liquidToPush != null) && (liquidToPush.amount > 0))
+ {
+ int filled = ((IFluidHandler) tankZminus).fill(ForgeDirection.SOUTH, liquidToPush, true);
+ this.drain(filled, true);
+ }
+ }
+ }
+ }
+
+ @SideOnly(Side.CLIENT)
+ public float tankBelow ()
+ {
+ TileEntity te = this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord - 1, this.zCoord);
+ if (te instanceof CastingChannelLogic)
+ return -0.5f;
+ if (te instanceof LavaTankLogic)
+ return -1.0f;
+ if (te instanceof CastingBasinLogic)
+ return -0.75f;
+ if (te instanceof CastingTableLogic)
+ return -0.125f;
+ if (te instanceof IFluidHandler)
+ return 0f;
+
+ return 0.5f;
+ }
+
+ public boolean hasChannelConnected (ForgeDirection dir)
+ {
+ switch (dir)
+ {
+ case DOWN:
+ return (this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord - 1, this.zCoord) instanceof CastingChannelLogic);
+ case NORTH:
+ return (this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord - 1) instanceof CastingChannelLogic);
+ case SOUTH:
+ return (this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord + 1) instanceof CastingChannelLogic);
+ case WEST:
+ return (this.worldObj.getBlockTileEntity(this.xCoord - 1, this.yCoord, this.zCoord) instanceof CastingChannelLogic);
+ case EAST:
+ return (this.worldObj.getBlockTileEntity(this.xCoord + 1, this.yCoord, this.zCoord) instanceof CastingChannelLogic);
+ default:
+ return false;
+ }
+ }
+
+ public boolean hasTankConnected (ForgeDirection dir)
+ {
+ switch (dir)
+ {
+ case DOWN:
+ return (this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord - 1, this.zCoord) instanceof IFluidHandler);
+ case NORTH:
+ return (this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord - 1) instanceof IFluidHandler);
+ case SOUTH:
+ return (this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord + 1) instanceof IFluidHandler);
+ case WEST:
+ return (this.worldObj.getBlockTileEntity(this.xCoord - 1, this.yCoord, this.zCoord) instanceof IFluidHandler);
+ case EAST:
+ return (this.worldObj.getBlockTileEntity(this.xCoord + 1, this.yCoord, this.zCoord) instanceof IFluidHandler);
+ default:
+ return false;
+ }
+ }
+
+ private HashMap getOutputs ()
+ {
+ HashMap map = new HashMap();
+ TileEntity tankXplus = this.worldObj.getBlockTileEntity(this.xCoord + 1, this.yCoord, this.zCoord);
+ TileEntity tankXminus = this.worldObj.getBlockTileEntity(this.xCoord - 1, this.yCoord, this.zCoord);
+ TileEntity tankZplus = this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord + 1);
+ TileEntity tankZminus = this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord - 1);
+ TileEntity tankYminus = this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord - 1, this.zCoord);
+
+ if (this.pullingLiquids)
+ {
+ if (this.hasChannelConnected(ForgeDirection.EAST) && (this.lastProvider != ForgeDirection.EAST))
+ {
+ map.put("xPlus", tankXplus);
+ }
+ if (this.hasChannelConnected(ForgeDirection.WEST) && (this.lastProvider != ForgeDirection.WEST))
+ {
+ map.put("xMinus", tankXminus);
+ }
+ if (this.hasChannelConnected(ForgeDirection.SOUTH) && (this.lastProvider != ForgeDirection.SOUTH))
+ {
+ map.put("zPlus", tankZplus);
+ }
+ if (this.hasChannelConnected(ForgeDirection.NORTH) && (this.lastProvider != ForgeDirection.NORTH))
+ {
+ map.put("zMinus", tankZminus);
+ }
+ if (this.hasChannelConnected(ForgeDirection.DOWN) && (this.lastProvider != ForgeDirection.DOWN))
+ {
+ map.put("yMinus", tankYminus);
+ }
+ }
+ else
+ {
+ if (this.hasTankConnected(ForgeDirection.EAST) && (this.lastProvider != ForgeDirection.EAST))
+ {
+ map.put("xPlus", tankXplus);
+ }
+ if (this.hasTankConnected(ForgeDirection.WEST) && (this.lastProvider != ForgeDirection.WEST))
+ {
+ map.put("xMinus", tankXminus);
+ }
+ if (this.hasTankConnected(ForgeDirection.SOUTH) && (this.lastProvider != ForgeDirection.SOUTH))
+ {
+ map.put("zPlus", tankZplus);
+ }
+ if (this.hasTankConnected(ForgeDirection.NORTH) && (this.lastProvider != ForgeDirection.NORTH))
+ {
+ map.put("zMinus", tankZminus);
+ }
+ if (this.hasTankConnected(ForgeDirection.DOWN) && (this.lastProvider != ForgeDirection.DOWN))
+ {
+ map.put("yMinus", tankYminus);
+ }
+ }
+
+ return map;
+ }
+
+ public int fill (FluidStack stack, boolean doFill)
+ {
+ if (stack == null)
+ {
+ return 0;
+ }
+ if (this.liquid == null)
+ {
+ FluidStack transfered = stack.copy();
+
+ if (transfered.amount > this.fillMax)
+ {
+ transfered.amount = this.fillMax;
+ }
+
+ if (doFill)
+ {
+ this.worldObj.markBlockForRenderUpdate(this.xCoord, this.yCoord, this.zCoord);
+ this.liquid = transfered;
+ }
+ recentlyFilledDelay = 2;
+ if (this.lastProvider == ForgeDirection.UP)
+ recentlyFilledDelay = 3;
+ return transfered.amount;
+ }
+
+ if (stack.isFluidEqual(this.liquid))
+ {
+ if (stack.amount + this.liquid.amount >= this.fillMax)
+ {
+ int spaceInTank = this.fillMax - this.liquid.amount;
+ if ((doFill) && (spaceInTank > 0))
+ {
+ this.liquid.amount = this.fillMax;
+ this.worldObj.markBlockForRenderUpdate(this.xCoord, this.yCoord, this.zCoord);
+ }
+ return spaceInTank;
+ }
+
+ if (doFill)
+ {
+ this.liquid.amount += stack.amount;
+ this.worldObj.markBlockForRenderUpdate(this.xCoord, this.yCoord, this.zCoord);
+ }
+ return stack.amount;
+ }
+
+ return 0;
+ }
+
+ @Override
+ public int fill (ForgeDirection from, FluidStack resource, boolean doFill)
+ {
+ this.lastProvider = from;
+ ticksLPReset = 0;
+ int filled = fill(resource, doFill);
+ if (from == ForgeDirection.UP)
+ moveLiquidToTanks();
+ return filled;
+ }
+
+ public FluidStack drain (int maxDrain, boolean doDrain)
+ {
+ if ((this.liquid == null))
+ {
+ return null;
+ }
+ if (this.liquid.amount <= 0)
+ {
+ return null;
+ }
+ int toDrain = maxDrain;
+ if (this.liquid.amount < toDrain)
+ {
+ toDrain = this.liquid.amount;
+ }
+ if (doDrain)
+ {
+ this.liquid.amount -= toDrain;
+ }
+
+ FluidStack drained = new FluidStack(liquid.fluidID, toDrain);
+
+ if (this.liquid.amount <= 0)
+ {
+ this.liquid = null;
+ }
+ if (doDrain)
+ {
+ FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this));
+ }
+ return drained;
+ }
+
+ @Override
+ public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain)
+ {
+ return this.drain(maxDrain, doDrain);
+ }
+
+ @Override
+ public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain)
+ {
+ return this.drain(resource.amount, doDrain);
+ }
+
+ @Override
+ public int getCapacity ()
+ {
+ return this.fillMax;
+ }
+
+ public int getLiquidAmount ()
+ {
+ return this.liquid.amount;
+ }
+
+ @Override
+ public void readFromNBT (NBTTagCompound tags)
+ {
+ super.readFromNBT(tags);
+ readCustomNBT(tags);
+ pullingLiquids = tags.getBoolean("PullingLiquids");
+ }
+
+ public void readCustomNBT (NBTTagCompound tags)
+ {
+ if (tags.getBoolean("hasLiquid"))
+ {
+ this.liquid = FluidStack.loadFluidStackFromNBT(tags.getCompoundTag("Fluid"));
+ }
+ else
+ this.liquid = null;
+ this.recentlyFilledDelay = tags.getInteger("recentlyFilledDelay");
+ this.lastProvider = this.convertIntToFD(tags.getInteger("LastProvider"));
+ }
+
+ @Override
+ public void writeToNBT (NBTTagCompound tags)
+ {
+ super.writeToNBT(tags);
+ writeCustomNBT(tags);
+ tags.setBoolean("PullingLiquids", pullingLiquids);
+ }
+
+ public void writeCustomNBT (NBTTagCompound tags)
+ {
+ tags.setBoolean("hasLiquid", liquid != null);
+ if (liquid != null)
+ {
+ NBTTagCompound nbt = new NBTTagCompound();
+ liquid.writeToNBT(nbt);
+ tags.setCompoundTag("Fluid", nbt);
+ }
+ tags.setInteger("LastProvider", this.convertFDToInt(this.lastProvider));
+ tags.setInteger("recentlyFilledDelay", this.recentlyFilledDelay);
+ }
+
+ @Override
+ public Packet getDescriptionPacket ()
+ {
+ NBTTagCompound tag = new NBTTagCompound();
+ writeCustomNBT(tag);
+ return new Packet132TileEntityData(this.xCoord, this.yCoord, this.zCoord, 1, tag);
+ }
+
+ @Override
+ public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
+ {
+ readCustomNBT(packet.customParam1);
+ this.worldObj.markBlockForRenderUpdate(this.xCoord, this.yCoord, this.zCoord);
+ }
+
+ public int convertFDToInt (ForgeDirection dir)
+ {
+ switch (dir)
+ {
+ case DOWN:
+ return 0;
+ case UP:
+ return 1;
+ case NORTH:
+ return 2;
+ case SOUTH:
+ return 3;
+ case WEST:
+ return 4;
+ case EAST:
+ return 5;
+ default:
+ return -1;
+ }
+ }
+
+ public ForgeDirection convertIntToFD (int i)
+ {
+ switch (i)
+ {
+ case 0:
+ return ForgeDirection.DOWN;
+ case 1:
+ return ForgeDirection.UP;
+ case 2:
+ return ForgeDirection.NORTH;
+ case 3:
+ return ForgeDirection.SOUTH;
+ case 4:
+ return ForgeDirection.WEST;
+ case 5:
+ return ForgeDirection.EAST;
+ default:
+ return ForgeDirection.UNKNOWN;
+ }
+ }
+
+ @Override
+ public boolean getActive ()
+ {
+ return pullingLiquids;
+ }
+
+ @Override
+ public void setActive (boolean flag)
+ {
+ pullingLiquids = flag;
+ }
+ @Override
+ public boolean canFill (ForgeDirection from, Fluid fluid)
+ {
+ return liquid == null || (liquid.amount < fillMax);
+ }
+
+ @Override
+ public boolean canDrain (ForgeDirection from, Fluid fluid)
+ {
+ return true;
+ }
+
+ @Override
+ public FluidTankInfo[] getTankInfo (ForgeDirection from)
+ {
+ return new FluidTankInfo[] {getInfo()};
+ }
+
+ @Override
+ public FluidStack getFluid ()
+ {
+ return liquid == null ? null : liquid.copy();
+ }
+
+ @Override
+ public int getFluidAmount ()
+ {
+ return liquid == null ? 0 : liquid.amount;
+ }
+
+ @Override
+ public FluidTankInfo getInfo ()
+ {
+ FluidTankInfo info = new FluidTankInfo(this);
+ return info;
+ }
+}
diff --git a/tconstruct/blocks/logic/CastingTableLogic.java b/tconstruct/blocks/logic/CastingTableLogic.java
index d5eeac2a..88fd914a 100644
--- a/tconstruct/blocks/logic/CastingTableLogic.java
+++ b/tconstruct/blocks/logic/CastingTableLogic.java
@@ -353,8 +353,6 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl
{
this.liquid = FluidStack.loadFluidStackFromNBT(tags.getCompoundTag("Fluid"));
}
- //FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt);
- //this.liquid = new FluidStack(tags.getInteger("itemID"), tags.getInteger("amount"), tags.getInteger("itemMeta"));
else
this.liquid = null;
diff --git a/tconstruct/blocks/logic/ToolForgeLogic.java b/tconstruct/blocks/logic/ToolForgeLogic.java
index 472e6cc3..9bc2d168 100644
--- a/tconstruct/blocks/logic/ToolForgeLogic.java
+++ b/tconstruct/blocks/logic/ToolForgeLogic.java
@@ -26,7 +26,7 @@ public class ToolForgeLogic extends ToolStationLogic implements ISidedInventory
@Override
public String getDefaultName ()
{
- return "toolforge.crafting";
+ return "crafters.ToolForge";
}
@Override
diff --git a/tconstruct/blocks/logic/ToolStationLogic.java b/tconstruct/blocks/logic/ToolStationLogic.java
index 9af58d5a..d88f132b 100644
--- a/tconstruct/blocks/logic/ToolStationLogic.java
+++ b/tconstruct/blocks/logic/ToolStationLogic.java
@@ -46,7 +46,7 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
@Override
public String getDefaultName ()
{
- return "toolstation.crafting";
+ return "crafters.ToolStation";
}
@Override
diff --git a/tconstruct/client/TProxyClient.java b/tconstruct/client/TProxyClient.java
index fabea7c8..a97980bd 100644
--- a/tconstruct/client/TProxyClient.java
+++ b/tconstruct/client/TProxyClient.java
@@ -71,6 +71,7 @@ import tconstruct.blocks.logic.StencilTableLogic;
import tconstruct.blocks.logic.ToolForgeLogic;
import tconstruct.blocks.logic.ToolStationLogic;
import tconstruct.client.block.BarricadeRender;
+import tconstruct.client.block.BlockRenderCastingChannel;
import tconstruct.client.block.CastingBasinSpecialRender;
import tconstruct.client.block.CastingTableSpecialRenderer;
import tconstruct.client.block.CrystalBlockRender;
@@ -190,11 +191,11 @@ public class TProxyClient extends TProxyCommon
return new StencilTableGui(player.inventory, (StencilTableLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
if (ID == toolForgeID)
return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
- if (ID == glowstoneAggregatorGui)
+ if (ID == glowstoneAggregatorID)
return new GlowstoneAggregatorGui(player.inventory, (GlowstoneAggregator) world.getBlockTileEntity(x, y, z), world, x, y, z);
- if (ID == drawbridgeGui)
+ if (ID == drawbridgeID)
return new DrawbridgeGui(player.inventory, (DrawbridgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
- if (ID == landmineGui)
+ if (ID == landmineID)
return new GuiLandmine(new ContainerLandmine(player, (TileEntityLandmine) world.getBlockTileEntity(x, y, z)));
if (ID == craftingStationID)
return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.getBlockTileEntity(x, y, z), x, y, z);
@@ -332,7 +333,6 @@ public class TProxyClient extends TProxyCommon
RenderingRegistry.registerBlockHandler(new SmelteryRender());
RenderingRegistry.registerBlockHandler(new TankRender());
RenderingRegistry.registerBlockHandler(new SearedRender());
- // RenderingRegistry.registerBlockHandler(new GolemCoreRender());
RenderingRegistry.registerBlockHandler(new OreberryRender());
RenderingRegistry.registerBlockHandler(new BarricadeRender());
RenderingRegistry.registerBlockHandler(new CrystalBlockRender());
@@ -342,6 +342,8 @@ public class TProxyClient extends TProxyCommon
RenderingRegistry.registerBlockHandler(new PaneConnectedRender());
RenderingRegistry.registerBlockHandler(new RenderLandmine());
RenderingRegistry.registerBlockHandler(new PunjiRender());
+ RenderingRegistry.registerBlockHandler(new RenderBlockFluid());
+ RenderingRegistry.registerBlockHandler(new BlockRenderCastingChannel());
// Special Renderers
ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer());
diff --git a/tconstruct/client/block/BlockRenderCastingChannel.java b/tconstruct/client/block/BlockRenderCastingChannel.java
new file mode 100644
index 00000000..a77e8023
--- /dev/null
+++ b/tconstruct/client/block/BlockRenderCastingChannel.java
@@ -0,0 +1,369 @@
+package tconstruct.client.block;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.item.Item;
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.lwjgl.opengl.GL11;
+
+import tconstruct.blocks.logic.CastingChannelLogic;
+
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+
+/**
+ * @author BluSunrize
+ */
+
+public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler
+{
+ public static int renderID = RenderingRegistry.getNextAvailableRenderId();
+
+ @Override
+ public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
+ {
+ //Floor
+ renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D);
+ this.renderStandardBlock(block, metadata, renderer);
+ //Channel Z-
+ renderer.setRenderBounds(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D);
+ this.renderStandardBlock(block, metadata, renderer);
+ renderer.setRenderBounds(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D);
+ this.renderStandardBlock(block, metadata, renderer);
+ renderer.setRenderBounds(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D);
+ this.renderStandardBlock(block, metadata, renderer);
+ //Channel Z+
+ renderer.setRenderBounds(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D);
+ this.renderStandardBlock(block, metadata, renderer);
+ renderer.setRenderBounds(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D);
+ this.renderStandardBlock(block, metadata, renderer);
+ renderer.setRenderBounds(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D);
+ this.renderStandardBlock(block, metadata, renderer);
+ //Wall X-
+ renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.6875D);
+ this.renderStandardBlock(block, metadata, renderer);
+ //Wall X+
+ renderer.setRenderBounds(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.6875D);
+ this.renderStandardBlock(block, metadata, renderer);
+ }
+
+ @Override
+ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer)
+ {
+ if (modelID == renderID)
+ {
+ CastingChannelLogic tile = (CastingChannelLogic) world.getBlockTileEntity(x, y, z);
+
+ if (!tile.hasTankConnected(ForgeDirection.DOWN))//CentrePiece, floor is removed if tank below is found
+ {
+ renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ }
+ else
+ //"Guiding Borders" when tank below is found
+ {
+ renderer.setRenderBounds(0.375D, 0.125D, 0.3125D, 0.625D, 0.5D, 0.375D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.375D, 0.125D, 0.625D, 0.625D, 0.5D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.3125D, 0.125D, 0.3125D, 0.375D, 0.5D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.625D, 0.125D, 0.3125D, 0.6875D, 0.5D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ }
+ /*renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.375D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.3125D, 0.375D, 0.625D, 0.375D, 0.625D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.375D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.625D, 0.375D, 0.625D, 0.6875D, 0.625D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);*/
+ if (tile.hasTankConnected(ForgeDirection.NORTH))//Channel to Z-
+ {
+ renderer.setRenderBounds(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D);
+ renderer.renderStandardBlock(block, x, y, z);
+ }
+ else
+ //Wall to Z-
+ {
+ renderer.setRenderBounds(0.375D, 0.5D, 0.3125D, 0.625D, 0.625D, 0.375D);
+ renderer.renderStandardBlock(block, x, y, z);
+ }
+
+ if (tile.hasTankConnected(ForgeDirection.SOUTH))//Channel to Z+
+ {
+ renderer.setRenderBounds(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D);
+ renderer.renderStandardBlock(block, x, y, z);
+ }
+ else
+ //Wall to Z+
+ {
+ renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ }
+
+ if (tile.hasTankConnected(ForgeDirection.WEST))//Channel to X-
+ {
+ renderer.setRenderBounds(0D, 0.375D, 0.3125D, 0.3125D, 0.5D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.375D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0D, 0.5D, 0.625D, 0.375D, 0.625D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ }
+ else
+ //Wall to X-
+ {
+ renderer.setRenderBounds(0.3125D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ }
+
+ if (tile.hasTankConnected(ForgeDirection.EAST))//Channel to X+
+ {
+ renderer.setRenderBounds(0.6875D, 0.375D, 0.3125D, 1D, 0.5D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.625D, 0.5D, 0.3125D, 1D, 0.625D, 0.375D);
+ renderer.renderStandardBlock(block, x, y, z);
+ renderer.setRenderBounds(0.625D, 0.5D, 0.625D, 1D, 0.625D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ }
+ else
+ //Wall to X+
+ {
+ renderer.setRenderBounds(0.625D, 0.5D, 0.3125D, 0.6875D, 0.625D, 0.6875D);
+ renderer.renderStandardBlock(block, x, y, z);
+ }
+
+ if (tile.liquid != null)
+ {
+ float height = tile.getLiquidAmount() / (tile.getCapacity() * 1.05F);
+ float j = tile.liquid.amount / tile.fillMax;
+ double startY = tile.tankBelow();
+ //if(tile.nearbyChannel(ForgeDirection.DOWN))startY = -0.5D;
+ //else if(tile.hasTankConnected(ForgeDirection.DOWN))startY = 0D;
+ float liquidAmount = tile.liquid.amount / 288f * 0.125f;
+ renderer.setRenderBounds(0.375D, startY, 0.375D, 0.625D, 0.5 + liquidAmount, 0.625D); //Center
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ //System.out.println(tile.recentlyFilledDelay);
+
+ if (tile.hasTankConnected(ForgeDirection.NORTH))
+ {
+ if (tile.lastProvider == ForgeDirection.NORTH)
+ {
+ renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ else
+ {
+ if (tile.recentlyFilledDelay == 0)
+ {
+ renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ }
+ }
+ if (tile.hasTankConnected(ForgeDirection.SOUTH))
+ {
+ if (tile.lastProvider == ForgeDirection.SOUTH)
+ {
+ renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ else
+ {
+ if (tile.recentlyFilledDelay == 0)
+ {
+ renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ }
+ }
+ if (tile.hasTankConnected(ForgeDirection.WEST))
+ {
+ if (tile.lastProvider == ForgeDirection.WEST)
+ {
+ renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ else
+ {
+ if (tile.recentlyFilledDelay == 0)
+ {
+ renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ }
+ }
+ if (tile.hasTankConnected(ForgeDirection.EAST))
+ {
+ if (tile.lastProvider == ForgeDirection.EAST)
+ {
+ renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ else
+ {
+ if (tile.recentlyFilledDelay == 0)
+ {
+ renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ }
+
+ }
+ /*if(tile.lastProvider==ForgeDirection.UP && tile.recentlyFilledDelay != 0)
+ {
+ renderer.setRenderBounds(0.375D, 0.5D, 0.375D, 0.625D, 1D, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }*/
+
+ /*if(tile.hasTankConnected(ForgeDirection.NORTH)&&tile.lastProvider!=ForgeDirection.NORTH)//Channel to Z-
+ {
+ if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP)
+ {
+ renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.625D, 0.375D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP)
+ {
+ renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ }
+ if(tile.hasTankConnected(ForgeDirection.SOUTH)&&tile.lastProvider!=ForgeDirection.SOUTH)//Channel to Z+
+ {
+ if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP)
+ {
+ renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 1D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP)
+ {
+ renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ }
+ if(tile.hasTankConnected(ForgeDirection.WEST)&&tile.lastProvider!=ForgeDirection.WEST)//Channel to X-
+ {
+ if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP)
+ {
+ renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.625D, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP)
+ {
+ renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ }
+ if(tile.hasTankConnected(ForgeDirection.EAST)&&tile.lastProvider!=ForgeDirection.EAST)//Channel to X+
+ {
+ if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP)
+ {
+ renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.625D, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP)
+ {
+ renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ }
+ if(tile.lastProvider==ForgeDirection.NORTH && tile.recentlyFilledDelay != 0)
+ {
+ renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 1D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ if(tile.lastProvider==ForgeDirection.SOUTH && tile.recentlyFilledDelay != 0)
+ {
+ renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.625D, 0.375D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ if(tile.lastProvider==ForgeDirection.WEST && tile.recentlyFilledDelay != 0)
+ {
+ renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.625D, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }
+ if(tile.lastProvider==ForgeDirection.EAST && tile.recentlyFilledDelay != 0)
+ {
+ renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.625D, 0.625D);
+ renderLiquidPart(world, x, y, z, block, renderer, tile);
+ }*/
+ }
+
+ }
+ return true;
+ }
+
+ private void renderLiquidPart (IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer, CastingChannelLogic logic)
+ {
+ FluidStack liquid = logic.liquid;
+ int color = block.colorMultiplier(world, x, y, z);
+ float red = (color >> 16 & 0xFF) / 255.0F;
+ float green = (color >> 8 & 0xFF) / 255.0F;
+ float blue = (color & 0xFF) / 255.0F;
+ Fluid fluid = liquid.getFluid();
+ if (fluid.canBePlacedInWorld())
+ BlockSkinRenderHelper.renderMetadataBlock(Block.blocksList[fluid.getBlockID()], 0, x, y, z, renderer, world);
+ else
+ BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world);
+ }
+
+ private void renderStandardBlock (Block block, int meta, RenderBlocks renderer)
+ {
+ Tessellator tessellator = Tessellator.instance;
+ GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, -1.0F, 0.0F);
+ renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, 1.0F, 0.0F);
+ renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, 0.0F, -1.0F);
+ renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, 0.0F, 1.0F);
+ renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(-1.0F, 0.0F, 0.0F);
+ renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(1.0F, 0.0F, 0.0F);
+ renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
+ tessellator.draw();
+ GL11.glTranslatef(0.5F, 0.5F, 0.5F);
+ }
+
+ @Override
+ public boolean shouldRender3DInInventory ()
+ {
+ // TODO Auto-generated method stub
+ return true;
+ }
+
+ @Override
+ public int getRenderId ()
+ {
+ return renderID;
+ }
+}
diff --git a/tconstruct/client/block/RenderLiquid.java b/tconstruct/client/block/RenderLiquid.java
new file mode 100644
index 00000000..b91cebf1
--- /dev/null
+++ b/tconstruct/client/block/RenderLiquid.java
@@ -0,0 +1,1665 @@
+package tconstruct.client.block;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.Icon;
+import net.minecraft.world.IBlockAccess;
+
+/**
+ * @author BluSunrize
+ */
+
+public class RenderLiquid
+{
+ public static boolean renderMetadataBlock(Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world)
+ {
+ int var5 = block.colorMultiplier(world, x, y, z);
+ float var6 = (var5 >> 16 & 0xFF) / 255.0F;
+ float var7 = (var5 >> 8 & 0xFF) / 255.0F;
+ float var8 = (var5 & 0xFF) / 255.0F;
+
+ if (EntityRenderer.anaglyphEnable)
+ {
+ float var9 = (var6 * 30.0F + var7 * 59.0F + var8 * 11.0F) / 100.0F;
+ float var10 = (var6 * 30.0F + var7 * 70.0F) / 100.0F;
+ float var11 = (var6 * 30.0F + var8 * 70.0F) / 100.0F;
+ var6 = var9;
+ var7 = var10;
+ var8 = var11;
+ }
+
+ return (Minecraft.isAmbientOcclusionEnabled()) && (Block.lightValue[block.blockID] == 0) ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world);
+ }
+
+ static boolean renderMetadataBlockWithAmbientOcclusion(Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world)
+ {
+ render.enableAO = true;
+ boolean flag = false;
+ float f3 = 0.0F;
+ float f4 = 0.0F;
+ float f5 = 0.0F;
+ float f6 = 0.0F;
+ boolean flag1 = true;
+ int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
+ Tessellator tessellator = Tessellator.instance;
+ tessellator.setBrightness(983055);
+
+ if (render.getBlockIcon(block).getIconName().equals("grass_top"))
+ {
+ flag1 = false;
+ }
+ else if (render.hasOverrideBlockTexture())
+ {
+ flag1 = false;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
+ {
+ if (render.renderMinY <= 0.0D)
+ {
+ yPos--;
+ }
+
+ render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)];
+
+ if ((!flag4) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN;
+ render.aoBrightnessXYZNNN = render.aoBrightnessXYNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1);
+ render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1);
+ }
+
+ if ((!flag5) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN;
+ render.aoBrightnessXYZNNP = render.aoBrightnessXYNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1);
+ render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1);
+ }
+
+ if ((!flag4) && (!flag3))
+ {
+ render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN;
+ render.aoBrightnessXYZPNN = render.aoBrightnessXYPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1);
+ render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1);
+ }
+
+ if ((!flag5) && (!flag3))
+ {
+ render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN;
+ render.aoBrightnessXYZPNP = render.aoBrightnessXYPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1);
+ render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1);
+ }
+
+ if (render.renderMinY <= 0.0D)
+ {
+ yPos++;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMinY <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos - 1, zPos)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
+ f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F;
+ f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F;
+ f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F;
+ f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F;
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1);
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1);
+
+ if (flag1)
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F);
+ }
+ else
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F);
+ }
+
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata));
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
+ {
+ if (render.renderMaxY >= 1.0D)
+ {
+ yPos++;
+ }
+
+ render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)];
+
+ if ((!flag4) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP;
+ render.aoBrightnessXYZNPN = render.aoBrightnessXYNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1);
+ render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1);
+ }
+
+ if ((!flag4) && (!flag3))
+ {
+ render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP;
+ render.aoBrightnessXYZPPN = render.aoBrightnessXYPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1);
+ render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1);
+ }
+
+ if ((!flag5) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP;
+ render.aoBrightnessXYZNPP = render.aoBrightnessXYNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1);
+ render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1);
+ }
+
+ if ((!flag5) && (!flag3))
+ {
+ render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP;
+ render.aoBrightnessXYZPPP = render.aoBrightnessXYPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1);
+ render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1);
+ }
+
+ if (render.renderMaxY >= 1.0D)
+ {
+ yPos--;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMaxY >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos + 1, zPos)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
+ f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F;
+ f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F;
+ f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F;
+ f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F;
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1);
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1);
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue);
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata));
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
+ {
+ if (render.renderMinZ <= 0.0D)
+ {
+ zPos--;
+ }
+
+ render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
+ render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
+ render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)];
+
+ if ((!flag2) && (!flag4))
+ {
+ render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN;
+ render.aoBrightnessXYZNNN = render.aoBrightnessXZNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos);
+ render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos);
+ }
+
+ if ((!flag2) && (!flag5))
+ {
+ render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN;
+ render.aoBrightnessXYZNPN = render.aoBrightnessXZNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos);
+ render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos);
+ }
+
+ if ((!flag3) && (!flag4))
+ {
+ render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN;
+ render.aoBrightnessXYZPNN = render.aoBrightnessXZPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos);
+ render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos);
+ }
+
+ if ((!flag3) && (!flag5))
+ {
+ render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN;
+ render.aoBrightnessXYZPPN = render.aoBrightnessXZPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
+ render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos);
+ }
+
+ if (render.renderMinZ <= 0.0D)
+ {
+ zPos++;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMinZ <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos - 1)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+ f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F;
+ f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F;
+ f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F;
+ f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F;
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1);
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1);
+
+ if (flag1)
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F);
+ }
+ else
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F);
+ }
+
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ Icon icon = block.getIcon(2, metadata);
+ render.renderFaceZNeg(block, xPos, yPos, zPos, icon);
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
+ {
+ if (render.renderMaxZ >= 1.0D)
+ {
+ zPos++;
+ }
+
+ render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
+ render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)];
+
+ if ((!flag2) && (!flag4))
+ {
+ render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP;
+ render.aoBrightnessXYZNNP = render.aoBrightnessXZNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos);
+ render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos);
+ }
+
+ if ((!flag2) && (!flag5))
+ {
+ render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP;
+ render.aoBrightnessXYZNPP = render.aoBrightnessXZNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos);
+ render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos);
+ }
+
+ if ((!flag3) && (!flag4))
+ {
+ render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP;
+ render.aoBrightnessXYZPNP = render.aoBrightnessXZPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos);
+ render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos);
+ }
+
+ if ((!flag3) && (!flag5))
+ {
+ render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP;
+ render.aoBrightnessXYZPPP = render.aoBrightnessXZPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
+ render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos);
+ }
+
+ if (render.renderMaxZ >= 1.0D)
+ {
+ zPos--;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMaxZ >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos + 1)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
+ f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F;
+ f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F;
+ f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F;
+ f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F;
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1);
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1);
+
+ if (flag1)
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F);
+ }
+ else
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F);
+ }
+
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ Icon icon = block.getIcon(3, metadata);
+ render.renderFaceZPos(block, xPos, yPos, zPos, icon);
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
+ {
+ if (render.renderMinX <= 0.0D)
+ {
+ xPos--;
+ }
+
+ render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
+ render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)];
+
+ if ((!flag5) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN;
+ render.aoBrightnessXYZNNN = render.aoBrightnessXZNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1);
+ render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1);
+ }
+
+ if ((!flag4) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP;
+ render.aoBrightnessXYZNNP = render.aoBrightnessXZNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1);
+ render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1);
+ }
+
+ if ((!flag5) && (!flag3))
+ {
+ render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN;
+ render.aoBrightnessXYZNPN = render.aoBrightnessXZNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1);
+ render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1);
+ }
+
+ if ((!flag4) && (!flag3))
+ {
+ render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP;
+ render.aoBrightnessXYZNPP = render.aoBrightnessXZNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1);
+ render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1);
+ }
+
+ if (render.renderMinX <= 0.0D)
+ {
+ xPos++;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMinX <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos - 1, yPos, zPos)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+ f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F;
+ f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F;
+ f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F;
+ f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F;
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1);
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1);
+
+ if (flag1)
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F);
+ }
+ else
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F);
+ }
+
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ Icon icon = block.getIcon(4, metadata);
+ render.renderFaceXNeg(block, xPos, yPos, zPos, icon);
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
+ {
+ if (render.renderMaxX >= 1.0D)
+ {
+ xPos++;
+ }
+
+ render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
+ render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)];
+
+ if ((!flag2) && (!flag4))
+ {
+ render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN;
+ render.aoBrightnessXYZPNN = render.aoBrightnessXZPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1);
+ render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1);
+ }
+
+ if ((!flag2) && (!flag5))
+ {
+ render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP;
+ render.aoBrightnessXYZPNP = render.aoBrightnessXZPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1);
+ render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1);
+ }
+
+ if ((!flag3) && (!flag4))
+ {
+ render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN;
+ render.aoBrightnessXYZPPN = render.aoBrightnessXZPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1);
+ render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1);
+ }
+
+ if ((!flag3) && (!flag5))
+ {
+ render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP;
+ render.aoBrightnessXYZPPP = render.aoBrightnessXZPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1);
+ render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1);
+ }
+
+ if (render.renderMaxX >= 1.0D)
+ {
+ xPos--;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMaxX >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos + 1, yPos, zPos)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
+ f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F;
+ f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F;
+ f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F;
+ f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F;
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1);
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1);
+
+ if (flag1)
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F);
+ }
+ else
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F);
+ }
+
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ Icon icon = block.getIcon(5, metadata);
+ render.renderFaceXPos(block, xPos, yPos, zPos, icon);
+
+ flag = true;
+ }
+
+ render.enableAO = false;
+ return flag;
+ }
+
+ static boolean renderMetadataBlockWithColorMultiplier(Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world)
+ {
+ render.enableAO = false;
+ Tessellator tessellator = Tessellator.instance;
+ boolean flag = false;
+ float f3 = 0.5F;
+ float f4 = 1.0F;
+ float f5 = 0.8F;
+ float f6 = 0.6F;
+ float f7 = f4 * colorRed;
+ float f8 = f4 * colorGreen;
+ float f9 = f4 * colorBlue;
+ float f10 = f3;
+ float f11 = f5;
+ float f12 = f6;
+ float f13 = f3;
+ float f14 = f5;
+ float f15 = f6;
+ float f16 = f3;
+ float f17 = f5;
+ float f18 = f6;
+
+ if (block != Block.grass)
+ {
+ f10 = f3 * colorRed;
+ f11 = f5 * colorRed;
+ f12 = f6 * colorRed;
+ f13 = f3 * colorGreen;
+ f14 = f5 * colorGreen;
+ f15 = f6 * colorGreen;
+ f16 = f3 * colorBlue;
+ f17 = f5 * colorBlue;
+ f18 = f6 * colorBlue;
+ }
+
+ int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
+ {
+ tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos));
+ tessellator.setColorOpaque_F(f10, f13, f16);
+ render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata));
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
+ {
+ tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos));
+ tessellator.setColorOpaque_F(f7, f8, f9);
+ render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata));
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
+ {
+ tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1));
+ tessellator.setColorOpaque_F(f11, f14, f17);
+ render.renderFaceZNeg(block, xPos, yPos, zPos, block.getIcon(2, metadata));
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
+ {
+ tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1));
+ tessellator.setColorOpaque_F(f11, f14, f17);
+ render.renderFaceZPos(block, xPos, yPos, zPos, block.getIcon(3, metadata));
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
+ {
+ tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos));
+ tessellator.setColorOpaque_F(f12, f15, f18);
+ render.renderFaceXNeg(block, xPos, yPos, zPos, block.getIcon(4, metadata));
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
+ {
+ tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos));
+ tessellator.setColorOpaque_F(f12, f15, f18);
+ render.renderFaceXPos(block, xPos, yPos, zPos, block.getIcon(5, metadata));
+
+ flag = true;
+ }
+
+ return flag;
+ }
+
+ public static boolean renderFakeBlock(Icon texture, int x, int y, int z, RenderBlocks renderer, IBlockAccess world)
+ {
+ Block block = Block.stone;
+ int var5 = block.colorMultiplier(world, x, y, z);
+ float var6 = (var5 >> 16 & 0xFF) / 255.0F;
+ float var7 = (var5 >> 8 & 0xFF) / 255.0F;
+ float var8 = (var5 & 0xFF) / 255.0F;
+
+ if (EntityRenderer.anaglyphEnable)
+ {
+ float var9 = (var6 * 30.0F + var7 * 59.0F + var8 * 11.0F) / 100.0F;
+ float var10 = (var6 * 30.0F + var7 * 70.0F) / 100.0F;
+ float var11 = (var6 * 30.0F + var8 * 70.0F) / 100.0F;
+ var6 = var9;
+ var7 = var10;
+ var8 = var11;
+ }
+
+ return Minecraft.isAmbientOcclusionEnabled() ? renderFakeBlockWithAmbientOcclusion(texture, x, y, z, var6, var7, var8, renderer, world) : renderFakeBlockWithColorMultiplier(texture, x, y, z, var6, var7, var8, renderer, world);
+ }
+
+ static boolean renderFakeBlockWithAmbientOcclusion(Icon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world)
+ {
+ Block block = Block.stone;
+ render.enableAO = true;
+ boolean flag = false;
+ float f3 = 0.0F;
+ float f4 = 0.0F;
+ float f5 = 0.0F;
+ float f6 = 0.0F;
+ boolean flag1 = true;
+ int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
+ Tessellator tessellator = Tessellator.instance;
+ tessellator.setBrightness(983055);
+
+ if (render.getBlockIcon(block).getIconName().equals("grass_top"))
+ {
+ flag1 = false;
+ }
+ else if (render.hasOverrideBlockTexture())
+ {
+ flag1 = false;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
+ {
+ if (render.renderMinY <= 0.0D)
+ {
+ yPos--;
+ }
+
+ render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)];
+
+ if ((!flag4) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN;
+ render.aoBrightnessXYZNNN = render.aoBrightnessXYNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1);
+ render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1);
+ }
+
+ if ((!flag5) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN;
+ render.aoBrightnessXYZNNP = render.aoBrightnessXYNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1);
+ render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1);
+ }
+
+ if ((!flag4) && (!flag3))
+ {
+ render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN;
+ render.aoBrightnessXYZPNN = render.aoBrightnessXYPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1);
+ render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1);
+ }
+
+ if ((!flag5) && (!flag3))
+ {
+ render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN;
+ render.aoBrightnessXYZPNP = render.aoBrightnessXYPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1);
+ render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1);
+ }
+
+ if (render.renderMinY <= 0.0D)
+ {
+ yPos++;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMinY <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos - 1, zPos)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
+ f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F;
+ f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F;
+ f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F;
+ f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F;
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1);
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1);
+
+ if (flag1)
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F);
+ }
+ else
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F);
+ }
+
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ render.renderFaceYNeg(block, xPos, yPos, zPos, texture);
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
+ {
+ if (render.renderMaxY >= 1.0D)
+ {
+ yPos++;
+ }
+
+ render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)];
+
+ if ((!flag4) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP;
+ render.aoBrightnessXYZNPN = render.aoBrightnessXYNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1);
+ render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1);
+ }
+
+ if ((!flag4) && (!flag3))
+ {
+ render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP;
+ render.aoBrightnessXYZPPN = render.aoBrightnessXYPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1);
+ render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1);
+ }
+
+ if ((!flag5) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP;
+ render.aoBrightnessXYZNPP = render.aoBrightnessXYNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1);
+ render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1);
+ }
+
+ if ((!flag5) && (!flag3))
+ {
+ render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP;
+ render.aoBrightnessXYZPPP = render.aoBrightnessXYPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1);
+ render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1);
+ }
+
+ if (render.renderMaxY >= 1.0D)
+ {
+ yPos--;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMaxY >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos + 1, zPos)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
+ f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F;
+ f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F;
+ f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F;
+ f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F;
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1);
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1);
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue);
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ render.renderFaceYPos(block, xPos, yPos, zPos, texture);
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
+ {
+ if (render.renderMinZ <= 0.0D)
+ {
+ zPos--;
+ }
+
+ render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
+ render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
+ render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos - 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos - 1)];
+
+ if ((!flag2) && (!flag4))
+ {
+ render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN;
+ render.aoBrightnessXYZNNN = render.aoBrightnessXZNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos);
+ render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos);
+ }
+
+ if ((!flag2) && (!flag5))
+ {
+ render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN;
+ render.aoBrightnessXYZNPN = render.aoBrightnessXZNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos);
+ render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos);
+ }
+
+ if ((!flag3) && (!flag4))
+ {
+ render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN;
+ render.aoBrightnessXYZPNN = render.aoBrightnessXZPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos);
+ render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos);
+ }
+
+ if ((!flag3) && (!flag5))
+ {
+ render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN;
+ render.aoBrightnessXYZPPN = render.aoBrightnessXZPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
+ render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos);
+ }
+
+ if (render.renderMinZ <= 0.0D)
+ {
+ zPos++;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMinZ <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos - 1)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+ f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F;
+ f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F;
+ f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F;
+ f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F;
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1);
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1);
+
+ if (flag1)
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F);
+ }
+ else
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F);
+ }
+
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ render.renderFaceZNeg(block, xPos, yPos, zPos, texture);
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
+ {
+ if (render.renderMaxZ >= 1.0D)
+ {
+ zPos++;
+ }
+
+ render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
+ render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos);
+ render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
+ render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos + 1, zPos + 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos, yPos - 1, zPos + 1)];
+
+ if ((!flag2) && (!flag4))
+ {
+ render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP;
+ render.aoBrightnessXYZNNP = render.aoBrightnessXZNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos);
+ render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos);
+ }
+
+ if ((!flag2) && (!flag5))
+ {
+ render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP;
+ render.aoBrightnessXYZNPP = render.aoBrightnessXZNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos);
+ render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos);
+ }
+
+ if ((!flag3) && (!flag4))
+ {
+ render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP;
+ render.aoBrightnessXYZPNP = render.aoBrightnessXZPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos);
+ render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos);
+ }
+
+ if ((!flag3) && (!flag5))
+ {
+ render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP;
+ render.aoBrightnessXYZPPP = render.aoBrightnessXZPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos);
+ render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos);
+ }
+
+ if (render.renderMaxZ >= 1.0D)
+ {
+ zPos--;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMaxZ >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos, yPos, zPos + 1)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
+ f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F;
+ f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F;
+ f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F;
+ f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F;
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1);
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1);
+
+ if (flag1)
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F);
+ }
+ else
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F);
+ }
+
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ render.renderFaceZPos(block, xPos, yPos, zPos, texture);
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
+ {
+ if (render.renderMinX <= 0.0D)
+ {
+ xPos--;
+ }
+
+ render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
+ render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos + 1, zPos)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos - 1, zPos)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos - 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos - 1, yPos, zPos + 1)];
+
+ if ((!flag5) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN;
+ render.aoBrightnessXYZNNN = render.aoBrightnessXZNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1);
+ render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1);
+ }
+
+ if ((!flag4) && (!flag2))
+ {
+ render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP;
+ render.aoBrightnessXYZNNP = render.aoBrightnessXZNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1);
+ render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1);
+ }
+
+ if ((!flag5) && (!flag3))
+ {
+ render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN;
+ render.aoBrightnessXYZNPN = render.aoBrightnessXZNN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1);
+ render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1);
+ }
+
+ if ((!flag4) && (!flag3))
+ {
+ render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP;
+ render.aoBrightnessXYZNPP = render.aoBrightnessXZNP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1);
+ render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1);
+ }
+
+ if (render.renderMinX <= 0.0D)
+ {
+ xPos++;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMinX <= 0.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos - 1, yPos, zPos)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos);
+ f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F;
+ f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F;
+ f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F;
+ f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F;
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1);
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1);
+
+ if (flag1)
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F);
+ }
+ else
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F);
+ }
+
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ render.renderFaceXNeg(block, xPos, yPos, zPos, texture);
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
+ {
+ if (render.renderMaxX >= 1.0D)
+ {
+ xPos++;
+ }
+
+ render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos);
+ render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos);
+ render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1);
+ render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1);
+ render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos);
+ boolean flag3 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos + 1, zPos)];
+ boolean flag2 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos - 1, zPos)];
+ boolean flag5 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos + 1)];
+ boolean flag4 = Block.canBlockGrass[render.blockAccess.getBlockId(xPos + 1, yPos, zPos - 1)];
+
+ if ((!flag2) && (!flag4))
+ {
+ render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN;
+ render.aoBrightnessXYZPNN = render.aoBrightnessXZPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1);
+ render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1);
+ }
+
+ if ((!flag2) && (!flag5))
+ {
+ render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP;
+ render.aoBrightnessXYZPNP = render.aoBrightnessXZPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1);
+ render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1);
+ }
+
+ if ((!flag3) && (!flag4))
+ {
+ render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN;
+ render.aoBrightnessXYZPPN = render.aoBrightnessXZPN;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1);
+ render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1);
+ }
+
+ if ((!flag3) && (!flag5))
+ {
+ render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP;
+ render.aoBrightnessXYZPPP = render.aoBrightnessXZPP;
+ }
+ else
+ {
+ render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1);
+ render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1);
+ }
+
+ if (render.renderMaxX >= 1.0D)
+ {
+ xPos--;
+ }
+
+ int i1 = l;
+
+ if ((render.renderMaxX >= 1.0D) || (!render.blockAccess.isBlockOpaqueCube(xPos + 1, yPos, zPos)))
+ {
+ i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos);
+ }
+
+ float f7 = block.getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos);
+ f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F;
+ f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F;
+ f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F;
+ f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F;
+ render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1);
+ render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1);
+ render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1);
+ render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1);
+
+ if (flag1)
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F);
+ }
+ else
+ {
+ render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F);
+ render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F);
+ render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F);
+ }
+
+ render.colorRedTopLeft *= f3;
+ render.colorGreenTopLeft *= f3;
+ render.colorBlueTopLeft *= f3;
+ render.colorRedBottomLeft *= f4;
+ render.colorGreenBottomLeft *= f4;
+ render.colorBlueBottomLeft *= f4;
+ render.colorRedBottomRight *= f5;
+ render.colorGreenBottomRight *= f5;
+ render.colorBlueBottomRight *= f5;
+ render.colorRedTopRight *= f6;
+ render.colorGreenTopRight *= f6;
+ render.colorBlueTopRight *= f6;
+ render.renderFaceXPos(block, xPos, yPos, zPos, texture);
+
+ flag = true;
+ }
+
+ render.enableAO = false;
+ return flag;
+ }
+
+ static boolean renderFakeBlockWithColorMultiplier(Icon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world)
+ {
+ Block block = Block.stone;
+ render.enableAO = false;
+ Tessellator tessellator = Tessellator.instance;
+ boolean flag = false;
+ float f3 = 0.5F;
+ float f4 = 1.0F;
+ float f5 = 0.8F;
+ float f6 = 0.6F;
+ float f7 = f4 * colorRed;
+ float f8 = f4 * colorGreen;
+ float f9 = f4 * colorBlue;
+ float f10 = f3;
+ float f11 = f5;
+ float f12 = f6;
+ float f13 = f3;
+ float f14 = f5;
+ float f15 = f6;
+ float f16 = f3;
+ float f17 = f5;
+ float f18 = f6;
+
+ if (block != Block.grass)
+ {
+ f10 = f3 * colorRed;
+ f11 = f5 * colorRed;
+ f12 = f6 * colorRed;
+ f13 = f3 * colorGreen;
+ f14 = f5 * colorGreen;
+ f15 = f6 * colorGreen;
+ f16 = f3 * colorBlue;
+ f17 = f5 * colorBlue;
+ f18 = f6 * colorBlue;
+ }
+
+ int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos);
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)))
+ {
+ tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos));
+ tessellator.setColorOpaque_F(f10, f13, f16);
+ render.renderFaceYNeg(block, xPos, yPos, zPos, texture);
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)))
+ {
+ tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos));
+ tessellator.setColorOpaque_F(f7, f8, f9);
+ render.renderFaceYPos(block, xPos, yPos, zPos, texture);
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)))
+ {
+ tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1));
+ tessellator.setColorOpaque_F(f11, f14, f17);
+ render.renderFaceZNeg(block, xPos, yPos, zPos, texture);
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)))
+ {
+ tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1));
+ tessellator.setColorOpaque_F(f11, f14, f17);
+ render.renderFaceZPos(block, xPos, yPos, zPos, texture);
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)))
+ {
+ tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos));
+ tessellator.setColorOpaque_F(f12, f15, f18);
+ render.renderFaceXNeg(block, xPos, yPos, zPos, texture);
+
+ flag = true;
+ }
+
+ if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)))
+ {
+ tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos));
+ tessellator.setColorOpaque_F(f12, f15, f18);
+ render.renderFaceXPos(block, xPos, yPos, zPos, texture);
+
+ flag = true;
+ }
+
+ return flag;
+ }
+}
diff --git a/tconstruct/client/block/SearedRender.java b/tconstruct/client/block/SearedRender.java
index 94b7befd..c6ece04f 100644
--- a/tconstruct/client/block/SearedRender.java
+++ b/tconstruct/client/block/SearedRender.java
@@ -253,6 +253,10 @@ public class SearedRender implements ISimpleBlockRenderingHandler
{
yMin = -1F;
}
+ else if (uID == TContent.castingChannel.blockID)
+ {
+ yMin = -0.5F;
+ }
if (logic.liquid != null)
{
diff --git a/tconstruct/client/gui/SmelteryGui.java b/tconstruct/client/gui/SmelteryGui.java
index 8720fc11..b665f0ac 100644
--- a/tconstruct/client/gui/SmelteryGui.java
+++ b/tconstruct/client/gui/SmelteryGui.java
@@ -307,6 +307,17 @@ public class SmelteryGui extends NewContainerGui
list.add("mB: " + mB);
}
}
+ else if (name.equals("Molten Glass"))
+ {
+ int ingots = liquid.amount / 1000;
+ if (ingots > 0)
+ list.add("Blocks: " + ingots);
+ int mB = liquid.amount % 144;
+ if (mB > 0)
+ {
+ list.add("mB: " + mB);
+ }
+ }
else
{
int mB = liquid.amount;
diff --git a/tconstruct/client/gui/ToolStationGui.java b/tconstruct/client/gui/ToolStationGui.java
index 40840687..c828c452 100644
--- a/tconstruct/client/gui/ToolStationGui.java
+++ b/tconstruct/client/gui/ToolStationGui.java
@@ -157,7 +157,7 @@ public class ToolStationGui extends NewContainerGui
*/
protected void drawGuiContainerForegroundLayer (int par1, int par2)
{
- this.fontRenderer.drawString(StatCollector.translateToLocal("crafters.ToolStation"), 6, 8, 0x000000);
+ this.fontRenderer.drawString(StatCollector.translateToLocal(logic.getInvName()), 6, 8, 0x000000);
this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 0x000000);
this.fontRenderer.drawString(toolName + "_", this.xSize / 2 - 18, 8, 0xffffff);
diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java
index 4945c2ad..df4ba15d 100644
--- a/tconstruct/common/TContent.java
+++ b/tconstruct/common/TContent.java
@@ -31,6 +31,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import tconstruct.TConstruct;
import tconstruct.blocks.Aggregator;
+import tconstruct.blocks.CastingChannelBlock;
import tconstruct.blocks.CraftingSlab;
import tconstruct.blocks.CraftingStationBlock;
import tconstruct.blocks.DryingRack;
@@ -63,6 +64,7 @@ import tconstruct.blocks.TMetalBlock;
import tconstruct.blocks.ToolForgeBlock;
import tconstruct.blocks.ToolStationBlock;
import tconstruct.blocks.logic.CastingBasinLogic;
+import tconstruct.blocks.logic.CastingChannelLogic;
import tconstruct.blocks.logic.CastingTableLogic;
import tconstruct.blocks.logic.CraftingStationLogic;
import tconstruct.blocks.logic.DrawbridgeLogic;
@@ -119,6 +121,7 @@ import tconstruct.items.ToolShard;
import tconstruct.items.armor.HeartCanister;
import tconstruct.items.armor.Knapsack;
import tconstruct.items.blocks.BarricadeItem;
+import tconstruct.items.blocks.CastingChannelItem;
import tconstruct.items.blocks.CraftedSoilItemBlock;
import tconstruct.items.blocks.CraftingSlabItemBlock;
import tconstruct.items.blocks.GlassBlockItem;
@@ -291,12 +294,14 @@ public class TContent implements IFuelHandler
public static Block toolForge;
public static Block craftingStationWood;
public static Block craftingSlabWood;
+
public static Block heldItemBlock;
public static Block craftedSoil;
public static Block smeltery;
public static Block lavaTank;
public static Block searedBlock;
+ public static Block castingChannel;
public static Block metalBlock;
public static Block redstoneMachine;
@@ -413,6 +418,7 @@ public class TContent implements IFuelHandler
//Tool modifiers
public static ModElectric modE;
public static ModLapis modL;
+
//Wearables
public static Item heavyHelmet;
public static Item heavyChestplate;
@@ -505,10 +511,13 @@ public class TContent implements IFuelHandler
toolForge = new ToolForgeBlock(PHConstruct.toolForge, Material.iron).setUnlocalizedName("ToolForge");
GameRegistry.registerBlock(toolForge, ToolForgeItemBlock.class, "ToolForgeBlock");
GameRegistry.registerTileEntity(ToolForgeLogic.class, "ToolForge");
-
+
craftingStationWood = new CraftingStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("CraftingStation");
GameRegistry.registerBlock(craftingStationWood, "CraftingStation");
GameRegistry.registerTileEntity(CraftingStationLogic.class, "CraftingStation");
+
+ craftingSlabWood = new CraftingSlab(PHConstruct.woodCrafterSlab, Material.wood).setUnlocalizedName("CraftingSlab");
+ GameRegistry.registerBlock(craftingSlabWood, CraftingSlabItemBlock.class, "CraftingSlab");
craftingStationWood = new CraftingStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("CraftingStation");
GameRegistry.registerBlock(craftingStationWood, "CraftingStation");
@@ -539,10 +548,11 @@ public class TContent implements IFuelHandler
meatBlock = new MeatBlock(PHConstruct.meatBlock).setUnlocalizedName("tconstruct.meatblock");
GameRegistry.registerBlock(meatBlock, "MeatBlock");
+
OreDictionary.registerOre("hambone", new ItemStack(meatBlock));
LanguageRegistry.addName(meatBlock, "Hambone");
GameRegistry.addRecipe(new ItemStack(meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Item.bone), 'm', new ItemStack(Item.porkRaw));
-
+
woolSlab1 = new SlabBase(PHConstruct.woolSlab1, Material.cloth, Block.cloth, 0, 8).setUnlocalizedName("cloth");
woolSlab1.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations);
GameRegistry.registerBlock(woolSlab1, WoolSlab1Item.class, "WoolSlab1");
@@ -568,33 +578,38 @@ public class TContent implements IFuelHandler
GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet");
GameRegistry.registerTileEntity(CastingBasinLogic.class, "CastingBasin");
+ castingChannel = (new CastingChannelBlock(PHConstruct.castingChannel)).setUnlocalizedName("CastingChannel");
+ GameRegistry.registerBlock(castingChannel, CastingChannelItem.class, "CastingChannel");
+ GameRegistry.registerTileEntity(CastingChannelLogic.class, "CastingChannel");
+
//Redstone machines
redstoneMachine = new RedstoneMachine(PHConstruct.redstoneMachine).setUnlocalizedName("Redstone.Machine");
GameRegistry.registerBlock(redstoneMachine, RedstoneMachineItem.class, "Redstone.Machine");
GameRegistry.registerTileEntity(DrawbridgeLogic.class, "Drawbridge");
GameRegistry.registerTileEntity(FirestarterLogic.class, "Firestarter");
-
+
essenceExtractor = new EssenceExtractor(PHConstruct.essenceExtractor).setHardness(12f).setUnlocalizedName("extractor.essence");
GameRegistry.registerBlock(essenceExtractor, "extractor.essence");
GameRegistry.registerTileEntity(EssenceExtractorLogic.class, "extractor.essence");
-
+
//Traps
- landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(TConstructRegistry.blockTab).setUnlocalizedName("landmine");
+ landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(TConstructRegistry.blockTab)
+ .setUnlocalizedName("landmine");
GameRegistry.registerBlock(landmine, ItemBlockLandmine.class, "Redstone.Landmine");
GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine");
-
+
punji = new Punji(PHConstruct.punji).setUnlocalizedName("trap.punji");
GameRegistry.registerBlock(punji, "trap.punji");
-
+
barricadeOak = new BarricadeBlock(PHConstruct.barricadeOak, Block.wood, 0).setUnlocalizedName("trap.barricade.oak");
GameRegistry.registerBlock(barricadeOak, BarricadeItem.class, "trap.barricade.oak");
-
+
barricadeSpruce = new BarricadeBlock(PHConstruct.barricadeSpruce, Block.wood, 1).setUnlocalizedName("trap.barricade.spruce");
GameRegistry.registerBlock(barricadeSpruce, BarricadeItem.class, "trap.barricade.spruce");
-
+
barricadeBirch = new BarricadeBlock(PHConstruct.barricadeBirch, Block.wood, 2).setUnlocalizedName("trap.barricade.birch");
GameRegistry.registerBlock(barricadeBirch, BarricadeItem.class, "trap.barricade.birch");
-
+
barricadeJungle = new BarricadeBlock(PHConstruct.barricadeJungle, Block.wood, 3).setUnlocalizedName("trap.barricade.jungle");
GameRegistry.registerBlock(barricadeJungle, BarricadeItem.class, "trap.barricade.jungle");
@@ -860,7 +875,7 @@ public class TContent implements IFuelHandler
slimeGel = new SlimeGel(PHConstruct.slimeGel).setStepSound(slimeStep).setUnlocalizedName("slime.gel");
GameRegistry.registerBlock(slimeGel, SlimeGelItemBlock.class, "slime.gel");
-
+
slimeGrass = new SlimeGrass(PHConstruct.slimeGrass).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("slime.grass");
GameRegistry.registerBlock(slimeGrass, SlimeGrassItemBlock.class, "slime.grass");
@@ -869,7 +884,7 @@ public class TContent implements IFuelHandler
slimeLeaves = (SlimeLeaves) new SlimeLeaves(PHConstruct.slimeLeaves).setStepSound(slimeStep).setUnlocalizedName("slime.leaves");
GameRegistry.registerBlock(slimeLeaves, SlimeLeavesItemBlock.class, "slime.leaves");
-
+
slimeSapling = (SlimeSapling) new SlimeSapling(PHConstruct.slimeSapling).setStepSound(slimeStep).setUnlocalizedName("slime.sapling");
GameRegistry.registerBlock(slimeSapling, SlimeSaplingItemBlock.class, "slime.sapling");
@@ -1054,7 +1069,7 @@ public class TContent implements IFuelHandler
//heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots");
//glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove");
knapsack = new Knapsack(PHConstruct.knapsack).setUnlocalizedName("tconstruct.storage");
-
+
//Crystalline
essenceCrystal = new EssenceCrystal(PHConstruct.essenceCrystal).setUnlocalizedName("tconstruct.crystal.essence");
goldHead = new GoldenHead(PHConstruct.goldHead, 4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead");
@@ -1093,6 +1108,7 @@ public class TContent implements IFuelHandler
Item.minecartEmpty.setMaxStackSize(3);
Item.minecartCrate.setMaxStackSize(3);
Item.minecartPowered.setMaxStackSize(3);
+ Item.itemsList[Block.cake.blockID].setMaxStackSize(16);
//Block.torchWood.setTickRandomly(false);
}
@@ -1649,6 +1665,9 @@ public class TContent implements IFuelHandler
if (PHConstruct.stencilTableCrafting)
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "plankWood"));
+ GameRegistry.addShapelessRecipe(new ItemStack(Item.book, 1, 0), new ItemStack(blankPattern, 1, 0), new ItemStack(blankPattern, 1, 0), new ItemStack(Item.paper, 1, 0), new ItemStack(
+ Item.paper, 1, 0), new ItemStack(Item.paper, 1, 0), new ItemStack(Item.silk, 1, 0));
+
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood"));
GameRegistry.addRecipe(new ItemStack(manualBook), "wp", 'w', new ItemStack(blankPattern, 1, 0), 'p', Item.paper);
GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 0), new ItemStack(manualBook, 1, 0), Item.book);
@@ -1778,6 +1797,8 @@ public class TContent implements IFuelHandler
GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); //Faucet
GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); //Basin
+ GameRegistry.addRecipe(new ItemStack(castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); //Channel
+
GameRegistry.addRecipe(new ItemStack(Block.pumpkinLantern, 1, 0), "p", "s", 'p', new ItemStack(Block.pumpkin), 'w', new ItemStack(stoneTorch));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stoneTorch, 4), "p", "w", 'p', new ItemStack(Item.coal, 1, Short.MAX_VALUE), 'w', "stoneRod"));
GameRegistry.addRecipe(new ItemStack(toolRod, 4, 1), "c", "c", 'c', new ItemStack(Block.stone));
@@ -1821,11 +1842,17 @@ public class TContent implements IFuelHandler
GameRegistry.addRecipe(new ItemStack(Item.goldenCarrot), surround, '#', new ItemStack(Item.ingotGold), 'm', new ItemStack(Item.carrot));
GameRegistry.addRecipe(new ItemStack(goldHead), surround, '#', new ItemStack(Item.ingotGold), 'm', new ItemStack(Item.skull, 1, 3));
GameRegistry.addShapelessRecipe(new ItemStack(Item.speckledMelon), new ItemStack(Block.blockGold), new ItemStack(Item.melon));
+ tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue*8), new ItemStack(Item.appleRed), true, 50);
}
else
{
GameRegistry.addRecipe(new ItemStack(goldHead), surround, '#', new ItemStack(Item.goldNugget), 'm', new ItemStack(Item.skull, 1, 3));
+ GameRegistry.addRecipe(new ItemStack(Item.appleGold), surround, '#', new ItemStack(oreBerries, 1, 1), 'm', new ItemStack(Item.appleRed));
+ GameRegistry.addRecipe(new ItemStack(Item.goldenCarrot), surround, '#', new ItemStack(oreBerries, 1, 1), 'm', new ItemStack(Item.appleRed));
+ GameRegistry.addRecipe(new ItemStack(goldHead), surround, '#', new ItemStack(oreBerries, 1, 1), 'm', new ItemStack(Item.appleRed));
+ tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue/9*8), new ItemStack(Item.appleRed), true, 50);
}
+ tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1, 1), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue*8*9), new ItemStack(Item.appleRed), true, 50);
//Drying rack
DryingRackRecipes.addDryingRecipe(Item.rottenFlesh, 20 * 60 * 5, Item.leather);
@@ -1870,13 +1897,13 @@ public class TContent implements IFuelHandler
GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 5), "b", 'b', new ItemStack(toolForge, 1, Short.MAX_VALUE));
GameRegistry.addRecipe(new ItemStack(essenceExtractor, 1, 0), " b ", "eme", "mmm", 'b', Item.book, 'e', Item.emerald, 'm', Block.whiteStone);
-
+
//Slime
GameRegistry.addRecipe(new ItemStack(slimeGel, 1, 0), "##", "##", '#', strangeFood);
GameRegistry.addRecipe(new ItemStack(strangeFood, 4, 0), "#", '#', new ItemStack(slimeGel, 1, 0));
GameRegistry.addRecipe(new ItemStack(slimeGel, 1, 1), "##", "##", '#', Item.slimeBall);
GameRegistry.addRecipe(new ItemStack(Item.slimeBall, 4, 0), "#", '#', new ItemStack(slimeGel, 1, 1));
-
+
}
void setupToolTabs ()
diff --git a/tconstruct/common/TProxyCommon.java b/tconstruct/common/TProxyCommon.java
index 0b7515ef..37c42f25 100644
--- a/tconstruct/common/TProxyCommon.java
+++ b/tconstruct/common/TProxyCommon.java
@@ -29,9 +29,9 @@ public class TProxyCommon implements IGuiHandler
public static int frypanGuiID = 4;
public static int toolForgeID = 5;
public static int smelteryGuiID = 7;
- public static int glowstoneAggregatorGui = 8;
- public static int drawbridgeGui = 9;
- public static int landmineGui = 10;
+ public static int glowstoneAggregatorID = 8;
+ public static int drawbridgeID = 9;
+ public static int landmineID = 10;
public static int craftingStationID = 11;
public static int inventoryGui = 100;
public static int armorGuiID = 101;
@@ -43,16 +43,11 @@ public class TProxyCommon implements IGuiHandler
@Override
public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z)
- {
-
- if (ID == landmineGui){
- return new ContainerLandmine(player, (TileEntityLandmine)world.getBlockTileEntity(x, y, z));
- }
-
+ {
if (ID < 0)
return null;
- if (ID == landmineGui){
+ if (ID == landmineID){
return new ContainerLandmine(player, (TileEntityLandmine)world.getBlockTileEntity(x, y, z));
}
@@ -199,6 +194,7 @@ public class TProxyCommon implements IGuiHandler
LanguageRegistry.addName(TContent.knapsack, "Knapsack");
LanguageRegistry.addName(TContent.shortbow, "Shortbow");
LanguageRegistry.addName(TContent.arrow, "Arrow");
+ LanguageRegistry.addName(TContent.meatBlock, "Hambone");
}
diff --git a/tconstruct/entity/Automaton.java b/tconstruct/entity/Automaton.java
index 0079f340..74001cbe 100644
--- a/tconstruct/entity/Automaton.java
+++ b/tconstruct/entity/Automaton.java
@@ -1,6 +1,7 @@
package tconstruct.entity;
import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import tconstruct.entity.ai.GAIAttackTarget;
import tconstruct.entity.ai.GAIFindTarget;
@@ -67,7 +68,9 @@ public class Automaton extends GolemBase
public boolean interact (EntityPlayer par1EntityPlayer)
{
- this.setCurrentItemOrArmor(0, par1EntityPlayer.getCurrentEquippedItem().copy());
+ ItemStack equipped = par1EntityPlayer.getCurrentEquippedItem();
+ if (equipped != null)
+ this.setCurrentItemOrArmor(0, equipped.copy());
return true;
}
}
diff --git a/tconstruct/entity/GolemBase.java b/tconstruct/entity/GolemBase.java
index 720457c1..416b51cc 100644
--- a/tconstruct/entity/GolemBase.java
+++ b/tconstruct/entity/GolemBase.java
@@ -1,29 +1,23 @@
package tconstruct.entity;
import java.lang.ref.WeakReference;
+import java.util.Iterator;
+import java.util.List;
import java.util.Random;
-import tconstruct.library.tools.AbilityHelper;
-import tconstruct.library.tools.ToolCore;
-
-
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.enchantment.EnchantmentThorns;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.IEntityMultiPart;
-import net.minecraft.entity.boss.EntityDragonPart;
+import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
-import net.minecraft.potion.Potion;
-import net.minecraft.util.DamageSource;
import net.minecraft.util.Icon;
-import net.minecraft.util.MathHelper;
+import net.minecraft.util.ReportedException;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -49,6 +43,7 @@ public class GolemBase extends EntityCreature implements IInventory
{
super(world);
setupInventory();
+ //setCanPickUpLoot(true);
}
public void setupInventory ()
@@ -120,8 +115,8 @@ public class GolemBase extends EntityCreature implements IInventory
if (!paused)
super.updateWanderPath();
}
-
- public boolean standby()
+
+ public boolean standby ()
{
return false;
}
@@ -293,6 +288,33 @@ public class GolemBase extends EntityCreature implements IInventory
}
/* Inventory */
+
+ @Override
+ public void onLivingUpdate ()
+ {
+ super.onLivingUpdate();
+ if (!this.worldObj.isRemote && !this.dead && this.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"))
+ {
+ List list = this.worldObj.getEntitiesWithinAABB(EntityItem.class, this.boundingBox.expand(1.5D, 0.0D, 1.5D));
+ Iterator iterator = list.iterator();
+
+ while (iterator.hasNext())
+ {
+ EntityItem entityitem = (EntityItem) iterator.next();
+
+ if (!entityitem.isDead && entityitem.getEntityItem() != null)
+ {
+ ItemStack itemstack = entityitem.getEntityItem();
+ if (addItemStackToInventory(itemstack))
+ {
+ this.playSound("random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
+ entityitem.setDead();
+ }
+ }
+ }
+ }
+ }
+
@Override
public ItemStack getStackInSlot (int slot)
{
@@ -354,6 +376,164 @@ public class GolemBase extends EntityCreature implements IInventory
}
}
+ /* Inventory Management */
+
+ public boolean addItemStackToInventory (ItemStack par1ItemStack)
+ {
+ if (par1ItemStack == null)
+ {
+ return false;
+ }
+ else
+ {
+ try
+ {
+ int i;
+
+ if (par1ItemStack.isItemDamaged())
+ {
+ i = this.getFirstEmptyStack();
+
+ if (i >= 0)
+ {
+ this.inventory[i] = ItemStack.copyItemStack(par1ItemStack);
+ this.inventory[i].animationsToGo = 5;
+ par1ItemStack.stackSize = 0;
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
+ do
+ {
+ i = par1ItemStack.stackSize;
+ par1ItemStack.stackSize = this.storePartialItemStack(par1ItemStack);
+ } while (par1ItemStack.stackSize > 0 && par1ItemStack.stackSize < i);
+
+ return par1ItemStack.stackSize < i;
+ }
+ }
+ catch (Throwable throwable)
+ {
+ CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Adding item to inventory");
+ CrashReportCategory crashreportcategory = crashreport.makeCategory("Item being added");
+ crashreportcategory.addCrashSection("Item ID", Integer.valueOf(par1ItemStack.itemID));
+ crashreportcategory.addCrashSection("Item data", Integer.valueOf(par1ItemStack.getItemDamage()));
+ throw new ReportedException(crashreport);
+ }
+ }
+ }
+
+ public int getFirstEmptyStack () //Equipped?
+ {
+ for (int i = 0; i < this.inventory.length; ++i)
+ {
+ if (this.inventory[i] == null)
+ {
+ return i;
+ }
+ }
+
+ return -1;
+ }
+
+ private int storePartialItemStack (ItemStack par1ItemStack)
+ {
+ int i = par1ItemStack.itemID;
+ int j = par1ItemStack.stackSize;
+ int k;
+
+ if (par1ItemStack.getMaxStackSize() == 1)
+ {
+ k = this.getFirstEmptyStack();
+
+ if (k < 0)
+ {
+ return j;
+ }
+ else
+ {
+ if (this.inventory[k] == null)
+ {
+ this.inventory[k] = ItemStack.copyItemStack(par1ItemStack);
+ }
+
+ return 0;
+ }
+ }
+ else
+ {
+ k = this.storeItemStack(par1ItemStack);
+
+ if (k < 0)
+ {
+ k = this.getFirstEmptyStack();
+ }
+
+ if (k < 0)
+ {
+ return j;
+ }
+ else
+ {
+ if (this.inventory[k] == null)
+ {
+ this.inventory[k] = new ItemStack(i, 0, par1ItemStack.getItemDamage());
+
+ if (par1ItemStack.hasTagCompound())
+ {
+ this.inventory[k].setTagCompound((NBTTagCompound) par1ItemStack.getTagCompound().copy());
+ }
+ }
+
+ int l = j;
+
+ if (j > this.inventory[k].getMaxStackSize() - this.inventory[k].stackSize)
+ {
+ l = this.inventory[k].getMaxStackSize() - this.inventory[k].stackSize;
+ }
+
+ if (l > this.getInventoryStackLimit() - this.inventory[k].stackSize)
+ {
+ l = this.getInventoryStackLimit() - this.inventory[k].stackSize;
+ }
+
+ if (l == 0)
+ {
+ return j;
+ }
+ else
+ {
+ j -= l;
+ this.inventory[k].stackSize += l;
+ this.inventory[k].animationsToGo = 5;
+ return j;
+ }
+ }
+ }
+ }
+
+ private int storeItemStack (ItemStack par1ItemStack)
+ {
+ for (int i = 0; i < this.inventory.length; ++i)
+ {
+ if (this.inventory[i] != null && this.inventory[i].itemID == par1ItemStack.itemID && this.inventory[i].isStackable() && this.inventory[i].stackSize < this.inventory[i].getMaxStackSize()
+ && this.inventory[i].stackSize < this.getInventoryStackLimit() && (!this.inventory[i].getHasSubtypes() || this.inventory[i].getItemDamage() == par1ItemStack.getItemDamage())
+ && ItemStack.areItemStackTagsEqual(this.inventory[i], par1ItemStack))
+ {
+ return i;
+ }
+ }
+
+ return -1;
+ }
+
+ /* Misc */
+
@Override
public String getInvName ()
{
diff --git a/tconstruct/entity/ai/GAIFellTree.java b/tconstruct/entity/ai/GAIFellTree.java
index ebad4b85..53ce9485 100644
--- a/tconstruct/entity/ai/GAIFellTree.java
+++ b/tconstruct/entity/ai/GAIFellTree.java
@@ -15,9 +15,9 @@ public class GAIFellTree extends GolemAIBase
public static int cutRange = 4;
public static double cutSpeed = 2.5;
- public GAIFellTree(GolemBase doll)
+ public GAIFellTree(GolemBase golem)
{
- super(doll);
+ super(golem);
this.setMutexBits(3);
}
diff --git a/tconstruct/items/blocks/CastingChannelItem.java b/tconstruct/items/blocks/CastingChannelItem.java
new file mode 100644
index 00000000..401beda2
--- /dev/null
+++ b/tconstruct/items/blocks/CastingChannelItem.java
@@ -0,0 +1,33 @@
+package tconstruct.items.blocks;
+
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MathHelper;
+
+public class CastingChannelItem extends ItemBlock
+{
+ public static final String blockType[] = { "Channel" };
+
+ public CastingChannelItem(int id)
+ {
+ super(id);
+ setMaxDamage(0);
+ setHasSubtypes(true);
+ }
+
+ public int getMetadata (int meta)
+ {
+ return meta;
+ }
+
+ public String getUnlocalizedName (ItemStack itemstack)
+ {
+ int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
+ return (new StringBuilder()).append("Smeltery.").append(blockType[pos]).toString();
+ }
+}
diff --git a/tconstruct/landmine/block/BlockLandmine.java b/tconstruct/landmine/block/BlockLandmine.java
index edb4da72..37ca363c 100644
--- a/tconstruct/landmine/block/BlockLandmine.java
+++ b/tconstruct/landmine/block/BlockLandmine.java
@@ -117,7 +117,7 @@ public class BlockLandmine extends BlockContainer {
@Override
public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) {
- par5EntityPlayer.openGui(TConstruct.instance, TProxyCommon.landmineGui, par1World, par2, par3, par4);
+ par5EntityPlayer.openGui(TConstruct.instance, TProxyCommon.landmineID, par1World, par2, par3, par4);
return true;
}
diff --git a/tconstruct/library/blocks/InventoryBlock.java b/tconstruct/library/blocks/InventoryBlock.java
index 9e651044..243c2683 100644
--- a/tconstruct/library/blocks/InventoryBlock.java
+++ b/tconstruct/library/blocks/InventoryBlock.java
@@ -15,7 +15,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.util.Icon;
+import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@@ -139,6 +141,11 @@ public abstract class InventoryBlock extends BlockContainer
direction.setDirection(entityliving.rotationYaw * 4F, entityliving.rotationPitch, entityliving);
}
}
+
+ if (stack.hasDisplayName())
+ {
+ ((InventoryLogic)world.getBlockTileEntity(x, y, z)).setInvName(stack.getDisplayName());
+ }
}
public static boolean isActive (IBlockAccess world, int x, int y, int z)
diff --git a/tconstruct/library/blocks/InventoryLogic.java b/tconstruct/library/blocks/InventoryLogic.java
index 4ea51da8..b38e9ab7 100644
--- a/tconstruct/library/blocks/InventoryLogic.java
+++ b/tconstruct/library/blocks/InventoryLogic.java
@@ -158,6 +158,11 @@ public abstract class InventoryLogic extends TileEntity implements IInventory
}
protected abstract String getDefaultName ();
+
+ public void setInvName(String name)
+ {
+ this.invName = name;
+ }
public String getInvName ()
{
diff --git a/tconstruct/library/util/Trait.java b/tconstruct/library/util/Trait.java
new file mode 100644
index 00000000..3891303d
--- /dev/null
+++ b/tconstruct/library/util/Trait.java
@@ -0,0 +1,123 @@
+package tconstruct.library.util;
+
+import java.util.Random;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+
+//Quantitive Trait Locus
+public class Trait
+{
+ protected int[] alleles;
+ static Random rand = new Random();
+ String traitName;
+
+ public Trait(String name, NBTTagCompound tags)
+ {
+ traitName = name;
+ loadFromNBT(tags);
+ }
+
+ public Trait(int[] alleles)
+ {
+ this.alleles = alleles;
+ }
+
+ public Trait(int minimum, int maximum, int quantity, boolean bellCurve)
+ {
+ this.alleles = new int[quantity];
+ if (bellCurve)
+ {
+ for (int i = 0; i < alleles.length; i++)
+ {
+ int value = (int) (rand.nextGaussian() * (maximum + 1) + minimum);
+ alleles[i] = value;
+ }
+ }
+ else
+ {
+ for (int i = 0; i < alleles.length; i++)
+ {
+ int value = rand.nextInt(maximum + 1) + minimum;
+ alleles[i] = value;
+ }
+ }
+ }
+
+ public Trait setName(String name)
+ {
+ this.traitName = name;
+ return this;
+ }
+
+ public int getAverage ()
+ {
+ int average = 0;
+
+ if (alleles.length > 0)
+ {
+ for (byte i = 0; i < alleles.length; i++)
+ average += alleles[i];
+
+ average /= alleles.length;
+ }
+
+ return average;
+ }
+
+ public Trait breed(byte[] other, float mutationChance, float mutationVariance)
+ {
+ int[] newAlleles = breedNumbers(other, mutationChance, mutationVariance);
+ Trait trait = new Trait(newAlleles).setName(this.traitName);
+ return trait;
+ }
+
+ public int[] breedNumbers (byte[] other, float mutationChance, float mutationVariance)
+ {
+ assert alleles.length == other.length : "Complete trait arrays need to have identical length";
+
+ int[] result = new int[alleles.length > other.length ? alleles.length : other.length];
+
+ for (int i = 0; i < result.length; i++)
+ {
+ if (rand.nextFloat() < mutationChance)
+ {
+ result[i] = mutate(alleles[i], other[i], mutationVariance);
+ }
+ else
+ {
+ result[i] = rand.nextBoolean() ? alleles[i] : other[i];
+ }
+ }
+
+ return result;
+ }
+
+ //Assumes linear progression from worst to best. Use other methods for other types
+ protected int mutate (int allele, int other, float variance)
+ {
+ int mutator = rand.nextBoolean() ? allele : other;
+ double bellcurve = rand.nextGaussian();
+ double offset = variance * bellcurve;
+ offset -= offset / 2;
+
+ if (mutator + offset < 0)
+ mutator = 0;
+ else if (mutator + offset > Integer.MAX_VALUE)
+ mutator = Integer.MAX_VALUE;
+ else
+ mutator = (int) (mutator + offset);
+
+ return mutator;
+ }
+
+ public void saveToNBT(NBTTagCompound tags)
+ {
+ tags.setIntArray(traitName+".Alleles", alleles);
+ }
+
+ public void loadFromNBT(NBTTagCompound tags)
+ {
+ alleles = tags.getIntArray(traitName+".Alleles");
+ }
+}
diff --git a/tconstruct/util/PHConstruct.java b/tconstruct/util/PHConstruct.java
index cfa6a46e..a7d97c9b 100644
--- a/tconstruct/util/PHConstruct.java
+++ b/tconstruct/util/PHConstruct.java
@@ -153,6 +153,12 @@ public class PHConstruct
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);
+ 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);
@@ -367,7 +373,7 @@ public class PHConstruct
public static int heldItemBlock;
public static int woodCrafter;
public static int woodCrafterSlab;
-
+
public static int ores;
public static int lavaTank;
public static int smeltery;
diff --git a/test/XinStick.java b/test/XinStick.java
index b554da12..d8540c77 100644
--- a/test/XinStick.java
+++ b/test/XinStick.java
@@ -3,7 +3,6 @@ package test;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.passive.EntityChicken;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -40,9 +39,9 @@ public class XinStick extends Item
entity.setOwner(player);
//entity.setCustomNameTag("Cutie");
spawnEntity(player.posX, player.posY + 1, player.posZ, entity, world, player);
- EntityChicken chicken = new EntityChicken(world);
+ /*EntityChicken chicken = new EntityChicken(world);
spawnEntity(player.posX, player.posY + 1, player.posZ, chicken, world, player);
- entity.mountEntity(chicken);
+ entity.mountEntity(chicken);*/
//healPlayer(player);
//removeChunk(world, player.posX, player.posZ);
return stack;