Catchup
No files matched your search
@@ -0,0 +1,36 @@
|
||||
package mods.tinker.common;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.CraftingManager;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.item.crafting.ShapedRecipes;
|
||||
|
||||
public class RecipeRemover
|
||||
{
|
||||
public static void removeShapedRecipes(List<ItemStack> removelist)
|
||||
{
|
||||
for (ItemStack stack : removelist)
|
||||
removeShapedRecipe(stack);
|
||||
}
|
||||
|
||||
public static void removeShapedRecipe (ItemStack resultItem)
|
||||
{
|
||||
List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList();
|
||||
for (int i = 0; i < recipes.size(); i++)
|
||||
{
|
||||
IRecipe tmpRecipe = recipes.get(i);
|
||||
if (tmpRecipe instanceof ShapedRecipes)
|
||||
{
|
||||
ShapedRecipes recipe = (ShapedRecipes) tmpRecipe;
|
||||
ItemStack recipeResult = recipe.getRecipeOutput();
|
||||
|
||||
if (ItemStack.areItemStacksEqual(resultItem, recipeResult))
|
||||
{
|
||||
recipes.remove(i--);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -39,12 +39,22 @@ public class PHConstruct {
|
||||
* Avoid values below 4096 for items and in the 250-450 range for blocks
|
||||
*/
|
||||
|
||||
removeToolRecipes = config.get("Diffuclty Changes", "Remove vanilla tool recipes", false).getBoolean(false);
|
||||
keepHunger = config.get("Diffuclty Changes", "Keep hunger on death", true).getBoolean(true);
|
||||
keepLevels = config.get("Diffuclty Changes", "Keep levels on death", true).getBoolean(true);
|
||||
//removeToolRecipes = config.get("Diffuclty Changes", "Remove vanilla tool recipes", false).getBoolean(false);
|
||||
keepHunger = config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true);
|
||||
keepLevels = config.get("Difficulty Changes", "Keep levels on death", true).getBoolean(true);
|
||||
|
||||
disableWoodTools = config.get("Difficulty Changes", "Disable vanilla wooden tools", false).getBoolean(false);
|
||||
disableStoneTools = config.get("Difficulty Changes", "Disable vanilla stone tools", true).getBoolean(true);
|
||||
disableIronTools = config.get("Difficulty Changes", "Disable vanilla iron tools", true).getBoolean(true);
|
||||
disableDiamondTools = config.get("Difficulty Changes", "Disable vanilla diamond tools", true).getBoolean(true);
|
||||
disableGoldTools = config.get("Difficulty Changes", "Disable vanilla gold tools", true).getBoolean(true);
|
||||
|
||||
enableTWood = config.get("Difficulty Changes", "Enable mod wooden tools", true).getBoolean(true);
|
||||
enableTStone = config.get("Difficulty Changes", "Enable mod stone tools", true).getBoolean(true);
|
||||
enableTCactus = config.get("Difficulty Changes", "Enable mod cactus tools", true).getBoolean(true);
|
||||
enableTBone = config.get("Difficulty Changes", "Enable mod bone tools", true).getBoolean(true);
|
||||
|
||||
woodCrafter = config.getBlock("Wood Tool Station", 1471).getInt(1471);
|
||||
|
||||
heldItemBlock = config.getBlock("Held Item Block", 1472).getInt(1472);
|
||||
lavaTank = config.getBlock("Lava Tank", 1473).getInt(1473);
|
||||
smeltery = config.getBlock("Smeltery", 1474).getInt(1474);
|
||||
@@ -219,7 +229,17 @@ public class PHConstruct {
|
||||
public static int netherDensity;
|
||||
|
||||
//Difficulty modifiers
|
||||
public static boolean removeToolRecipes;
|
||||
public static boolean keepHunger;
|
||||
public static boolean keepLevels;
|
||||
|
||||
public static boolean disableWoodTools;
|
||||
public static boolean disableStoneTools;
|
||||
public static boolean disableIronTools;
|
||||
public static boolean disableDiamondTools;
|
||||
public static boolean disableGoldTools;
|
||||
|
||||
public static boolean enableTWood;
|
||||
public static boolean enableTStone;
|
||||
public static boolean enableTCactus;
|
||||
public static boolean enableTBone;
|
||||
}
|
||||
@@ -1,16 +1,20 @@
|
||||
package mods.tinker.tconstruct;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import mods.tinker.common.IPattern;
|
||||
import mods.tinker.common.RecipeRemover;
|
||||
import mods.tinker.common.fancyitem.FancyEntityItem;
|
||||
import mods.tinker.tconstruct.blocks.EquipBlock;
|
||||
import mods.tinker.tconstruct.blocks.LavaTankBlock;
|
||||
import mods.tinker.tconstruct.blocks.LiquidMetalFlowing;
|
||||
import mods.tinker.tconstruct.blocks.LiquidMetalStill;
|
||||
import mods.tinker.tconstruct.blocks.MetalOre;
|
||||
import mods.tinker.tconstruct.blocks.SearedBlock;
|
||||
import mods.tinker.tconstruct.blocks.SmelteryBlock;
|
||||
import mods.tinker.tconstruct.blocks.TConstructBlock;
|
||||
import mods.tinker.tconstruct.blocks.ToolStationBlock;
|
||||
import mods.tinker.tconstruct.blocks.liquids.LiquidMetalFlowing;
|
||||
import mods.tinker.tconstruct.blocks.liquids.LiquidMetalStill;
|
||||
import mods.tinker.tconstruct.crafting.LiquidCasting;
|
||||
import mods.tinker.tconstruct.crafting.PatternBuilder;
|
||||
import mods.tinker.tconstruct.crafting.Smeltery;
|
||||
@@ -324,7 +328,7 @@ public class TContent implements IFuelHandler
|
||||
TConstructRegistry.addToolMaterial(6, "Obsidian", 1, 3, 89, 700, 2, 0.8F, 3, 0f);
|
||||
TConstructRegistry.addToolMaterial(7, "Netherrack", 1, 2, 131, 400, 1, 1.2F, 0, 1f);
|
||||
TConstructRegistry.addToolMaterial(8, "Slime", 1, 3, 1500, 150, 0, 5.0F, 0, 0f);
|
||||
TConstructRegistry.addToolMaterial(9, "Paper", 1, 0, 131, 200, 0, 0.1F, 0, 0f);
|
||||
TConstructRegistry.addToolMaterial(9, "Paper", 1, 0, 30, 200, 0, 0.3F, 0, 0f);
|
||||
TConstructRegistry.addToolMaterial(10, "Cobalt", 2, 4, 800, 800, 3, 1.75F, 2, 0f);
|
||||
TConstructRegistry.addToolMaterial(11, "Ardite", 2, 4, 600, 800, 3, 2.0F, 0, 0f);
|
||||
TConstructRegistry.addToolMaterial(12, "Manyullyn", 2, 5, 1200, 1000, 4, 2.5F, 0, 0f);
|
||||
@@ -358,13 +362,27 @@ public class TContent implements IFuelHandler
|
||||
TConstructRegistry.addToolMaterial(39, "Tartarite", 3, 7, 3000, 1400, 5, 1.6667F, 4, 0f);
|
||||
|
||||
PatternBuilder pb = PatternBuilder.instance;
|
||||
pb.registerFullMaterial(Block.planks, 2, "Wood", new ItemStack(Item.stick, 2), new ItemStack(Item.stick), 0);
|
||||
pb.registerFullMaterial(Block.stone, 2, "Stone", 1);
|
||||
pb.registerMaterial(Block.cobblestone, 2, "Stone");
|
||||
if (PHConstruct.enableTWood)
|
||||
pb.registerFullMaterial(Block.planks, 2, "Wood", new ItemStack(Item.stick, 2), new ItemStack(Item.stick), 0);
|
||||
else
|
||||
pb.registerMaterialSet("Wood", new ItemStack(Item.stick, 2), new ItemStack(Item.stick), 0);
|
||||
if (PHConstruct.enableTStone)
|
||||
{
|
||||
pb.registerFullMaterial(Block.stone, 2, "Stone", 1);
|
||||
pb.registerMaterial(Block.cobblestone, 2, "Stone");
|
||||
}
|
||||
//else
|
||||
//pb.registerMaterialSet("Stone", new ItemStack(TContent.toolShard, 1, 1), new ItemStack(TContent.toolRod, 1, 1), 1);
|
||||
pb.registerFullMaterial(Item.ingotIron, 2, "Iron", 2);
|
||||
pb.registerFullMaterial(Item.flint, 2, "Flint", 3);
|
||||
pb.registerFullMaterial(Block.cactus, 2, "Cactus", 4);
|
||||
pb.registerFullMaterial(Item.bone, 2, "Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5);
|
||||
if (PHConstruct.enableTCactus)
|
||||
pb.registerFullMaterial(Block.cactus, 2, "Cactus", 4);
|
||||
else
|
||||
pb.registerMaterialSet("Cactus", new ItemStack(TContent.toolShard, 1, 4), new ItemStack(TContent.toolRod, 1, 4), 4);
|
||||
if (PHConstruct.enableTBone)
|
||||
pb.registerFullMaterial(Item.bone, 2, "Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5);
|
||||
else
|
||||
pb.registerMaterialSet("Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5);
|
||||
pb.registerFullMaterial(Block.obsidian, 2, "Obsidian", 6);
|
||||
pb.registerFullMaterial(Block.netherrack, 2, "Netherrack", 7);
|
||||
pb.registerFullMaterial(new ItemStack(materials, 1, 1), 2, "Slime", new ItemStack(toolShard, 1, 8), new ItemStack(toolRod, 1, 8), 8);
|
||||
@@ -385,6 +403,50 @@ public class TContent implements IFuelHandler
|
||||
|
||||
void addToolRecipes ()
|
||||
{
|
||||
List<ItemStack> removeTools = new ArrayList<ItemStack>();
|
||||
if (PHConstruct.disableWoodTools)
|
||||
{
|
||||
removeTools.add(new ItemStack(Item.pickaxeWood));
|
||||
removeTools.add(new ItemStack(Item.axeWood));
|
||||
removeTools.add(new ItemStack(Item.shovelWood));
|
||||
removeTools.add(new ItemStack(Item.swordWood));
|
||||
removeTools.add(new ItemStack(Item.hoeWood));
|
||||
}
|
||||
if (PHConstruct.disableStoneTools)
|
||||
{
|
||||
removeTools.add(new ItemStack(Item.pickaxeStone));
|
||||
removeTools.add(new ItemStack(Item.axeStone));
|
||||
removeTools.add(new ItemStack(Item.shovelStone));
|
||||
removeTools.add(new ItemStack(Item.swordStone));
|
||||
removeTools.add(new ItemStack(Item.hoeStone));
|
||||
}
|
||||
if (PHConstruct.disableIronTools)
|
||||
{
|
||||
removeTools.add(new ItemStack(Item.pickaxeSteel));
|
||||
removeTools.add(new ItemStack(Item.axeSteel));
|
||||
removeTools.add(new ItemStack(Item.shovelSteel));
|
||||
removeTools.add(new ItemStack(Item.swordSteel));
|
||||
removeTools.add(new ItemStack(Item.hoeSteel));
|
||||
}
|
||||
if (PHConstruct.disableDiamondTools)
|
||||
{
|
||||
removeTools.add(new ItemStack(Item.pickaxeDiamond));
|
||||
removeTools.add(new ItemStack(Item.axeDiamond));
|
||||
removeTools.add(new ItemStack(Item.shovelDiamond));
|
||||
removeTools.add(new ItemStack(Item.swordDiamond));
|
||||
removeTools.add(new ItemStack(Item.hoeDiamond));
|
||||
}
|
||||
if (PHConstruct.disableGoldTools)
|
||||
{
|
||||
removeTools.add(new ItemStack(Item.pickaxeGold));
|
||||
removeTools.add(new ItemStack(Item.axeGold));
|
||||
removeTools.add(new ItemStack(Item.shovelGold));
|
||||
removeTools.add(new ItemStack(Item.swordGold));
|
||||
removeTools.add(new ItemStack(Item.hoeGold));
|
||||
}
|
||||
|
||||
RecipeRemover.removeShapedRecipes(removeTools);
|
||||
|
||||
patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, axeHead, swordBlade, largeGuard, medGuard, crossbar, binding, frypanHead, signHead };
|
||||
|
||||
ToolBuilder tb = ToolBuilder.instance;
|
||||
|
||||
@@ -79,6 +79,21 @@ public class LavaTankBlock extends BlockContainer
|
||||
return bID == this.blockID ? false : super.shouldSideBeRendered(world, x, y, z, side);
|
||||
//return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getLightValue(IBlockAccess world, int x, int y, int z)
|
||||
{
|
||||
LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z);
|
||||
if (logic != null)
|
||||
return logic.getBrightness();
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public int getRenderBlockPass()
|
||||
{
|
||||
return 1;
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public String getTextureFile ()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package mods.tinker.tconstruct.blocks.liquids;
|
||||
package mods.tinker.tconstruct.blocks;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -7,9 +7,11 @@ import mods.tinker.tconstruct.client.FluidRender;
|
||||
import mods.tinker.tconstruct.logic.LiquidTextureLogic;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
@@ -18,24 +20,54 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public abstract class LiquidMetalBase extends Block
|
||||
{
|
||||
|
||||
public String[] textureNames;
|
||||
public Icon[] stillInoms;
|
||||
public Icon[] flowInoms;
|
||||
protected LiquidMetalBase(int par1, Material par2Material)
|
||||
{
|
||||
super(par1, par2Material);
|
||||
textureNames = new String[] {
|
||||
"iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "steel"
|
||||
};
|
||||
setLightValue(0.625F);
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public int getBlockTexture(IBlockAccess world, int x, int y, int z, int side)
|
||||
public void func_94332_a(IconRegister iconRegister)
|
||||
{
|
||||
this.stillInoms = new Icon[textureNames.length];
|
||||
this.flowInoms = new Icon[textureNames.length];
|
||||
|
||||
for (int i = 0; i < this.stillInoms.length; ++i)
|
||||
{
|
||||
this.stillInoms[i] = iconRegister.func_94245_a("tinker:liquid_"+textureNames[i]);
|
||||
this.flowInoms[i] = iconRegister.func_94245_a("tinker:liquid_"+textureNames[i]+"_flow");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side)
|
||||
{
|
||||
TileEntity logic = world.getBlockTileEntity(x, y, z);
|
||||
if (logic != null && logic instanceof LiquidTextureLogic)
|
||||
return ((LiquidTextureLogic) logic).getTexturePos();
|
||||
{
|
||||
if (side == 1 || side == 0)
|
||||
return stillInoms[((LiquidTextureLogic) logic).getLiquidType()];
|
||||
else
|
||||
return flowInoms[((LiquidTextureLogic) logic).getLiquidType()];
|
||||
}
|
||||
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
return getBlockTextureFromSideAndMetadata(side, meta);
|
||||
}
|
||||
|
||||
public int getBlockTextureFromSideAndMetadata(int side, int meta)
|
||||
public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
|
||||
{
|
||||
if (side == 0 || side == 1)
|
||||
return (stillInoms[meta]);
|
||||
return flowInoms[meta];
|
||||
}
|
||||
|
||||
/*public int getBlockTextureFromSideAndMetadata(int side, int meta)
|
||||
{
|
||||
int tex = (meta % 5) * 3;
|
||||
tex += (meta / 5) * 32;
|
||||
@@ -394,9 +426,10 @@ public abstract class LiquidMetalBase extends Block
|
||||
*/
|
||||
public float getBlockBrightness(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
|
||||
{
|
||||
float var5 = par1IBlockAccess.getLightBrightness(par2, par3, par4);
|
||||
return 1f;
|
||||
/*float var5 = par1IBlockAccess.getLightBrightness(par2, par3, par4);
|
||||
float var6 = par1IBlockAccess.getLightBrightness(par2, par3 + 1, par4);
|
||||
return var5 > var6 ? var5 : var6;
|
||||
return var5 > var6 ? var5 : var6;*/
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -548,14 +581,7 @@ public abstract class LiquidMetalBase extends Block
|
||||
var22 = (double)par3 - 1.05D;
|
||||
var23 = (double)((float)par4 + par5Random.nextFloat());
|
||||
|
||||
if (this.blockMaterial == Material.water)
|
||||
{
|
||||
par1World.spawnParticle("dripWater", var21, var22, var23, 0.0D, 0.0D, 0.0D);
|
||||
}
|
||||
else
|
||||
{
|
||||
par1World.spawnParticle("dripLava", var21, var22, var23, 0.0D, 0.0D, 0.0D);
|
||||
}
|
||||
par1World.spawnParticle("dripLava", var21, var22, var23, 0.0D, 0.0D, 0.0D);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -563,24 +589,24 @@ public abstract class LiquidMetalBase extends Block
|
||||
/**
|
||||
* Called whenever the block is added into the world. Args: world, x, y, z
|
||||
*/
|
||||
public void onBlockAdded(World par1World, int par2, int par3, int par4)
|
||||
/*public void onBlockAdded(World par1World, int par2, int par3, int par4)
|
||||
{
|
||||
this.checkForHarden(par1World, par2, par3, par4);
|
||||
}
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
|
||||
* their own) Args: x, y, z, neighbor blockID
|
||||
*/
|
||||
public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, int par5)
|
||||
/*public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, int par5)
|
||||
{
|
||||
this.checkForHarden(par1World, par2, par3, par4);
|
||||
}
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Forces lava to check to see if it is colliding with water, and then decide what it should harden to.
|
||||
*/
|
||||
private void checkForHarden(World par1World, int par2, int par3, int par4)
|
||||
/*private void checkForHarden(World par1World, int par2, int par3, int par4)
|
||||
{
|
||||
if (par1World.getBlockId(par2, par3, par4) == this.blockID)
|
||||
{
|
||||
@@ -630,12 +656,12 @@ public abstract class LiquidMetalBase extends Block
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Creates fizzing sound and smoke. Used when lava flows over block or mixes with water.
|
||||
*/
|
||||
protected void triggerLavaMixEffects(World par1World, int par2, int par3, int par4)
|
||||
/*protected void triggerLavaMixEffects(World par1World, int par2, int par3, int par4)
|
||||
{
|
||||
par1World.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), "random.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F);
|
||||
|
||||
@@ -643,5 +669,5 @@ public abstract class LiquidMetalBase extends Block
|
||||
{
|
||||
par1World.spawnParticle("largesmoke", (double)par2 + Math.random(), (double)par3 + 1.2D, (double)par4 + Math.random(), 0.0D, 0.0D, 0.0D);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package mods.tinker.tconstruct.blocks.liquids;
|
||||
package mods.tinker.tconstruct.blocks;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -33,10 +33,10 @@ public class LiquidMetalFlowing extends LiquidMetalBase
|
||||
//System.out.println("x: "+x+", y: "+y+", z: "+z);
|
||||
int tex = ((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).getLiquidType();
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
world.setBlockAndMetadataWithNotify(x, y, z, stillLiquidId(), meta, 2);
|
||||
world.setBlockAndMetadataWithNotify(x, y, z, stillLiquidId(), meta, 3);
|
||||
world.markBlockRangeForRenderUpdate(x, y, z, x, y, z);
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).setTexturePos(tex);
|
||||
((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).setLiquidType(tex);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -44,10 +44,10 @@ public class LiquidMetalFlowing extends LiquidMetalBase
|
||||
{
|
||||
//System.out.println("x: "+x+", y: "+y+", z: "+z);
|
||||
int tex = ((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).getLiquidType();
|
||||
int l = getFlowDecay(world, x, y, z);
|
||||
int flow = getFlowDecay(world, x, y, z);
|
||||
byte byte0 = 1;
|
||||
boolean flag = true;
|
||||
if (l > 0)
|
||||
if (flow > 0)
|
||||
{
|
||||
int i1 = -100;
|
||||
i1 = getSmallestFlowDecay(world, x - 1, y, z, i1);
|
||||
@@ -71,16 +71,16 @@ public class LiquidMetalFlowing extends LiquidMetalBase
|
||||
j1 = l1 + 8;
|
||||
}
|
||||
}
|
||||
if (j1 != l)
|
||||
if (j1 != flow)
|
||||
{
|
||||
l = j1;
|
||||
if (l < 0)
|
||||
flow = j1;
|
||||
if (flow < 0)
|
||||
{
|
||||
world.func_94571_i(x, y, z);
|
||||
}
|
||||
else
|
||||
{
|
||||
world.setBlockMetadataWithNotify(x, y, z, l, 2);
|
||||
world.setBlockMetadataWithNotify(x, y, z, flow, 2);
|
||||
world.scheduleBlockUpdate(x, y, z, blockID, tickRate());
|
||||
world.notifyBlocksOfNeighborChange(x, y, z, blockID);
|
||||
}
|
||||
@@ -96,21 +96,21 @@ public class LiquidMetalFlowing extends LiquidMetalBase
|
||||
}
|
||||
if (liquidCanDisplaceBlock(world, x, y - 1, z))
|
||||
{
|
||||
if (l >= 8)
|
||||
if (flow >= 8)
|
||||
{
|
||||
world.setBlockAndMetadataWithNotify(x, y - 1, z, blockID, l, 3);
|
||||
world.setBlockAndMetadataWithNotify(x, y - 1, z, blockID, flow, 3);
|
||||
}
|
||||
else
|
||||
{
|
||||
world.setBlockAndMetadataWithNotify(x, y - 1, z, blockID, l + 8, 3);
|
||||
world.setBlockAndMetadataWithNotify(x, y - 1, z, blockID, flow + 8, 3);
|
||||
}
|
||||
((LiquidTextureLogic) world.getBlockTileEntity(x, y - 1, z)).setTexturePos(tex);
|
||||
((LiquidTextureLogic) world.getBlockTileEntity(x, y - 1, z)).setLiquidType(tex);
|
||||
}
|
||||
else if (l >= 0 && (l == 0 || blockBlocksFlow(world, x, y - 1, z)))
|
||||
else if (flow >= 0 && (flow == 0 || blockBlocksFlow(world, x, y - 1, z)))
|
||||
{
|
||||
boolean aflag[] = getOptimalFlowDirections(world, x, y, z);
|
||||
int k1 = l + byte0;
|
||||
if (l >= 8)
|
||||
int k1 = flow + byte0;
|
||||
if (flow >= 8)
|
||||
{
|
||||
k1 = 1;
|
||||
}
|
||||
@@ -146,7 +146,7 @@ public class LiquidMetalFlowing extends LiquidMetalBase
|
||||
}
|
||||
world.setBlockAndMetadataWithNotify(x, y, z, blockID, meta, 3);
|
||||
|
||||
((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).setTexturePos(tex);
|
||||
((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).setLiquidType(tex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package mods.tinker.tconstruct.blocks.liquids;
|
||||
package mods.tinker.tconstruct.blocks;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -172,9 +172,12 @@ public class LiquidMetalStill extends LiquidMetalBase implements ILiquid
|
||||
|
||||
private void unsetStationary (World world, int x, int y, int z)
|
||||
{
|
||||
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
int tex = ((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).getLiquidType();
|
||||
world.setBlockAndMetadataWithNotify(x, y, z, this.blockID - 1, meta, 2);
|
||||
world.scheduleBlockUpdate(x, y, z, this.blockID - 1, this.tickRate(world));
|
||||
((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).setLiquidType(tex);
|
||||
/*int meta = world.getBlockMetadata(x, y, z);
|
||||
int tex = ((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).getLiquidType();
|
||||
world.editingBlocks = true;
|
||||
@@ -1,8 +1,7 @@
|
||||
package mods.tinker.tconstruct.client;
|
||||
|
||||
import mods.tinker.tconstruct.blocks.liquids.LiquidMetalBase;
|
||||
import mods.tinker.tconstruct.blocks.LiquidMetalBase;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockFluid;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
@@ -15,6 +14,7 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
public class FluidRender implements ISimpleBlockRenderingHandler
|
||||
{
|
||||
public static int fluidModel = RenderingRegistry.getNextAvailableRenderId();
|
||||
|
||||
@Override
|
||||
public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
|
||||
{
|
||||
@@ -24,7 +24,7 @@ public class FluidRender implements ISimpleBlockRenderingHandler
|
||||
@Override
|
||||
public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer)
|
||||
{
|
||||
return renderBlockFluids(renderer, world, block, x, y, z);
|
||||
return renderFluids(renderer, world, block, x, y, z);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -38,402 +38,402 @@ public class FluidRender implements ISimpleBlockRenderingHandler
|
||||
{
|
||||
return fluidModel;
|
||||
}
|
||||
|
||||
public boolean renderBlockFluids(RenderBlocks renderer, IBlockAccess world, Block block, int x, int y, int z)
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
int l = block.colorMultiplier(world, x, y, z);
|
||||
float f = (float)(l >> 16 & 255) / 255.0F;
|
||||
float f1 = (float)(l >> 8 & 255) / 255.0F;
|
||||
float f2 = (float)(l & 255) / 255.0F;
|
||||
boolean flag = block.shouldSideBeRendered(world, x, y + 1, z, 1);
|
||||
boolean flag1 = block.shouldSideBeRendered(world, x, y - 1, z, 0);
|
||||
boolean[] aboolean = new boolean[] {block.shouldSideBeRendered(world, x, y, z - 1, 2), block.shouldSideBeRendered(world, x, y, z + 1, 3), block.shouldSideBeRendered(world, x - 1, y, z, 4), block.shouldSideBeRendered(world, x + 1, y, z, 5)};
|
||||
|
||||
if (!flag && !flag1 && !aboolean[0] && !aboolean[1] && !aboolean[2] && !aboolean[3])
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
boolean flag2 = false;
|
||||
float f3 = 0.5F;
|
||||
float f4 = 1.0F;
|
||||
float f5 = 0.8F;
|
||||
float f6 = 0.6F;
|
||||
double d0 = 0.0D;
|
||||
double d1 = 1.0D;
|
||||
Material material = block.blockMaterial;
|
||||
int i1 = world.getBlockMetadata(x, y, z);
|
||||
double d2 = (double)renderer.getFluidHeight(x, y, z, material);
|
||||
double d3 = (double)renderer.getFluidHeight(x, y, z + 1, material);
|
||||
double d4 = (double)renderer.getFluidHeight(x + 1, y, z + 1, material);
|
||||
double d5 = (double)renderer.getFluidHeight(x + 1, y, z, material);
|
||||
double d6 = 0.0010000000474974513D;
|
||||
float f7;
|
||||
public boolean renderFluids (RenderBlocks renderer, IBlockAccess world, Block block, int x, int y, int z)
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
int l = block.colorMultiplier(world, x, y, z);
|
||||
float f = (float) (l >> 16 & 255) / 255.0F;
|
||||
float f1 = (float) (l >> 8 & 255) / 255.0F;
|
||||
float f2 = (float) (l & 255) / 255.0F;
|
||||
boolean flag = block.shouldSideBeRendered(world, x, y + 1, z, 1);
|
||||
boolean flag1 = block.shouldSideBeRendered(world, x, y - 1, z, 0);
|
||||
boolean[] aboolean = new boolean[] { block.shouldSideBeRendered(world, x, y, z - 1, 2), block.shouldSideBeRendered(world, x, y, z + 1, 3), block.shouldSideBeRendered(world, x - 1, y, z, 4), block.shouldSideBeRendered(world, x + 1, y, z, 5) };
|
||||
|
||||
if (renderer.renderAllFaces || flag)
|
||||
{
|
||||
flag2 = true;
|
||||
Icon icon = renderer.func_94165_a(block, 1, i1);
|
||||
float f8 = (float)BlockFluid.getFlowDirection(world, x, y, z, material);
|
||||
if (!flag && !flag1 && !aboolean[0] && !aboolean[1] && !aboolean[2] && !aboolean[3])
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
boolean flag2 = false;
|
||||
float f3 = 0.5F;
|
||||
float f4 = 1.0F;
|
||||
float f5 = 0.8F;
|
||||
float f6 = 0.6F;
|
||||
double d0 = 0.0D;
|
||||
double d1 = 1.0D;
|
||||
Material material = block.blockMaterial;
|
||||
int i1 = world.getBlockMetadata(x, y, z);
|
||||
double d2 = (double) renderer.getFluidHeight(x, y, z, material);
|
||||
double d3 = (double) renderer.getFluidHeight(x, y, z + 1, material);
|
||||
double d4 = (double) renderer.getFluidHeight(x + 1, y, z + 1, material);
|
||||
double d5 = (double) renderer.getFluidHeight(x + 1, y, z, material);
|
||||
double d6 = 0.0010000000474974513D;
|
||||
float f7;
|
||||
|
||||
if (f8 > -999.0F)
|
||||
{
|
||||
icon = renderer.func_94165_a(block, 2, i1);
|
||||
}
|
||||
if (renderer.renderAllFaces || flag)
|
||||
{
|
||||
flag2 = true;
|
||||
Icon icon = block.getBlockTexture(world, x, y, z, 1);//renderer.func_94165_a(block, 1, i1);
|
||||
float f8 = (float) LiquidMetalBase.getFlowDirection(world, x, y, z, material);
|
||||
|
||||
d2 -= d6;
|
||||
d3 -= d6;
|
||||
d4 -= d6;
|
||||
d5 -= d6;
|
||||
double d7;
|
||||
double d8;
|
||||
double d9;
|
||||
double d10;
|
||||
double d11;
|
||||
double d12;
|
||||
double d13;
|
||||
double d14;
|
||||
if (f8 > -999.0F)
|
||||
{
|
||||
icon = block.getBlockTexture(world, x, y, z, 2);//renderer.func_94165_a(block, 2, i1);
|
||||
}
|
||||
|
||||
if (f8 < -999.0F)
|
||||
{
|
||||
d8 = (double)icon.func_94214_a(0.0D);
|
||||
d12 = (double)icon.func_94207_b(0.0D);
|
||||
d7 = d8;
|
||||
d11 = (double)icon.func_94207_b(16.0D);
|
||||
d10 = (double)icon.func_94214_a(16.0D);
|
||||
d14 = d11;
|
||||
d9 = d10;
|
||||
d13 = d12;
|
||||
}
|
||||
else
|
||||
{
|
||||
f7 = MathHelper.sin(f8) * 0.25F;
|
||||
float f9 = MathHelper.cos(f8) * 0.25F;
|
||||
d8 = (double)icon.func_94214_a((double)(8.0F + (-f9 - f7) * 16.0F));
|
||||
d12 = (double)icon.func_94207_b((double)(8.0F + (-f9 + f7) * 16.0F));
|
||||
d7 = (double)icon.func_94214_a((double)(8.0F + (-f9 + f7) * 16.0F));
|
||||
d11 = (double)icon.func_94207_b((double)(8.0F + (f9 + f7) * 16.0F));
|
||||
d10 = (double)icon.func_94214_a((double)(8.0F + (f9 + f7) * 16.0F));
|
||||
d14 = (double)icon.func_94207_b((double)(8.0F + (f9 - f7) * 16.0F));
|
||||
d9 = (double)icon.func_94214_a((double)(8.0F + (f9 - f7) * 16.0F));
|
||||
d13 = (double)icon.func_94207_b((double)(8.0F + (-f9 - f7) * 16.0F));
|
||||
}
|
||||
d2 -= d6;
|
||||
d3 -= d6;
|
||||
d4 -= d6;
|
||||
d5 -= d6;
|
||||
double d7;
|
||||
double d8;
|
||||
double d9;
|
||||
double d10;
|
||||
double d11;
|
||||
double d12;
|
||||
double d13;
|
||||
double d14;
|
||||
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
|
||||
f7 = 1.0F;
|
||||
tessellator.setColorOpaque_F(f4 * f7 * f, f4 * f7 * f1, f4 * f7 * f2);
|
||||
tessellator.addVertexWithUV((double)(x + 0), (double)y + d2, (double)(z + 0), d8, d12);
|
||||
tessellator.addVertexWithUV((double)(x + 0), (double)y + d3, (double)(z + 1), d7, d11);
|
||||
tessellator.addVertexWithUV((double)(x + 1), (double)y + d4, (double)(z + 1), d10, d14);
|
||||
tessellator.addVertexWithUV((double)(x + 1), (double)y + d5, (double)(z + 0), d9, d13);
|
||||
}
|
||||
if (f8 < -999.0F)
|
||||
{
|
||||
d8 = (double) icon.func_94214_a(0.0D);
|
||||
d12 = (double) icon.func_94207_b(0.0D);
|
||||
d7 = d8;
|
||||
d11 = (double) icon.func_94207_b(16.0D);
|
||||
d10 = (double) icon.func_94214_a(16.0D);
|
||||
d14 = d11;
|
||||
d9 = d10;
|
||||
d13 = d12;
|
||||
}
|
||||
else
|
||||
{
|
||||
f7 = MathHelper.sin(f8) * 0.25F;
|
||||
float f9 = MathHelper.cos(f8) * 0.25F;
|
||||
d8 = (double) icon.func_94214_a((double) (8.0F + (-f9 - f7) * 16.0F));
|
||||
d12 = (double) icon.func_94207_b((double) (8.0F + (-f9 + f7) * 16.0F));
|
||||
d7 = (double) icon.func_94214_a((double) (8.0F + (-f9 + f7) * 16.0F));
|
||||
d11 = (double) icon.func_94207_b((double) (8.0F + (f9 + f7) * 16.0F));
|
||||
d10 = (double) icon.func_94214_a((double) (8.0F + (f9 + f7) * 16.0F));
|
||||
d14 = (double) icon.func_94207_b((double) (8.0F + (f9 - f7) * 16.0F));
|
||||
d9 = (double) icon.func_94214_a((double) (8.0F + (f9 - f7) * 16.0F));
|
||||
d13 = (double) icon.func_94207_b((double) (8.0F + (-f9 - f7) * 16.0F));
|
||||
}
|
||||
|
||||
if (renderer.renderAllFaces || flag1)
|
||||
{
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y - 1, z));
|
||||
float f10 = 1.0F;
|
||||
tessellator.setColorOpaque_F(f3 * f10, f3 * f10, f3 * f10);
|
||||
renderer.renderBottomFace(block, (double)x, (double)y + d6, (double)z, renderer.func_94173_a(block, 0));
|
||||
flag2 = true;
|
||||
}
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
|
||||
f7 = 1.0F;
|
||||
tessellator.setColorOpaque_F(f4 * f7 * f, f4 * f7 * f1, f4 * f7 * f2);
|
||||
tessellator.addVertexWithUV((double) (x + 0), (double) y + d2, (double) (z + 0), d8, d12);
|
||||
tessellator.addVertexWithUV((double) (x + 0), (double) y + d3, (double) (z + 1), d7, d11);
|
||||
tessellator.addVertexWithUV((double) (x + 1), (double) y + d4, (double) (z + 1), d10, d14);
|
||||
tessellator.addVertexWithUV((double) (x + 1), (double) y + d5, (double) (z + 0), d9, d13);
|
||||
}
|
||||
|
||||
for (int j1 = 0; j1 < 4; ++j1)
|
||||
{
|
||||
int k1 = x;
|
||||
int l1 = z;
|
||||
if (renderer.renderAllFaces || flag1)
|
||||
{
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y - 1, z));
|
||||
float f10 = 1.0F;
|
||||
tessellator.setColorOpaque_F(f3 * f10, f3 * f10, f3 * f10);
|
||||
renderer.renderBottomFace(block, (double) x, (double) y + d6, (double) z, block.getBlockTexture(world, x, y, z, 0));
|
||||
flag2 = true;
|
||||
}
|
||||
|
||||
if (j1 == 0)
|
||||
{
|
||||
l1 = z - 1;
|
||||
}
|
||||
for (int side = 0; side < 4; ++side)
|
||||
{
|
||||
int xPos = x;
|
||||
int zPos = z;
|
||||
|
||||
if (j1 == 1)
|
||||
{
|
||||
++l1;
|
||||
}
|
||||
if (side == 0)
|
||||
{
|
||||
zPos = z - 1;
|
||||
}
|
||||
|
||||
if (j1 == 2)
|
||||
{
|
||||
k1 = x - 1;
|
||||
}
|
||||
if (side == 1)
|
||||
{
|
||||
++zPos;
|
||||
}
|
||||
|
||||
if (j1 == 3)
|
||||
{
|
||||
++k1;
|
||||
}
|
||||
if (side == 2)
|
||||
{
|
||||
xPos = x - 1;
|
||||
}
|
||||
|
||||
Icon icon1 = renderer.func_94165_a(block, j1 + 2, i1);
|
||||
if (side == 3)
|
||||
{
|
||||
++xPos;
|
||||
}
|
||||
|
||||
if (renderer.renderAllFaces || aboolean[j1])
|
||||
{
|
||||
double d15;
|
||||
double d16;
|
||||
double d17;
|
||||
double d18;
|
||||
double d19;
|
||||
double d20;
|
||||
Icon icon1 = block.getBlockTexture(world, x, y, z, side+2);//renderer.func_94165_a(block, j1 + 2, i1);
|
||||
|
||||
if (j1 == 0)
|
||||
{
|
||||
d15 = d2;
|
||||
d17 = d5;
|
||||
d16 = (double)x;
|
||||
d18 = (double)(x + 1);
|
||||
d19 = (double)z + d6;
|
||||
d20 = (double)z + d6;
|
||||
}
|
||||
else if (j1 == 1)
|
||||
{
|
||||
d15 = d4;
|
||||
d17 = d3;
|
||||
d16 = (double)(x + 1);
|
||||
d18 = (double)x;
|
||||
d19 = (double)(z + 1) - d6;
|
||||
d20 = (double)(z + 1) - d6;
|
||||
}
|
||||
else if (j1 == 2)
|
||||
{
|
||||
d15 = d3;
|
||||
d17 = d2;
|
||||
d16 = (double)x + d6;
|
||||
d18 = (double)x + d6;
|
||||
d19 = (double)(z + 1);
|
||||
d20 = (double)z;
|
||||
}
|
||||
else
|
||||
{
|
||||
d15 = d5;
|
||||
d17 = d4;
|
||||
d16 = (double)(x + 1) - d6;
|
||||
d18 = (double)(x + 1) - d6;
|
||||
d19 = (double)z;
|
||||
d20 = (double)(z + 1);
|
||||
}
|
||||
if (renderer.renderAllFaces || aboolean[side])
|
||||
{
|
||||
double d15;
|
||||
double d16;
|
||||
double d17;
|
||||
double d18;
|
||||
double d19;
|
||||
double d20;
|
||||
|
||||
flag2 = true;
|
||||
float f11 = icon1.func_94214_a(0.0D);
|
||||
f7 = icon1.func_94214_a(8.0D);
|
||||
int i2 = icon1.func_94216_b();
|
||||
float f12 = icon1.func_94207_b((1.0D - d15) * 16.0D * 0.5D);
|
||||
float f13 = icon1.func_94207_b((1.0D - d17) * 16.0D * 0.5D);
|
||||
float f14 = icon1.func_94207_b(8.0D);
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, k1, y, l1));
|
||||
float f15 = 1.0F;
|
||||
if (side == 0)
|
||||
{
|
||||
d15 = d2;
|
||||
d17 = d5;
|
||||
d16 = (double) x;
|
||||
d18 = (double) (x + 1);
|
||||
d19 = (double) z + d6;
|
||||
d20 = (double) z + d6;
|
||||
}
|
||||
else if (side == 1)
|
||||
{
|
||||
d15 = d4;
|
||||
d17 = d3;
|
||||
d16 = (double) (x + 1);
|
||||
d18 = (double) x;
|
||||
d19 = (double) (z + 1) - d6;
|
||||
d20 = (double) (z + 1) - d6;
|
||||
}
|
||||
else if (side == 2)
|
||||
{
|
||||
d15 = d3;
|
||||
d17 = d2;
|
||||
d16 = (double) x + d6;
|
||||
d18 = (double) x + d6;
|
||||
d19 = (double) (z + 1);
|
||||
d20 = (double) z;
|
||||
}
|
||||
else
|
||||
{
|
||||
d15 = d5;
|
||||
d17 = d4;
|
||||
d16 = (double) (x + 1) - d6;
|
||||
d18 = (double) (x + 1) - d6;
|
||||
d19 = (double) z;
|
||||
d20 = (double) (z + 1);
|
||||
}
|
||||
|
||||
if (j1 < 2)
|
||||
{
|
||||
f15 *= f5;
|
||||
}
|
||||
else
|
||||
{
|
||||
f15 *= f6;
|
||||
}
|
||||
flag2 = true;
|
||||
float f11 = icon1.func_94214_a(0.0D);
|
||||
f7 = icon1.func_94214_a(8.0D);
|
||||
int i2 = icon1.func_94216_b();
|
||||
float f12 = icon1.func_94207_b((1.0D - d15) * 16.0D * 0.5D);
|
||||
float f13 = icon1.func_94207_b((1.0D - d17) * 16.0D * 0.5D);
|
||||
float f14 = icon1.func_94207_b(8.0D);
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, xPos, y, zPos));
|
||||
float f15 = 1.0F;
|
||||
|
||||
tessellator.setColorOpaque_F(f4 * f15 * f, f4 * f15 * f1, f4 * f15 * f2);
|
||||
tessellator.addVertexWithUV(d16, (double)y + d15, d19, (double)f11, (double)f12);
|
||||
tessellator.addVertexWithUV(d18, (double)y + d17, d20, (double)f7, (double)f13);
|
||||
tessellator.addVertexWithUV(d18, (double)(y + 0), d20, (double)f7, (double)f14);
|
||||
tessellator.addVertexWithUV(d16, (double)(y + 0), d19, (double)f11, (double)f14);
|
||||
}
|
||||
}
|
||||
if (side < 2)
|
||||
{
|
||||
f15 *= f5;
|
||||
}
|
||||
else
|
||||
{
|
||||
f15 *= f6;
|
||||
}
|
||||
|
||||
renderer.renderMinY = d0;
|
||||
renderer.renderMaxY = d1;
|
||||
return flag2;
|
||||
}
|
||||
}
|
||||
|
||||
/*public boolean renderBlockFluids(RenderBlocks renderer, IBlockAccess world, Block block, int x, int y, int z)
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
int blockColor = block.colorMultiplier(world, x, y, z);
|
||||
float var7 = (float)(blockColor >> 16 & 255) / 255.0F;
|
||||
float var8 = (float)(blockColor >> 8 & 255) / 255.0F;
|
||||
float var9 = (float)(blockColor & 255) / 255.0F;
|
||||
boolean renderTop = block.shouldSideBeRendered(world, x, y + 1, z, 1);
|
||||
boolean renderBottom = block.shouldSideBeRendered(world, x, y - 1, z, 0);
|
||||
boolean[] var12 = new boolean[] {block.shouldSideBeRendered(world, x, y, z - 1, 2), block.shouldSideBeRendered(world, x, y, z + 1, 3), block.shouldSideBeRendered(world, x - 1, y, z, 4), block.shouldSideBeRendered(world, x + 1, y, z, 5)};
|
||||
tessellator.setColorOpaque_F(f4 * f15 * f, f4 * f15 * f1, f4 * f15 * f2);
|
||||
tessellator.addVertexWithUV(d16, (double) y + d15, d19, (double) f11, (double) f12);
|
||||
tessellator.addVertexWithUV(d18, (double) y + d17, d20, (double) f7, (double) f13);
|
||||
tessellator.addVertexWithUV(d18, (double) (y + 0), d20, (double) f7, (double) f14);
|
||||
tessellator.addVertexWithUV(d16, (double) (y + 0), d19, (double) f11, (double) f14);
|
||||
}
|
||||
}
|
||||
|
||||
if (!renderTop && !renderBottom && !var12[0] && !var12[1] && !var12[2] && !var12[3])
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
boolean var13 = false;
|
||||
float var14 = 0.5F;
|
||||
float var15 = 1.0F;
|
||||
float var16 = 0.8F;
|
||||
float var17 = 0.6F;
|
||||
double var18 = 0.0D;
|
||||
double var20 = 1.0D;
|
||||
Material var22 = block.blockMaterial;
|
||||
//int var23 = world.getBlockMetadata(x, y, z);
|
||||
double var24 = (double)renderer.getFluidHeight(x, y, z, var22);
|
||||
double var26 = (double)renderer.getFluidHeight(x, y, z + 1, var22);
|
||||
double var28 = (double)renderer.getFluidHeight(x + 1, y, z + 1, var22);
|
||||
double var30 = (double)renderer.getFluidHeight(x + 1, y, z, var22);
|
||||
double var32 = 0.0010000000474974513D;
|
||||
int texturePos;
|
||||
int textureBase = block.getBlockTexture(world, x, y, z, 0);
|
||||
int var37;
|
||||
renderer.renderMinY = d0;
|
||||
renderer.renderMaxY = d1;
|
||||
return flag2;
|
||||
}
|
||||
}
|
||||
|
||||
if (renderer.renderAllFaces || renderTop)
|
||||
{
|
||||
var13 = true;
|
||||
texturePos = block.getBlockTextureFromSide(1) + textureBase;
|
||||
float var35 = (float)LiquidMetalBase.getFlowDirection(world, x, y, z, var22);
|
||||
/*public boolean renderLiquidMetalBases(RenderBlocks renderer, IBlockAccess world, Block block, int x, int y, int z)
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
int blockColor = block.colorMultiplier(world, x, y, z);
|
||||
float var7 = (float)(blockColor >> 16 & 255) / 255.0F;
|
||||
float var8 = (float)(blockColor >> 8 & 255) / 255.0F;
|
||||
float var9 = (float)(blockColor & 255) / 255.0F;
|
||||
boolean renderTop = block.shouldSideBeRendered(world, x, y + 1, z, 1);
|
||||
boolean renderBottom = block.shouldSideBeRendered(world, x, y - 1, z, 0);
|
||||
boolean[] var12 = new boolean[] {block.shouldSideBeRendered(world, x, y, z - 1, 2), block.shouldSideBeRendered(world, x, y, z + 1, 3), block.shouldSideBeRendered(world, x - 1, y, z, 4), block.shouldSideBeRendered(world, x + 1, y, z, 5)};
|
||||
|
||||
if (var35 > -999.0F)
|
||||
{
|
||||
texturePos = block.getBlockTextureFromSide(2) + textureBase;
|
||||
}
|
||||
if (!renderTop && !renderBottom && !var12[0] && !var12[1] && !var12[2] && !var12[3])
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
boolean var13 = false;
|
||||
float var14 = 0.5F;
|
||||
float var15 = 1.0F;
|
||||
float var16 = 0.8F;
|
||||
float var17 = 0.6F;
|
||||
double var18 = 0.0D;
|
||||
double var20 = 1.0D;
|
||||
Material var22 = block.blockMaterial;
|
||||
//int var23 = world.getBlockMetadata(x, y, z);
|
||||
double var24 = (double)renderer.getFluidHeight(x, y, z, var22);
|
||||
double var26 = (double)renderer.getFluidHeight(x, y, z + 1, var22);
|
||||
double var28 = (double)renderer.getFluidHeight(x + 1, y, z + 1, var22);
|
||||
double var30 = (double)renderer.getFluidHeight(x + 1, y, z, var22);
|
||||
double var32 = 0.0010000000474974513D;
|
||||
int texturePos;
|
||||
int textureBase = block.getBlockTexture(world, x, y, z, 0);
|
||||
int var37;
|
||||
|
||||
var24 -= var32;
|
||||
var26 -= var32;
|
||||
var28 -= var32;
|
||||
var30 -= var32;
|
||||
int var36 = (texturePos & 15) << 4;
|
||||
var37 = texturePos & 240;
|
||||
double var38 = ((double)var36 + 8.0D) / 256.0D;
|
||||
double var40 = ((double)var37 + 8.0D) / 256.0D;
|
||||
if (renderer.renderAllFaces || renderTop)
|
||||
{
|
||||
var13 = true;
|
||||
texturePos = block.getBlockTextureFromSide(1) + textureBase;
|
||||
float var35 = (float)LiquidMetalBase.getFlowDirection(world, x, y, z, var22);
|
||||
|
||||
if (var35 < -999.0F)
|
||||
{
|
||||
var35 = 0.0F;
|
||||
}
|
||||
else
|
||||
{
|
||||
var38 = (double)((float)(var36 + 16) / 256.0F);
|
||||
var40 = (double)((float)(var37 + 16) / 256.0F);
|
||||
}
|
||||
if (var35 > -999.0F)
|
||||
{
|
||||
texturePos = block.getBlockTextureFromSide(2) + textureBase;
|
||||
}
|
||||
|
||||
double var42 = (double)(MathHelper.sin(var35) * 8.0F) / 256.0D;
|
||||
double var44 = (double)(MathHelper.cos(var35) * 8.0F) / 256.0D;
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
|
||||
float var46 = 1.0F;
|
||||
tessellator.setColorOpaque_F(var15 * var46 * var7, var15 * var46 * var8, var15 * var46 * var9);
|
||||
tessellator.addVertexWithUV((double)(x + 0), (double)y + var24, (double)(z + 0), var38 - var44 - var42, var40 - var44 + var42);
|
||||
tessellator.addVertexWithUV((double)(x + 0), (double)y + var26, (double)(z + 1), var38 - var44 + var42, var40 + var44 + var42);
|
||||
tessellator.addVertexWithUV((double)(x + 1), (double)y + var28, (double)(z + 1), var38 + var44 + var42, var40 + var44 - var42);
|
||||
tessellator.addVertexWithUV((double)(x + 1), (double)y + var30, (double)(z + 0), var38 + var44 - var42, var40 - var44 - var42);
|
||||
}
|
||||
var24 -= var32;
|
||||
var26 -= var32;
|
||||
var28 -= var32;
|
||||
var30 -= var32;
|
||||
int var36 = (texturePos & 15) << 4;
|
||||
var37 = texturePos & 240;
|
||||
double var38 = ((double)var36 + 8.0D) / 256.0D;
|
||||
double var40 = ((double)var37 + 8.0D) / 256.0D;
|
||||
|
||||
if (renderer.renderAllFaces || renderBottom)
|
||||
{
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y - 1, z));
|
||||
float var65 = 1.0F;
|
||||
tessellator.setColorOpaque_F(var14 * var65, var14 * var65, var14 * var65);
|
||||
renderer.renderBottomFace(block, (double)x, (double)y + var32, (double)z, block.getBlockTextureFromSide(0));
|
||||
var13 = true;
|
||||
}
|
||||
if (var35 < -999.0F)
|
||||
{
|
||||
var35 = 0.0F;
|
||||
}
|
||||
else
|
||||
{
|
||||
var38 = (double)((float)(var36 + 16) / 256.0F);
|
||||
var40 = (double)((float)(var37 + 16) / 256.0F);
|
||||
}
|
||||
|
||||
for (texturePos = 0; texturePos < 4; ++texturePos)
|
||||
{
|
||||
int var64 = x;
|
||||
var37 = z;
|
||||
double var42 = (double)(MathHelper.sin(var35) * 8.0F) / 256.0D;
|
||||
double var44 = (double)(MathHelper.cos(var35) * 8.0F) / 256.0D;
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
|
||||
float var46 = 1.0F;
|
||||
tessellator.setColorOpaque_F(var15 * var46 * var7, var15 * var46 * var8, var15 * var46 * var9);
|
||||
tessellator.addVertexWithUV((double)(x + 0), (double)y + var24, (double)(z + 0), var38 - var44 - var42, var40 - var44 + var42);
|
||||
tessellator.addVertexWithUV((double)(x + 0), (double)y + var26, (double)(z + 1), var38 - var44 + var42, var40 + var44 + var42);
|
||||
tessellator.addVertexWithUV((double)(x + 1), (double)y + var28, (double)(z + 1), var38 + var44 + var42, var40 + var44 - var42);
|
||||
tessellator.addVertexWithUV((double)(x + 1), (double)y + var30, (double)(z + 0), var38 + var44 - var42, var40 - var44 - var42);
|
||||
}
|
||||
|
||||
if (texturePos == 0)
|
||||
{
|
||||
var37 = z - 1;
|
||||
}
|
||||
if (renderer.renderAllFaces || renderBottom)
|
||||
{
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y - 1, z));
|
||||
float var65 = 1.0F;
|
||||
tessellator.setColorOpaque_F(var14 * var65, var14 * var65, var14 * var65);
|
||||
renderer.renderBottomFace(block, (double)x, (double)y + var32, (double)z, block.getBlockTextureFromSide(0));
|
||||
var13 = true;
|
||||
}
|
||||
|
||||
if (texturePos == 1)
|
||||
{
|
||||
++var37;
|
||||
}
|
||||
for (texturePos = 0; texturePos < 4; ++texturePos)
|
||||
{
|
||||
int var64 = x;
|
||||
var37 = z;
|
||||
|
||||
if (texturePos == 2)
|
||||
{
|
||||
var64 = x - 1;
|
||||
}
|
||||
if (texturePos == 0)
|
||||
{
|
||||
var37 = z - 1;
|
||||
}
|
||||
|
||||
if (texturePos == 3)
|
||||
{
|
||||
++var64;
|
||||
}
|
||||
if (texturePos == 1)
|
||||
{
|
||||
++var37;
|
||||
}
|
||||
|
||||
int var66 = block.getBlockTextureFromSide(texturePos + 2) + textureBase;
|
||||
int var39 = (var66 & 15) << 4;
|
||||
int var67 = var66 & 240;
|
||||
if (texturePos == 2)
|
||||
{
|
||||
var64 = x - 1;
|
||||
}
|
||||
|
||||
if (renderer.renderAllFaces || var12[texturePos])
|
||||
{
|
||||
double var43;
|
||||
double var41;
|
||||
double var47;
|
||||
double var45;
|
||||
double var51;
|
||||
double var49;
|
||||
if (texturePos == 3)
|
||||
{
|
||||
++var64;
|
||||
}
|
||||
|
||||
if (texturePos == 0)
|
||||
{
|
||||
var41 = var24;
|
||||
var43 = var30;
|
||||
var45 = (double)x;
|
||||
var49 = (double)(x + 1);
|
||||
var47 = (double)z + var32;
|
||||
var51 = (double)z + var32;
|
||||
}
|
||||
else if (texturePos == 1)
|
||||
{
|
||||
var41 = var28;
|
||||
var43 = var26;
|
||||
var45 = (double)(x + 1);
|
||||
var49 = (double)x;
|
||||
var47 = (double)(z + 1) - var32;
|
||||
var51 = (double)(z + 1) - var32;
|
||||
}
|
||||
else if (texturePos == 2)
|
||||
{
|
||||
var41 = var26;
|
||||
var43 = var24;
|
||||
var45 = (double)x + var32;
|
||||
var49 = (double)x + var32;
|
||||
var47 = (double)(z + 1);
|
||||
var51 = (double)z;
|
||||
}
|
||||
else
|
||||
{
|
||||
var41 = var30;
|
||||
var43 = var28;
|
||||
var45 = (double)(x + 1) - var32;
|
||||
var49 = (double)(x + 1) - var32;
|
||||
var47 = (double)z;
|
||||
var51 = (double)(z + 1);
|
||||
}
|
||||
int var66 = block.getBlockTextureFromSide(texturePos + 2) + textureBase;
|
||||
int var39 = (var66 & 15) << 4;
|
||||
int var67 = var66 & 240;
|
||||
|
||||
var13 = true;
|
||||
double var53 = (double)((float)(var39 + 0) / 256.0F);
|
||||
double var55 = ((double)(var39 + 16) - 0.01D) / 256.0D;
|
||||
double var57 = ((double)var67 + (1.0D - var41) * 16.0D) / 256.0D;
|
||||
double var59 = ((double)var67 + (1.0D - var43) * 16.0D) / 256.0D;
|
||||
double var61 = ((double)(var67 + 16) - 0.01D) / 256.0D;
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, var64, y, var37));
|
||||
float var63 = 1.0F;
|
||||
if (renderer.renderAllFaces || var12[texturePos])
|
||||
{
|
||||
double var43;
|
||||
double var41;
|
||||
double var47;
|
||||
double var45;
|
||||
double var51;
|
||||
double var49;
|
||||
|
||||
if (texturePos < 2)
|
||||
{
|
||||
var63 *= var16;
|
||||
}
|
||||
else
|
||||
{
|
||||
var63 *= var17;
|
||||
}
|
||||
if (texturePos == 0)
|
||||
{
|
||||
var41 = var24;
|
||||
var43 = var30;
|
||||
var45 = (double)x;
|
||||
var49 = (double)(x + 1);
|
||||
var47 = (double)z + var32;
|
||||
var51 = (double)z + var32;
|
||||
}
|
||||
else if (texturePos == 1)
|
||||
{
|
||||
var41 = var28;
|
||||
var43 = var26;
|
||||
var45 = (double)(x + 1);
|
||||
var49 = (double)x;
|
||||
var47 = (double)(z + 1) - var32;
|
||||
var51 = (double)(z + 1) - var32;
|
||||
}
|
||||
else if (texturePos == 2)
|
||||
{
|
||||
var41 = var26;
|
||||
var43 = var24;
|
||||
var45 = (double)x + var32;
|
||||
var49 = (double)x + var32;
|
||||
var47 = (double)(z + 1);
|
||||
var51 = (double)z;
|
||||
}
|
||||
else
|
||||
{
|
||||
var41 = var30;
|
||||
var43 = var28;
|
||||
var45 = (double)(x + 1) - var32;
|
||||
var49 = (double)(x + 1) - var32;
|
||||
var47 = (double)z;
|
||||
var51 = (double)(z + 1);
|
||||
}
|
||||
|
||||
tessellator.setColorOpaque_F(var15 * var63 * var7, var15 * var63 * var8, var15 * var63 * var9);
|
||||
tessellator.addVertexWithUV(var45, (double)y + var41, var47, var53, var57);
|
||||
tessellator.addVertexWithUV(var49, (double)y + var43, var51, var55, var59);
|
||||
tessellator.addVertexWithUV(var49, (double)(y + 0), var51, var55, var61);
|
||||
tessellator.addVertexWithUV(var45, (double)(y + 0), var47, var53, var61);
|
||||
}
|
||||
}
|
||||
var13 = true;
|
||||
double var53 = (double)((float)(var39 + 0) / 256.0F);
|
||||
double var55 = ((double)(var39 + 16) - 0.01D) / 256.0D;
|
||||
double var57 = ((double)var67 + (1.0D - var41) * 16.0D) / 256.0D;
|
||||
double var59 = ((double)var67 + (1.0D - var43) * 16.0D) / 256.0D;
|
||||
double var61 = ((double)(var67 + 16) - 0.01D) / 256.0D;
|
||||
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, var64, y, var37));
|
||||
float var63 = 1.0F;
|
||||
|
||||
renderer.renderMinY = var18;
|
||||
renderer.renderMaxY = var20;
|
||||
return var13;
|
||||
}
|
||||
}*/
|
||||
if (texturePos < 2)
|
||||
{
|
||||
var63 *= var16;
|
||||
}
|
||||
else
|
||||
{
|
||||
var63 *= var17;
|
||||
}
|
||||
|
||||
tessellator.setColorOpaque_F(var15 * var63 * var7, var15 * var63 * var8, var15 * var63 * var9);
|
||||
tessellator.addVertexWithUV(var45, (double)y + var41, var47, var53, var57);
|
||||
tessellator.addVertexWithUV(var49, (double)y + var43, var51, var55, var59);
|
||||
tessellator.addVertexWithUV(var49, (double)(y + 0), var51, var55, var61);
|
||||
tessellator.addVertexWithUV(var45, (double)(y + 0), var47, var53, var61);
|
||||
}
|
||||
}
|
||||
|
||||
renderer.renderMinY = var18;
|
||||
renderer.renderMaxY = var20;
|
||||
return var13;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
@@ -86,6 +86,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
|
||||
int liquidBase = 0;
|
||||
for (LiquidStack liquid : logic.moltenMetal)
|
||||
{
|
||||
System.out.println("Liquid!");
|
||||
int liquidSize = liquid.amount;
|
||||
while (liquidSize > 0)
|
||||
{
|
||||
@@ -98,7 +99,6 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
|
||||
base += height;
|
||||
liquidBase += countSize;
|
||||
|
||||
|
||||
if (liquid.itemID < 4096) //Block
|
||||
{
|
||||
Block liquidBlock = Block.blocksList[liquid.itemID];
|
||||
|
||||
@@ -46,7 +46,7 @@ public class TankRender implements ISimpleBlockRenderingHandler
|
||||
renderer.setRenderBounds(0, 0, 0, 1, 1, 1);
|
||||
}
|
||||
renderer.renderStandardBlock(block, x, y, z);
|
||||
/*LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z);
|
||||
LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z);
|
||||
if (logic.containsLiquid())
|
||||
{
|
||||
LiquidStack liquid = logic.tank.getLiquid();
|
||||
@@ -54,17 +54,15 @@ public class TankRender implements ISimpleBlockRenderingHandler
|
||||
if (liquid.itemID < 4096) //Block
|
||||
{
|
||||
Block liquidBlock = Block.blocksList[liquid.itemID];
|
||||
ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0);
|
||||
BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, liquid.itemMeta, x, y, z, renderer, world);
|
||||
}
|
||||
else
|
||||
//Item
|
||||
{
|
||||
Item liquidItem = Item.itemsList[liquid.itemID];
|
||||
ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0);
|
||||
BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(liquid.itemMeta), liquid.itemMeta, x, y, z, renderer, world);
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ public class SmelteryGui extends GuiContainer
|
||||
{
|
||||
//ForgeHooksClient.bindTexture(Block.lavaStill.getTextureFile(), 0);
|
||||
//int renderIndex = Block.lavaStill.getBlockTextureFromSideAndMetadata(0, 0);
|
||||
Icon inon = Block.lavaStill.getBlockTextureFromSideAndMetadata(0, 0);
|
||||
Icon lavaInon = Block.lavaStill.getBlockTextureFromSideAndMetadata(0, 0);
|
||||
//int xTex = renderIndex % 16 * 16;
|
||||
//int yTex = renderIndex / 16 * 16;
|
||||
int fuel = logic.getScaledFuelGague(52);
|
||||
@@ -138,7 +138,8 @@ public class SmelteryGui extends GuiContainer
|
||||
{
|
||||
int size = fuel >= 16 ? 16 : fuel;
|
||||
fuel -= size;
|
||||
drawTexturedModalRect(cornerX + 117, (cornerY + 68) - size - 16 * count, 0, 16 - size, 12, size);
|
||||
func_94065_a(cornerX + 117, (cornerY + 68) - size - 16 * count, lavaInon, 12, size);
|
||||
//drawTexturedModalRect(cornerX + 117, (cornerY + 68) - size - 16 * count, 0, 16 - size, 12, size);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -136,34 +136,12 @@ public class FilledBucket extends ItemBucket
|
||||
{
|
||||
world.func_94575_c(clickX, clickY, clickZ, TContent.liquidMetalStill.blockID);
|
||||
LiquidTextureLogic logic = (LiquidTextureLogic) world.getBlockTileEntity(clickX, clickY, clickZ);
|
||||
logic.setTexturePos(meta);
|
||||
logic.setLiquidType(meta);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
public int getSourceBlock(int meta)
|
||||
{
|
||||
switch(meta)
|
||||
{
|
||||
/*case 0: return TContent.ironStill.blockID;
|
||||
case 1: return TContent.goldStill.blockID;
|
||||
case 2: return TContent.copperStill.blockID;
|
||||
case 3: return TContent.tinStill.blockID;
|
||||
case 4: return TContent.aluminumStill.blockID;
|
||||
case 5: return TContent.cobaltStill.blockID;
|
||||
case 6: return TContent.arditeStill.blockID;
|
||||
case 7: return TContent.bronzeStill.blockID;
|
||||
case 8: return TContent.alBrassStill.blockID;
|
||||
case 9: return TContent.manyullynStill.blockID;
|
||||
case 10: return TContent.alumiteStill.blockID;
|
||||
case 11: return TContent.obsidianStill.blockID;
|
||||
case 12: return TContent.steelStill.blockID;*/
|
||||
//case 13: return TContent.ironStill.blockID;
|
||||
default: return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(int id, CreativeTabs tab, List list)
|
||||
{
|
||||
@@ -171,18 +149,6 @@ public class FilledBucket extends ItemBucket
|
||||
list.add(new ItemStack(id, 1, i));
|
||||
}
|
||||
|
||||
/*@SideOnly(Side.CLIENT)
|
||||
public int getIconFromDamage(int meta)
|
||||
{
|
||||
return this.iconIndex + meta;
|
||||
}
|
||||
|
||||
public String getUnlocalizedName(ItemStack stack)
|
||||
{
|
||||
int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, materialNames.length);
|
||||
return getItemName() + "." +materialNames[arr];
|
||||
}*/
|
||||
|
||||
public Icon[] icons;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package mods.tinker.tconstruct.logic;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.INetworkManager;
|
||||
import net.minecraft.network.packet.Packet;
|
||||
@@ -73,6 +74,19 @@ public class LavaTankLogic extends MultiServantLogic
|
||||
return tank.getLiquid() != null;
|
||||
}
|
||||
|
||||
public int getBrightness()
|
||||
{
|
||||
if (containsLiquid())
|
||||
{
|
||||
int id = tank.getLiquid().itemID;
|
||||
if (id < 4096)
|
||||
{
|
||||
return Block.lightValue[id];
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public void readFromNBT(NBTTagCompound tags)
|
||||
{
|
||||
if (tags.getBoolean("hasLiquid"))
|
||||
|
||||
@@ -15,19 +15,12 @@ public class LiquidTextureLogic extends TileEntity
|
||||
return false;
|
||||
}
|
||||
|
||||
public void setTexturePos (int tex)
|
||||
public void setLiquidType (int tex)
|
||||
{
|
||||
texturePos = tex;
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
public int getTexturePos ()
|
||||
{
|
||||
int tex = (texturePos % 5) * 3;
|
||||
tex += (texturePos / 5) * 32;
|
||||
return tex;
|
||||
}
|
||||
|
||||
public int getLiquidType ()
|
||||
{
|
||||
return texturePos;
|
||||
@@ -36,38 +29,37 @@ public class LiquidTextureLogic extends TileEntity
|
||||
public void readFromNBT (NBTTagCompound tags)
|
||||
{
|
||||
super.readFromNBT(tags);
|
||||
readCustomNBT(tags);
|
||||
}
|
||||
|
||||
public void readCustomNBT(NBTTagCompound tags)
|
||||
{
|
||||
texturePos = tags.getInteger("Texture");
|
||||
}
|
||||
|
||||
public void writeToNBT (NBTTagCompound tags)
|
||||
{
|
||||
super.writeToNBT(tags);
|
||||
writeCustomNBT(tags);
|
||||
}
|
||||
|
||||
public void writeCustomNBT (NBTTagCompound tags)
|
||||
{
|
||||
tags.setInteger("Texture", texturePos);
|
||||
}
|
||||
|
||||
/*public boolean shouldRefresh (int oldID, int newID, int oldMeta, int newMeta, World world, int x, int y, int z)
|
||||
{
|
||||
if (newID == TContent.metalFlowing.blockID || newID == TContent.metalStill.blockID)
|
||||
{
|
||||
System.out.println("Not refreshing");
|
||||
return false;
|
||||
}
|
||||
else
|
||||
return true;
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public Packet getDescriptionPacket ()
|
||||
{
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
writeToNBT(tag);
|
||||
writeCustomNBT(tag);
|
||||
return new Packet132TileEntityData(xCoord, yCoord, zCoord, 1, tag);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readFromNBT(packet.customParam1);
|
||||
readCustomNBT(packet.customParam1);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 6.8 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 6.5 KiB |
|
After Width: | Height: | Size: 15 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 10 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 7.4 KiB |
|
After Width: | Height: | Size: 13 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 9.0 KiB |
|
After Width: | Height: | Size: 13 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 8.8 KiB |
|
After Width: | Height: | Size: 13 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 9.0 KiB |
|
After Width: | Height: | Size: 14 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 9.9 KiB |
|
After Width: | Height: | Size: 15 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 14 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 9.7 KiB |
|
After Width: | Height: | Size: 13 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 9.1 KiB |
|
After Width: | Height: | Size: 7.1 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 5.2 KiB |
|
After Width: | Height: | Size: 7.1 KiB |
@@ -0,0 +1,38 @@
|
||||
0*2
|
||||
1*2
|
||||
2*2
|
||||
3*2
|
||||
4*2
|
||||
5*2
|
||||
6*2
|
||||
7*2
|
||||
8*2
|
||||
9*2
|
||||
10*2
|
||||
11*2
|
||||
12*2
|
||||
13*2
|
||||
14*2
|
||||
15*2
|
||||
16*2
|
||||
17*2
|
||||
18*2
|
||||
19*2
|
||||
18*2
|
||||
17*2
|
||||
16*2
|
||||
15*2
|
||||
14*2
|
||||
13*2
|
||||
12*2
|
||||
11*2
|
||||
10*2
|
||||
9*2
|
||||
8*2
|
||||
7*2
|
||||
6*2
|
||||
5*2
|
||||
4*2
|
||||
3*2
|
||||
2*2
|
||||
1*2
|
||||
|
After Width: | Height: | Size: 5.2 KiB |