Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Reformating, and rebalance of tanks, Final 1.4.5

Browse source 
Did some file changes to make finding things easier
Added: Custom creative tab
Changed: File root system, :p to many files
Changed: Tank liquid trade method to balance out instead of full trade
Changed: the packet update rate of the Tank to try to fix Render Lag
Fixed: Tank Render so Liquid levels can be seen
BugIgnorable: uneven levels of liquid will not show up on tank render
but are present
BugIgnorable: eValve names sometime glitch and call all instances Empty
XXX
TODO: Fix Textures, and add model for eValve
TODO: Finish One way valve
TODO: Finish OIL,STEAM,FUEL liquid/gas blocks
This commit is contained in:
Rseifert 2012-12-23 05:28:26 -05:00
parent b9b23fc63f
commit 5787f65148
67 changed files with 622 additions and 618 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
minecraft/dark/BasicUtilities/BPClientProxy.java
View file

@ -2,14 +2,14 @@ package dark.BasicUtilities;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import dark.BasicUtilities.machines.TileEntityPump;
import dark.BasicUtilities.mechanical.TileEntityRod;
import dark.BasicUtilities.pipes.TileEntityPipe;
import dark.BasicUtilities.Tile.TileEntityTank;
import dark.BasicUtilities.Tile.TileEntityPipe;
import dark.BasicUtilities.Tile.TileEntityPump;
import dark.BasicUtilities.Tile.TileEntityRod;
import dark.BasicUtilities.renders.RenderGearRod;
import dark.BasicUtilities.renders.RenderLTank;
import dark.BasicUtilities.renders.RenderTank;
import dark.BasicUtilities.renders.RenderPipe;
import dark.BasicUtilities.renders.RenderPump;
import dark.BasicUtilities.tanks.TileEntityLTank;
public class BPClientProxy extends BPCommonProxy
{
@ -25,7 +25,7 @@ public class BPClientProxy extends BPCommonProxy
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPipe.class, new RenderPipe());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPump.class, new RenderPump());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRod.class, new RenderGearRod());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLTank.class, new RenderLTank());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTank.class, new RenderTank());
RenderingRegistry.registerBlockHandler(new ItemRenderHelper());
}

51
minecraft/dark/BasicUtilities/BasicUtilitiesMain.java
View file

@ -27,30 +27,30 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import dark.BasicUtilities.Blocks.BlockEValve;
import dark.BasicUtilities.Blocks.BlockGenerator;
import dark.BasicUtilities.Blocks.BlockMachine;
import dark.BasicUtilities.Blocks.BlockOilFlowing;
import dark.BasicUtilities.Blocks.BlockOilStill;
import dark.BasicUtilities.Blocks.BlockPipe;
import dark.BasicUtilities.Blocks.BlockRod;
import dark.BasicUtilities.Blocks.BlockSteam;
import dark.BasicUtilities.Blocks.BlockValve;
import dark.BasicUtilities.Items.ItemEValve;
import dark.BasicUtilities.Items.ItemGuage;
import dark.BasicUtilities.Items.ItemMachine;
import dark.BasicUtilities.Items.ItemOilBucket;
import dark.BasicUtilities.Items.ItemParts;
import dark.BasicUtilities.Items.ItemPipe;
import dark.BasicUtilities.Items.ItemTank;
import dark.BasicUtilities.Items.ItemParts.basicParts;
import dark.BasicUtilities.Liquids.BlockOilFlowing;
import dark.BasicUtilities.Liquids.BlockOilStill;
import dark.BasicUtilities.Liquids.BlockSteam;
import dark.BasicUtilities.Liquids.ItemOilBucket;
import dark.BasicUtilities.Tile.TileEntityEValve;
import dark.BasicUtilities.Tile.TileEntityGen;
import dark.BasicUtilities.Tile.TileEntityTank;
import dark.BasicUtilities.Tile.TileEntityPipe;
import dark.BasicUtilities.Tile.TileEntityPump;
import dark.BasicUtilities.Tile.TileEntityRod;
import dark.BasicUtilities.api.Liquid;
import dark.BasicUtilities.machines.BlockMachine;
import dark.BasicUtilities.machines.BlockValve;
import dark.BasicUtilities.machines.ItemMachine;
import dark.BasicUtilities.machines.TileEntityPump;
import dark.BasicUtilities.mechanical.BlockGenerator;
import dark.BasicUtilities.mechanical.BlockRod;
import dark.BasicUtilities.mechanical.TileEntityGen;
import dark.BasicUtilities.mechanical.TileEntityRod;
import dark.BasicUtilities.pipes.BlockEValve;
import dark.BasicUtilities.pipes.BlockPipe;
import dark.BasicUtilities.pipes.ItemEValve;
import dark.BasicUtilities.pipes.ItemPipe;
import dark.BasicUtilities.pipes.TileEntityEValve;
import dark.BasicUtilities.pipes.TileEntityPipe;
import dark.BasicUtilities.tanks.ItemTank;
import dark.BasicUtilities.tanks.TileEntityLTank;
/**
* Used in the creation of a new mod class
@ -68,8 +68,8 @@ public class BasicUtilitiesMain extends DummyModContainer
// Constants
public static final String NAME = "BasicUtilities";
public static final String CHANNEL = "BPipes";
public static final String textureFile = "/dark/BasicUtilities/textures/";
public static final String BlOCK_PNG = "/dark/BasicUtilities/textures/blocks.png";
public static final String textureFile = "/dark/BasicUtilities/zResources/";
public static final String BlOCK_PNG = "/dark/BasicUtilities/zResources/blocks.png";
public static final String ITEM_PNG = "/dark/generaltextures/Items.png";
public static final Configuration CONFIGURATION = new Configuration(
new File(Loader.instance().getConfigDir(), NAME + ".cfg"));
@ -133,7 +133,7 @@ public class BasicUtilitiesMain extends DummyModContainer
GameRegistry.registerTileEntity(TileEntityPump.class, "pump");
GameRegistry.registerTileEntity(TileEntityRod.class, "rod");
GameRegistry.registerTileEntity(TileEntityEValve.class, "EValve");
GameRegistry.registerTileEntity(TileEntityLTank.class, "ltank");
GameRegistry.registerTileEntity(TileEntityTank.class, "ltank");
GameRegistry.registerTileEntity(TileEntityGen.class, "WattGenerator");
// Liquid Item/Block common name writer
for (int i = 0; i < Liquid.values().length; i++)
@ -153,12 +153,12 @@ public class BasicUtilitiesMain extends DummyModContainer
ItemParts.basicParts.values()[i].name);
}
// machines
LanguageRegistry.addName((new ItemStack(machine, 1, 0)), "WaterPump");
LanguageRegistry.addName((new ItemStack(machine, 1, 0)), "Pump");
LanguageRegistry.addName((new ItemStack(machine, 1, 4)), "WaterCondensor");
LanguageRegistry.addName((new ItemStack(generator, 1)), "EU Generator");
// mechanical rod
LanguageRegistry.addName((new ItemStack(rod, 1)), "MechRod");
LanguageRegistry.addName((new ItemStack(rod, 1)), "GearedRod");
// Tools
LanguageRegistry.addName((new ItemStack(gauge, 1, 0)), "PipeGuage");
}
@ -167,6 +167,7 @@ public class BasicUtilitiesMain extends DummyModContainer
public void PostInit(FMLPostInitializationEvent event)
{
proxy.postInit();
PipeTab.setItemStack(new ItemStack(itemPipes, 1, Liquid.WATER.ordinal()));
// generator
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(this.generator, 1), new Object[] {
"@T@", "OVO", "@T@",

6
minecraft/dark/BasicUtilities/pipes/BlockEValve.java → minecraft/dark/BasicUtilities/Blocks/BlockEValve.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.pipes;
package dark.BasicUtilities.Blocks;
import java.util.Random;
@ -13,6 +13,8 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import universalelectricity.prefab.implement.IRedstoneReceptor;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.PipeTab;
import dark.BasicUtilities.Tile.TileEntityEValve;
public class BlockEValve extends BlockContainer
{
@ -20,7 +22,7 @@ public class BlockEValve extends BlockContainer
public BlockEValve(int par1)
{
super(par1, Material.iron);
this.setCreativeTab(CreativeTabs.tabRedstone);
this.setCreativeTab(PipeTab.INSTANCE);
this.setHardness(1f);
this.setResistance(5f);
}

8
minecraft/dark/BasicUtilities/mechanical/BlockGenerator.java → minecraft/dark/BasicUtilities/Blocks/BlockGenerator.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.mechanical;
package dark.BasicUtilities.Blocks;
import java.util.ArrayList;
@ -11,12 +11,16 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import dark.BasicUtilities.ItemRenderHelper;
import dark.BasicUtilities.PipeTab;
import dark.BasicUtilities.Tile.TileEntityGen;
public class BlockGenerator extends universalelectricity.prefab.BlockMachine {
public BlockGenerator(int id) {
super("Generator", id, Material.iron);
this.setCreativeTab(CreativeTabs.tabBlock);
this.setCreativeTab(PipeTab.INSTANCE);
this.setHardness(1f);
this.setResistance(5f);
}
@Override

10
minecraft/dark/BasicUtilities/machines/BlockMachine.java → minecraft/dark/BasicUtilities/Blocks/BlockMachine.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.machines;
package dark.BasicUtilities.Blocks;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@ -6,7 +6,9 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import dark.BasicUtilities.ItemRenderHelper;
import dark.BasicUtilities.tanks.TileEntityLTank;
import dark.BasicUtilities.PipeTab;
import dark.BasicUtilities.Tile.TileEntityTank;
import dark.BasicUtilities.Tile.TileEntityPump;
public class BlockMachine extends BlockContainer
{
@ -15,7 +17,7 @@ public class BlockMachine extends BlockContainer
{
super(id, Material.iron);
this.setBlockName("Machine");
this.setCreativeTab(CreativeTabs.tabBlock);
this.setCreativeTab(PipeTab.INSTANCE);
this.setRequiresSelfNotify();
this.blockIndexInTexture = 26;
this.setHardness(1f);
@ -55,7 +57,7 @@ public class BlockMachine extends BlockContainer
{
// return new TileEntityCondenser();
}
if (meta == 5) { return new TileEntityLTank(); }
if (meta == 5) { return new TileEntityTank(); }
return null;
}

2
minecraft/dark/BasicUtilities/Liquids/BlockOilFlowing.java → minecraft/dark/BasicUtilities/Blocks/BlockOilFlowing.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.Liquids;
package dark.BasicUtilities.Blocks;
import java.util.Random;

2
minecraft/dark/BasicUtilities/Liquids/BlockOilStill.java → minecraft/dark/BasicUtilities/Blocks/BlockOilStill.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.Liquids;
package dark.BasicUtilities.Blocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStationary;

3
minecraft/dark/BasicUtilities/pipes/BlockPipe.java → minecraft/dark/BasicUtilities/Blocks/BlockPipe.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.pipes;
package dark.BasicUtilities.Blocks;
import java.util.Random;
@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.Tile.TileEntityPipe;
public class BlockPipe extends BlockContainer
{

8
minecraft/dark/BasicUtilities/mechanical/BlockRod.java → minecraft/dark/BasicUtilities/Blocks/BlockRod.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.mechanical;
package dark.BasicUtilities.Blocks;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
@ -9,6 +9,8 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import dark.BasicUtilities.ItemRenderHelper;
import dark.BasicUtilities.PipeTab;
import dark.BasicUtilities.Tile.TileEntityRod;
public class BlockRod extends universalelectricity.prefab.BlockMachine
{
@ -16,7 +18,9 @@ public class BlockRod extends universalelectricity.prefab.BlockMachine
public BlockRod(int par1)
{
super("MechanicRod", par1, Material.iron);
this.setCreativeTab(CreativeTabs.tabRedstone);
this.setCreativeTab(PipeTab.INSTANCE);
this.setHardness(1f);
this.setResistance(5f);
}
@Override

2
minecraft/dark/BasicUtilities/Liquids/BlockSteam.java → minecraft/dark/BasicUtilities/Blocks/BlockSteam.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.Liquids;
package dark.BasicUtilities.Blocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;

7
minecraft/dark/BasicUtilities/machines/BlockValve.java → minecraft/dark/BasicUtilities/Blocks/BlockValve.java
View file

@ -1,13 +1,14 @@
package dark.BasicUtilities.machines;
package dark.BasicUtilities.Blocks;
import java.util.Random;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.PipeTab;
import dark.BasicUtilities.Tile.TileEntityValve;
public class BlockValve extends universalelectricity.prefab.BlockMachine
{
@ -16,7 +17,7 @@ public class BlockValve extends universalelectricity.prefab.BlockMachine
{
super("Valve", id, Material.iron);
this.setBlockName("Valve");
this.setCreativeTab(CreativeTabs.tabRedstone);
this.setCreativeTab(PipeTab.INSTANCE);
this.setRequiresSelfNotify();
this.blockIndexInTexture = 26;
this.setHardness(2f);

6
minecraft/dark/BasicUtilities/ItemRenderHelper.java
View file

@ -9,9 +9,9 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import dark.BasicUtilities.renders.ModelGearRod;
import dark.BasicUtilities.renders.ModelGenerator;
import dark.BasicUtilities.renders.ModelPump;
import dark.BasicUtilities.renders.models.ModelGearRod;
import dark.BasicUtilities.renders.models.ModelGenerator;
import dark.BasicUtilities.renders.models.ModelPump;
public class ItemRenderHelper implements ISimpleBlockRenderingHandler {
public static ItemRenderHelper instance = new ItemRenderHelper();

3
minecraft/dark/BasicUtilities/pipes/ItemEValve.java → minecraft/dark/BasicUtilities/Items/ItemEValve.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.pipes;
package dark.BasicUtilities.Items;
import java.util.List;
@ -11,6 +11,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.Tile.TileEntityEValve;
import dark.BasicUtilities.api.Liquid;
public class ItemEValve extends ItemBlock

3
minecraft/dark/BasicUtilities/Items/ItemGuage.java
View file

@ -10,6 +10,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.PipeTab;
import dark.BasicUtilities.api.IReadOut;
public class ItemGuage extends Item
@ -23,7 +24,7 @@ public class ItemGuage extends Item
this.setHasSubtypes(true);
this.setIconIndex(10);
this.setItemName("guage");
this.setCreativeTab(CreativeTabs.tabTools);
this.setCreativeTab(PipeTab.INSTANCE);
this.setMaxStackSize(1);
}

5
minecraft/dark/BasicUtilities/machines/ItemMachine.java → minecraft/dark/BasicUtilities/Items/ItemMachine.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.machines;
package dark.BasicUtilities.Items;
import java.util.List;
@ -11,6 +11,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.PipeTab;
public class ItemMachine extends ItemBlock
{
@ -24,7 +25,7 @@ public class ItemMachine extends ItemBlock
this.setHasSubtypes(true);
this.setIconIndex(10);
this.setItemName("Machine");
this.setCreativeTab(CreativeTabs.tabRedstone);
this.setCreativeTab(PipeTab.INSTANCE);
}
@Override
public int getIconFromDamage(int par1)

2
minecraft/dark/BasicUtilities/Liquids/ItemOilBucket.java → minecraft/dark/BasicUtilities/Items/ItemOilBucket.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.Liquids;
package dark.BasicUtilities.Items;
import dark.BasicUtilities.BasicUtilitiesMain;
import net.minecraft.item.Item;

3
minecraft/dark/BasicUtilities/Items/ItemParts.java
View file

@ -6,6 +6,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.PipeTab;
public class ItemParts extends Item
{
@ -31,7 +32,7 @@ public class ItemParts extends Item
this.setHasSubtypes(true);
this.setMaxDamage(0);
this.setMaxStackSize(64);
this.setCreativeTab(CreativeTabs.tabMaterials);
this.setCreativeTab(PipeTab.INSTANCE);
}
@Override

6
minecraft/dark/BasicUtilities/pipes/ItemPipe.java → minecraft/dark/BasicUtilities/Items/ItemPipe.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.pipes;
package dark.BasicUtilities.Items;
import java.util.List;
@ -10,6 +10,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.PipeTab;
import dark.BasicUtilities.Tile.TileEntityPipe;
import dark.BasicUtilities.api.Liquid;
public class ItemPipe extends Item
@ -24,7 +26,7 @@ public class ItemPipe extends Item
this.setHasSubtypes(true);
this.setIconIndex(10);
this.setItemName("pipe");
this.setCreativeTab(CreativeTabs.tabRedstone);
this.setCreativeTab(PipeTab.INSTANCE);
}
@Override

10
minecraft/dark/BasicUtilities/tanks/ItemTank.java → minecraft/dark/BasicUtilities/Items/ItemTank.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.tanks;
package dark.BasicUtilities.Items;
import java.util.List;
@ -10,6 +10,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.PipeTab;
import dark.BasicUtilities.Tile.TileEntityTank;
import dark.BasicUtilities.api.Liquid;
public class ItemTank extends Item
@ -24,7 +26,7 @@ public class ItemTank extends Item
this.setHasSubtypes(true);
this.setIconIndex(10);
this.setItemName("tank");
this.setCreativeTab(CreativeTabs.tabRedstone);
this.setCreativeTab(PipeTab.INSTANCE);
}
@Override
@ -114,9 +116,9 @@ public class ItemTank extends Item
Block.blocksList[this.spawnID].onBlockAdded(par3World, par4, par5, par6);
Block.blocksList[this.spawnID].onBlockPlacedBy(par3World, par4, par5, par6, par2EntityPlayer);
TileEntity blockEntity = par3World.getBlockTileEntity(par4, par5, par6);
if (blockEntity instanceof TileEntityLTank)
if (blockEntity instanceof TileEntityTank)
{
TileEntityLTank pipeEntity = (TileEntityLTank) blockEntity;
TileEntityTank pipeEntity = (TileEntityTank) blockEntity;
Liquid dm = Liquid.getLiquid(par1ItemStack.getItemDamage());
pipeEntity.setType(dm);
}

5
minecraft/dark/BasicUtilities/machines/ItemValve.java → minecraft/dark/BasicUtilities/Items/ItemValve.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.machines;
package dark.BasicUtilities.Items;
import java.util.List;
@ -11,6 +11,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.PipeTab;
public class ItemValve extends ItemBlock
{
@ -24,7 +25,7 @@ public class ItemValve extends ItemBlock
this.setHasSubtypes(true);
this.setIconIndex(10);
this.setItemName("Machine");
this.setCreativeTab(CreativeTabs.tabRedstone);
this.setCreativeTab(PipeTab.INSTANCE);
}
@Override
public int getIconFromDamage(int par1)

34
minecraft/dark/BasicUtilities/PipeTab.java Normal file
View file

@ -0,0 +1,34 @@
package dark.BasicUtilities;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.LanguageRegistry;
public class PipeTab extends CreativeTabs
{
public static final PipeTab INSTANCE = new PipeTab("BasicPipes");
private static ItemStack itemStack;
public PipeTab(String par2Str)
{
super(CreativeTabs.getNextID(), par2Str);
LanguageRegistry.instance().addStringLocalization("itemGroup.BasicPipes", "en_US", "Basic Pipes");
}
public static void setItemStack(ItemStack newItemStack)
{
if (itemStack == null)
{
itemStack = newItemStack;
}
}
@Override
public ItemStack getIconItemStack()
{
if (itemStack == null) { return new ItemStack(Block.blocksList[this.getTabIconItemIndex()]); }
return itemStack;
}
}

3
minecraft/dark/BasicUtilities/pipes/TileEntityEValve.java → minecraft/dark/BasicUtilities/Tile/TileEntityEValve.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.pipes;
package dark.BasicUtilities.Tile;
import universalelectricity.prefab.implement.IRedstoneReceptor;
import cpw.mods.fml.common.FMLLog;
@ -12,6 +12,7 @@ import net.minecraftforge.liquids.ITankContainer;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidStack;
import net.minecraftforge.liquids.LiquidTank;
import dark.BasicUtilities.Blocks.BlockEValve;
import dark.BasicUtilities.api.IReadOut;
import dark.BasicUtilities.api.ITankOutputer;
import dark.BasicUtilities.api.Liquid;

2
minecraft/dark/BasicUtilities/mechanical/TileEntityGen.java → minecraft/dark/BasicUtilities/Tile/TileEntityGen.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.mechanical;
package dark.BasicUtilities.Tile;
import java.util.EnumSet;

4
minecraft/dark/BasicUtilities/pipes/TileEntityPipe.java → minecraft/dark/BasicUtilities/Tile/TileEntityPipe.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.pipes;
package dark.BasicUtilities.Tile;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
@ -29,7 +29,7 @@ import dark.BasicUtilities.api.MHelper;
public class TileEntityPipe extends TileEntity implements ITankContainer, IPacketReceiver, IReadOut
{
protected Liquid type = Liquid.DEFUALT;
public Liquid type = Liquid.DEFUALT;
private int count = 20;
private int count2, presure = 0;

2
minecraft/dark/BasicUtilities/machines/TileEntityPump.java → minecraft/dark/BasicUtilities/Tile/TileEntityPump.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.machines;
package dark.BasicUtilities.Tile;
import java.util.EnumSet;

2
minecraft/dark/BasicUtilities/mechanical/TileEntityRod.java → minecraft/dark/BasicUtilities/Tile/TileEntityRod.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.mechanical;
package dark.BasicUtilities.Tile;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;

70
minecraft/dark/BasicUtilities/tanks/TileEntityLTank.java → minecraft/dark/BasicUtilities/Tile/TileEntityTank.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.tanks;
package dark.BasicUtilities.Tile;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
@ -25,7 +25,7 @@ import dark.BasicUtilities.api.ITankOutputer;
import dark.BasicUtilities.api.Liquid;
import dark.BasicUtilities.api.MHelper;
public class TileEntityLTank extends TileEntity implements IPacketReceiver, IReadOut, ITankOutputer
public class TileEntityTank extends TileEntity implements IPacketReceiver, IReadOut, ITankOutputer
{
public TileEntity[] cc =
{ null, null, null, null, null, null };
@ -45,7 +45,7 @@ public class TileEntityLTank extends TileEntity implements IPacketReceiver, IRea
}
LiquidStack liquid = tank.getLiquid();
if (++count >= 5 && liquid != null)
if (++count >= 20 && liquid != null)
{
count = 0;
this.cc = MHelper.getSourounding(worldObj, xCoord, yCoord, zCoord);
@ -53,14 +53,10 @@ public class TileEntityLTank extends TileEntity implements IPacketReceiver, IRea
{
this.tradeDown();
this.tradeArround();
if (doUpdate || count2 >= 20)
{
this.doUpdate = false;
count2 = 0;
Packet packet = PacketManager.getPacket(BasicUtilitiesMain.CHANNEL, this, new Object[]
{ type.ordinal(), liquid.amount });
PacketManager.sendPacketToClients(packet, worldObj, Vector3.get(this), 20);
}
Packet packet = PacketManager.getPacket(BasicUtilitiesMain.CHANNEL, this, new Object[] { type.ordinal(), liquid.amount });
PacketManager.sendPacketToClients(packet, worldObj, new Vector3(this), 20);
}
}
}
@ -147,8 +143,9 @@ public class TileEntityLTank extends TileEntity implements IPacketReceiver, IRea
int change = 1;
if (Liquid.getLiquid(resource).doesFlaot) change = -1;
TileEntity tank = worldObj.getBlockTileEntity(xCoord, yCoord + change, zCoord);
if (tank instanceof TileEntityLTank) { return ((TileEntityLTank) tank).tank.fill(resource, doFill); }
if (tank instanceof TileEntityTank) { return ((TileEntityTank) tank).tank.fill(resource, doFill); }
}
this.doUpdate = true;
return this.tank.fill(resource, doFill);
}
@ -159,9 +156,9 @@ public class TileEntityLTank extends TileEntity implements IPacketReceiver, IRea
return true;
}
public TileEntityLTank getFillAbleTank(boolean top)
public TileEntityTank getFillAbleTank(boolean top)
{
TileEntityLTank tank = this;
TileEntityTank tank = this;
boolean stop = false;
int y = tank.yCoord;
while (y > 6 && y < 255)
@ -175,9 +172,9 @@ public class TileEntityLTank extends TileEntity implements IPacketReceiver, IRea
y -= 1;
}
TileEntity ent = tank.worldObj.getBlockTileEntity(xCoord, y, zCoord);
if (ent instanceof TileEntityLTank && ((TileEntityLTank) ent).getType() == this.type && !((TileEntityLTank) ent).isFull())
if (ent instanceof TileEntityTank && ((TileEntityTank) ent).getType() == this.type && !((TileEntityTank) ent).isFull())
{
tank = (TileEntityLTank) ent;
tank = (TileEntityTank) ent;
}
else
{
@ -197,6 +194,7 @@ public class TileEntityLTank extends TileEntity implements IPacketReceiver, IRea
public LiquidStack drain(int tankIndex, int maxDrain, boolean doDrain)
{
if (tankIndex != 0) return null;
this.doUpdate = true;
return this.tank.getLiquid();
}
@ -238,9 +236,9 @@ public class TileEntityLTank extends TileEntity implements IPacketReceiver, IRea
{
if (this.tank.getLiquid() == null || this.tank.getLiquid().amount <= 0) return;
TileEntity ent = worldObj.getBlockTileEntity(xCoord, yCoord - 1, zCoord);
if (ent instanceof TileEntityLTank && ((TileEntityLTank) ent).type == this.type && !((TileEntityLTank) ent).isFull())
if (ent instanceof TileEntityTank && ((TileEntityTank) ent).type == this.type && !((TileEntityTank) ent).isFull())
{
int f = ((TileEntityLTank) ent).tank.fill(this.tank.getLiquid(), true);
int f = ((TileEntityTank) ent).tank.fill(this.tank.getLiquid(), true);
this.tank.drain(f, true);
}
}
@ -249,14 +247,44 @@ public class TileEntityLTank extends TileEntity implements IPacketReceiver, IRea
{
if (this.tank.getLiquid() == null || this.tank.getLiquid().amount <= 0) return;
TileEntity[] ents = MHelper.getSourounding(worldObj, xCoord, yCoord, zCoord);
int commonVol = this.tank.getLiquid().amount;
int tanks = 1;
for (int i = 2; i < 6; i++)
{
if (ents[i] instanceof TileEntityLTank && ((TileEntityLTank) ents[i]).type == this.type && !((TileEntityLTank) ents[i]).isFull())
if (ents[i] instanceof TileEntityTank && ((TileEntityTank) ents[i]).type == this.type)
{
int f = ((TileEntityLTank) ents[i]).tank.fill(this.tank.getLiquid(), true);
tanks++;
if (((TileEntityTank) ents[i]).tank.getLiquid() != null)
{
commonVol += ((TileEntityTank) ents[i]).tank.getLiquid().amount;
}
}
}
int equalVol = commonVol / tanks;
for (int i = 2; i < 6; i++)
{
if (this.tank.getLiquid() == null || this.tank.getLiquid().amount <= equalVol) break;
if (ents[i] instanceof TileEntityTank && ((TileEntityTank) ents[i]).type == this.type && !((TileEntityTank) ents[i]).isFull())
{
LiquidStack stack = ((TileEntityTank) ents[i]).tank.getLiquid();
LiquidStack filling = this.tank.getLiquid();
if (stack == null)
{
filling = Liquid.getStack(this.type, equalVol);
}
else if (stack.amount < equalVol)
{
filling = Liquid.getStack(this.type, equalVol - stack.amount);
}
else
{
filling = null;
}
int f = ((TileEntityTank) ents[i]).tank.fill(filling, true);
this.tank.drain(f, true);
}
if (this.tank.getLiquid() == null || this.tank.getLiquid().amount <= 0) break;
}
}
}

5
minecraft/dark/BasicUtilities/machines/TileEntityValve.java → minecraft/dark/BasicUtilities/Tile/TileEntityValve.java
View file

@ -1,9 +1,8 @@
package dark.BasicUtilities.machines;
package dark.BasicUtilities.Tile;
import net.minecraft.tileentity.TileEntity;
import dark.BasicUtilities.api.Liquid;
import dark.BasicUtilities.api.MHelper;
import dark.BasicUtilities.pipes.TileEntityPipe;
public class TileEntityValve extends TileEntity{
Liquid type = Liquid.DEFUALT;
@ -11,7 +10,7 @@ int liquidStored = 0;
int lMax = 1;
int tickCount = 0;
TileEntity[] connected = {null,null,null,null,null,null};
boolean on = false;
public boolean on = false;
@Override
public void updateEntity()
{

30
minecraft/dark/BasicUtilities/api/Beam.java
View file

@ -1,30 +0,0 @@
package dark.BasicUtilities.api;
import net.minecraftforge.common.ForgeDirection;
public class Beam
{
// might need a more complex system for this later but for now this will
// work
public int intensity; // Beam intensity level
public boolean light; // Can prodcue light, might use this later
public ForgeDirection movDir; // Used to find the beams current direction
public Beam()
{
this(0, false, ForgeDirection.UNKNOWN);
}
Beam(int i, boolean light, ForgeDirection dir)
{
intensity = i;
this.light = light;
movDir = dir;
}
public static int getBeamLevel(Beam beam)
{
return beam.intensity;
}
}

26
minecraft/dark/BasicUtilities/api/IBeamProducer.java
View file

@ -1,26 +0,0 @@
package dark.BasicUtilities.api;
import net.minecraftforge.common.ForgeDirection;
public interface IBeamProducer {
/**
* onProduceLiquid
* block.
* @param type - the type of liquid
* @param regInt - requested beam intensity
* @param side - The side
* @return New Beam - Return a vol of liquid type that is produced
*/
public int createNewBeam(int type, int reqInt, ForgeDirection side);
/**
* canProduceLiquid
* block.
* @param type - the type of liquid
* @param side - The side
* @return boolean - True if can, false if can't produce liquid of type or on that side
* Also used for connection rules of pipes'
*/
public boolean canCreateBeam(int type, ForgeDirection side);
}

33
minecraft/dark/BasicUtilities/creative/BlockCreative.java
View file

@ -1,33 +0,0 @@
package dark.BasicUtilities.creative;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
/**
* A block that can only be accessed from the
* creative menu used to both test the mod
* and other odd things
* @author Rseifert
*
*/
public class BlockCreative extends BlockContainer {
protected BlockCreative(int par1)
{
super(par1, Material.iron);
}
@Override
public TileEntity createNewTileEntity(World var1)
{
return null;
}
@Override
public TileEntity createNewTileEntity(World var1, int meta)
{
return null;
}
}

419
minecraft/dark/BasicUtilities/renders/ModelLiquidTank.java
View file

@ -1,419 +0,0 @@
// Date: 10/8/2012 7:31:40 PM
// Template version 1.1
// Java generated by Techne
// Keep in mind that you still need to fill in some blanks
// - ZeuX
package dark.BasicUtilities.renders;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import dark.BasicUtilities.pipes.TileEntityPipe;
import dark.BasicUtilities.tanks.TileEntityLTank;
public class ModelLiquidTank extends ModelBase
{
//fields
ModelRenderer Mid;
ModelRenderer Corner;
ModelRenderer Corner2;
ModelRenderer Corner3;
ModelRenderer Corner4;
ModelRenderer C8;
ModelRenderer C7;
ModelRenderer C6;
ModelRenderer C5;
ModelRenderer C4;
ModelRenderer C;
ModelRenderer C3;
ModelRenderer C2;
ModelRenderer GuageT;
ModelRenderer GuageB;
ModelRenderer Guage;
ModelRenderer GuageR;
ModelRenderer GuageGlass;
ModelRenderer GuageL;
ModelRenderer GuageT2;
ModelRenderer GuageB2;
ModelRenderer Guage2;
ModelRenderer GuageR2;
ModelRenderer GuageGlass2;
ModelRenderer GuageL2;
ModelRenderer GuageT3;
ModelRenderer GuageB3;
ModelRenderer Guage3;
ModelRenderer GuageR3;
ModelRenderer GuageGlass3;
ModelRenderer GuageL3;
ModelRenderer GuageT4;
ModelRenderer GuageB4;
ModelRenderer Guage4;
ModelRenderer GuageR4;
ModelRenderer GuageGlass4;
ModelRenderer GuageL4;
ModelRenderer CCBottom;
ModelRenderer CCRight;
ModelRenderer CCLeft;
ModelRenderer CCFront;
ModelRenderer CCBack;
ModelRenderer CCTop;
public ModelLiquidTank()
{
textureWidth = 128;
textureHeight = 128;
Mid = new ModelRenderer(this, 0, 50);
Mid.addBox(-6F, 0F, -6F, 12, 14, 12);
Mid.setRotationPoint(0F, 9F, 0F);
Mid.setTextureSize(128, 128);
Mid.mirror = true;
setRotation(Mid, 0F, 0F, 0F);
Corner = new ModelRenderer(this, 0, 30);
Corner.addBox(-1F, 0F, -1F, 2, 16, 2);
Corner.setRotationPoint(-7F, 8F, 7F);
Corner.setTextureSize(128, 128);
Corner.mirror = true;
setRotation(Corner, 0F, 0F, 0F);
Corner2 = new ModelRenderer(this, 0, 30);
Corner2.addBox(-1F, 0F, -1F, 2, 16, 2);
Corner2.setRotationPoint(-7F, 8F, -7F);
Corner2.setTextureSize(128, 128);
Corner2.mirror = true;
setRotation(Corner2, 0F, 0F, 0F);
Corner3 = new ModelRenderer(this, 0, 30);
Corner3.addBox(-1F, 0F, -1F, 2, 16, 2);
Corner3.setRotationPoint(7F, 8F, -7F);
Corner3.setTextureSize(128, 128);
Corner3.mirror = true;
setRotation(Corner3, 0F, 0F, 0F);
Corner4 = new ModelRenderer(this, 0, 30);
Corner4.addBox(-1F, 0F, -1F, 2, 16, 2);
Corner4.setRotationPoint(7F, 8F, 7F);
Corner4.setTextureSize(128, 128);
Corner4.mirror = true;
setRotation(Corner4, 0F, 0F, 0F);
C8 = new ModelRenderer(this, 9, 35);
C8.addBox(-1F, 0F, -1F, 2, 2, 12);
C8.setRotationPoint(6F, 22F, -5F);
C8.setTextureSize(128, 128);
C8.mirror = true;
setRotation(C8, 0F, 0F, 0F);
C7 = new ModelRenderer(this, 9, 35);
C7.addBox(-1F, 0F, -1F, 2, 2, 12);
C7.setRotationPoint(-6F, 8F, -5F);
C7.setTextureSize(128, 128);
C7.mirror = true;
setRotation(C7, 0F, 0F, 0F);
C6 = new ModelRenderer(this, 9, 35);
C6.addBox(-1F, 0F, -1F, 2, 2, 12);
C6.setRotationPoint(6F, 8F, -5F);
C6.setTextureSize(128, 128);
C6.mirror = true;
setRotation(C6, 0F, 0F, 0F);
C5 = new ModelRenderer(this, 9, 30);
C5.addBox(-1F, 0F, -1F, 12, 2, 2);
C5.setRotationPoint(-5F, 8F, 6F);
C5.setTextureSize(128, 128);
C5.mirror = true;
setRotation(C5, 0F, 0F, 0F);
C4 = new ModelRenderer(this, 9, 35);
C4.addBox(-1F, 0F, -1F, 2, 2, 12);
C4.setRotationPoint(-6F, 22F, -5F);
C4.setTextureSize(128, 128);
C4.mirror = true;
setRotation(C4, 0F, 0F, 0F);
C = new ModelRenderer(this, 9, 30);
C.addBox(-1F, 0F, -1F, 12, 2, 2);
C.setRotationPoint(-5F, 22F, 6F);
C.setTextureSize(128, 128);
C.mirror = true;
setRotation(C, 0F, 0F, 0F);
C3 = new ModelRenderer(this, 9, 30);
C3.addBox(-1F, 0F, -1F, 12, 2, 2);
C3.setRotationPoint(-5F, 8F, -6F);
C3.setTextureSize(128, 128);
C3.mirror = true;
setRotation(C3, 0F, 0F, 0F);
C2 = new ModelRenderer(this, 9, 30);
C2.addBox(-1F, 0F, -1F, 12, 2, 2);
C2.setRotationPoint(-5F, 22F, -6F);
C2.setTextureSize(128, 128);
C2.mirror = true;
setRotation(C2, 0F, 0F, 0F);
//G1--------------------------------------
GuageT = new ModelRenderer(this, 54, 42);
GuageT.addBox(-1F, -1F, 0F, 2, 1, 2);
GuageT.setRotationPoint(0F, 12F, -8F);
GuageT.setTextureSize(128, 128);
GuageT.mirror = true;
setRotation(GuageT, 0F, 0F, 0F);
GuageB = new ModelRenderer(this, 54, 42);
GuageB.addBox(-1F, 8F, 0F, 2, 1, 2);
GuageB.setRotationPoint(0F, 12F, -8F);
GuageB.setTextureSize(128, 128);
GuageB.mirror = true;
setRotation(GuageB, 0F, 0F, 0F);
Guage = new ModelRenderer(this, 54, 32);
Guage.addBox(-1F, 0F, 0F, 2, 8, 1);
Guage.setRotationPoint(0F, 12F, -7F);
Guage.setTextureSize(128, 128);
Guage.mirror = true;
setRotation(Guage, 0F, 0F, 0F);
GuageR = new ModelRenderer(this, 44, 32);
GuageR.addBox(1F, -1F, -1F, 2, 10, 2);
GuageR.setRotationPoint(0F, 12F, -7F);
GuageR.setTextureSize(128, 128);
GuageR.mirror = true;
setRotation(GuageR, 0F, 0F, 0F);
GuageGlass = new ModelRenderer(this, 60, 32);
GuageGlass.addBox(-1F, 0F, 0F, 2, 8, 1);
GuageGlass.setRotationPoint(0F, 12F, -8F);
GuageGlass.setTextureSize(128, 128);
GuageGlass.mirror = true;
setRotation(GuageGlass, 0F, 0F, 0F);
GuageL = new ModelRenderer(this, 44, 32);
GuageL.addBox(-3F, -1F, -1F, 2, 10, 2);
GuageL.setRotationPoint(0F, 12F, -7F);
GuageL.setTextureSize(128, 128);
GuageL.mirror = true;
setRotation(GuageL, 0F, 0F, 0F);
//G2----------------------------------
GuageT2 = new ModelRenderer(this, 54, 42);
GuageT2.addBox(-1F, -1F, 0F, 2, 1, 2);
GuageT2.setRotationPoint(-8F, 12F, 0F);
GuageT2.setTextureSize(128, 128);
GuageT2.mirror = true;
setRotation(GuageT2, 0F, 1.570796F, 0F);
GuageB2 = new ModelRenderer(this, 54, 42);
GuageB2.addBox(-1F, 8F, 0F, 2, 1, 2);
GuageB2.setRotationPoint(-8F, 12F, 0F);
GuageB2.setTextureSize(128, 128);
GuageB2.mirror = true;
setRotation(GuageB2, 0F, 1.570796F, 0F);
Guage2 = new ModelRenderer(this, 54, 32);
Guage2.addBox(-1F, 0F, 0F, 2, 8, 1);
Guage2.setRotationPoint(-7F, 12F, 0F);
Guage2.setTextureSize(128, 128);
Guage2.mirror = true;
setRotation(Guage2, 0F, 1.570796F, 0F);
GuageR2 = new ModelRenderer(this, 44, 32);
GuageR2.addBox(1F, -1F, -1F, 2, 10, 2);
GuageR2.setRotationPoint(-7F, 12F, 0F);
GuageR2.setTextureSize(128, 128);
GuageR2.mirror = true;
setRotation(GuageR2, 0F, 1.570796F, 0F);
GuageGlass2 = new ModelRenderer(this, 60, 32);
GuageGlass2.addBox(-1F, 0F, 0F, 2, 8, 1);
GuageGlass2.setRotationPoint(-8F, 12F, 0F);
GuageGlass2.setTextureSize(128, 128);
GuageGlass2.mirror = true;
setRotation(GuageGlass2, 0F, 1.570796F, 0F);
GuageL2 = new ModelRenderer(this, 44, 32);
GuageL2.addBox(-3F, -1F, -1F, 2, 10, 2);
GuageL2.setRotationPoint(-7F, 12F, 0F);
GuageL2.setTextureSize(128, 128);
GuageL2.mirror = true;
setRotation(GuageL2, 0F, 1.570796F, 0F);
//G3--------------------------------------
GuageT3 = new ModelRenderer(this, 54, 42);
GuageT3.addBox(-1F, -1F, 0F, 2, 1, 2);
GuageT3.setRotationPoint(0F, 12F, 8F);
GuageT3.setTextureSize(128, 128);
GuageT3.mirror = true;
setRotation(GuageT3, 0F, 3.141593F, 0F);
GuageB3 = new ModelRenderer(this, 54, 42);
GuageB3.addBox(-1F, 8F, 0F, 2, 1, 2);
GuageB3.setRotationPoint(0F, 12F, 8F);
GuageB3.setTextureSize(128, 128);
GuageB3.mirror = true;
setRotation(GuageB3, 0F, 3.141593F, 0F);
Guage3 = new ModelRenderer(this, 54, 32);
Guage3.addBox(-1F, 0F, 0F, 2, 8, 1);
Guage3.setRotationPoint(0F, 12F, 7F);
Guage3.setTextureSize(128, 128);
Guage3.mirror = true;
setRotation(Guage3, 0F, 3.141593F, 0F);
GuageR3 = new ModelRenderer(this, 44, 32);
GuageR3.addBox(1F, -1F, -1F, 2, 10, 2);
GuageR3.setRotationPoint(0F, 12F, 7F);
GuageR3.setTextureSize(128, 128);
GuageR3.mirror = true;
setRotation(GuageR3, 0F, 3.141593F, 0F);
GuageGlass3 = new ModelRenderer(this, 60, 32);
GuageGlass3.addBox(-1F, 0F, 0F, 2, 8, 1);
GuageGlass3.setRotationPoint(0F, 12F, 8F);
GuageGlass3.setTextureSize(128, 128);
GuageGlass3.mirror = true;
setRotation(GuageGlass3, 0F, 3.141593F, 0F);
GuageL3 = new ModelRenderer(this, 44, 32);
GuageL3.addBox(-3F, -1F, -1F, 2, 10, 2);
GuageL3.setRotationPoint(0F, 12F, 7F);
GuageL3.setTextureSize(128, 128);
GuageL3.mirror = true;
setRotation(GuageL3, 0F, 3.141593F, 0F);
//G4-------------------------------
GuageT4 = new ModelRenderer(this, 54, 42);
GuageT4.addBox(-1F, -1F, 0F, 2, 1, 2);
GuageT4.setRotationPoint(8F, 12F, 0F);
GuageT4.setTextureSize(128, 128);
GuageT4.mirror = true;
setRotation(GuageT4, 0F, -1.570796F, 0F);
GuageB4 = new ModelRenderer(this, 54, 42);
GuageB4.addBox(-1F, 8F, 0F, 2, 1, 2);
GuageB4.setRotationPoint(8F, 12F, 0F);
GuageB4.setTextureSize(128, 128);
GuageB4.mirror = true;
setRotation(GuageB4, 0F, -1.570796F, 0F);
Guage4 = new ModelRenderer(this, 54, 32);
Guage4.addBox(-1F, 0F, 0F, 2, 8, 1);
Guage4.setRotationPoint(7F, 12F, 0F);
Guage4.setTextureSize(128, 128);
Guage4.mirror = true;
setRotation(Guage4, 0F, -1.570796F, 0F);
GuageR4 = new ModelRenderer(this, 44, 32);
GuageR4.addBox(1F, -1F, -1F, 2, 10, 2);
GuageR4.setRotationPoint(7F, 12F, 0F);
GuageR4.setTextureSize(128, 128);
GuageR4.mirror = true;
setRotation(GuageR4, 0F, -1.570796F, 0F);
GuageGlass4 = new ModelRenderer(this, 60, 32);
GuageGlass4.addBox(-1F, 0F, 0F, 2, 8, 1);
GuageGlass4.setRotationPoint(8F, 12F, 0F);
GuageGlass4.setTextureSize(128, 128);
GuageGlass4.mirror = true;
setRotation(GuageGlass4, 0F, -1.570796F, 0F);
GuageL4 = new ModelRenderer(this, 44, 32);
GuageL4.addBox(-3F, -1F, -1F, 2, 10, 2);
GuageL4.setRotationPoint(7F, 12F, 0F);
GuageL4.setTextureSize(128, 128);
GuageL4.mirror = true;
setRotation(GuageL4, 0F, -1.570796F, 0F);
//Pipe Connectors
CCBottom = new ModelRenderer(this, 0, 0);
CCBottom.addBox(-3F, -9F, -3F, 6, 1, 6);
CCBottom.setRotationPoint(0F, 15F, 0F);
CCBottom.setTextureSize(128, 128);
CCBottom.mirror = true;
setRotation(CCBottom, 3.141593F, 0F, 0F);
CCRight = new ModelRenderer(this, 0, 0);
CCRight.addBox(-3F, -8F, -3F, 6, 2, 6);
CCRight.setRotationPoint(0F, 15F, 0F);
CCRight.setTextureSize(128, 128);
CCRight.mirror = true;
setRotation(CCRight, 0F, 0F, -1.570796F);
CCLeft = new ModelRenderer(this, 0, 0);
CCLeft.addBox(-3F, -8F, -3F, 6, 2, 6);
CCLeft.setRotationPoint(0F, 15F, 0F);
CCLeft.setTextureSize(128, 128);
CCLeft.mirror = true;
setRotation(CCLeft, 0F, 0F, 1.570796F);
CCFront = new ModelRenderer(this, 0, 0);
CCFront.addBox(-3F, -8F, -3F, 6, 2, 6);
CCFront.setRotationPoint(0F, 15F, 0F);
CCFront.setTextureSize(128, 128);
CCFront.mirror = true;
setRotation(CCFront, 1.570796F, 0F, 0F);
CCBack = new ModelRenderer(this, 0, 0);
CCBack.addBox(-3F, -8F, -3F, 6, 2, 6);
CCBack.setRotationPoint(0F, 15F, 0F);
CCBack.setTextureSize(128, 128);
CCBack.mirror = true;
setRotation(CCBack, -1.570796F, 0F, 0F);
CCTop = new ModelRenderer(this, 0, 0);
CCTop.addBox(-3F, -7F, -3F, 6, 1, 6);
CCTop.setRotationPoint(0F, 15F, 0F);
CCTop.setTextureSize(128, 128);
CCTop.mirror = true;
setRotation(CCTop, 0F, 0F, 0F);
}
public void renderMain(TileEntityLTank te ,float f5)
{
//render regardless of sides
Mid.render(f5);
Corner.render(f5);
Corner2.render(f5);
Corner3.render(f5);
Corner4.render(f5);
C8.render(f5);
C7.render(f5);
C6.render(f5);
C5.render(f5);
C4.render(f5);
C.render(f5);
C3.render(f5);
C2.render(f5);
CCTop.render(f5);CCBottom.render(f5);
//Front
if(te.cc[2] instanceof TileEntityPipe)
{
CCFront.render(f5);
}else
{
GuageT.render(f5);
GuageB.render(f5);
Guage.render(f5);
GuageR.render(f5);
GuageGlass.render(f5);
GuageL.render(f5);
}
//back
if(te.cc[3] instanceof TileEntityPipe)
{
CCBack.render(f5);
}else
{
GuageT3.render(f5);
Guage3.render(f5);
Guage3.render(f5);
GuageR3.render(f5);
GuageGlass3.render(f5);
GuageL3.render(f5);
}
//right
if(te.cc[4] instanceof TileEntityPipe)
{
CCRight.render(f5);
}else
{
GuageT4.render(f5);
Guage4.render(f5);
Guage4.render(f5);
GuageR4.render(f5);
GuageGlass4.render(f5);
GuageL4.render(f5);
}
//left
if(te.cc[5] instanceof TileEntityPipe)
{
CCLeft.render(f5);
}else
{
GuageT2.render(f5);
Guage2.render(f5);
Guage2.render(f5);
GuageR2.render(f5);
GuageGlass2.render(f5);
GuageL2.render(f5);
}
}
private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
}

3
minecraft/dark/BasicUtilities/renders/RenderGearRod.java
View file

@ -6,7 +6,8 @@ import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.mechanical.TileEntityRod;
import dark.BasicUtilities.Tile.TileEntityRod;
import dark.BasicUtilities.renders.models.ModelGearRod;
public class RenderGearRod extends TileEntitySpecialRenderer

1
minecraft/dark/BasicUtilities/renders/RenderGenerator.java
View file

@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.renders.models.ModelGenerator;
public class RenderGenerator extends TileEntitySpecialRenderer
{

4
minecraft/dark/BasicUtilities/renders/RenderPipe.java
View file

@ -7,8 +7,10 @@ import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.Tile.TileEntityPipe;
import dark.BasicUtilities.api.Liquid;
import dark.BasicUtilities.pipes.TileEntityPipe;
import dark.BasicUtilities.renders.models.ModelLargePipe;
import dark.BasicUtilities.renders.models.ModelPipe;
public class RenderPipe extends TileEntitySpecialRenderer

3
minecraft/dark/BasicUtilities/renders/RenderPump.java
View file

@ -6,8 +6,9 @@ import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.Tile.TileEntityPump;
import dark.BasicUtilities.api.Liquid;
import dark.BasicUtilities.machines.TileEntityPump;
import dark.BasicUtilities.renders.models.ModelPump;
public class RenderPump extends TileEntitySpecialRenderer

14
minecraft/dark/BasicUtilities/renders/RenderLTank.java → minecraft/dark/BasicUtilities/renders/RenderTank.java
View file

@ -7,28 +7,30 @@ import net.minecraftforge.liquids.LiquidContainerRegistry;
import org.lwjgl.opengl.GL11;
import dark.BasicUtilities.BasicUtilitiesMain;
import dark.BasicUtilities.Tile.TileEntityTank;
import dark.BasicUtilities.api.Liquid;
import dark.BasicUtilities.api.MHelper;
import dark.BasicUtilities.tanks.TileEntityLTank;
import dark.BasicUtilities.renders.models.ModelLiquidTank;
import dark.BasicUtilities.renders.models.ModelLiquidTankCorner;
public class RenderLTank extends TileEntitySpecialRenderer
public class RenderTank extends TileEntitySpecialRenderer
{
private Liquid type = Liquid.DEFUALT;
private ModelLiquidTank model;
private ModelLiquidTankCorner modelC;
private int pos = 0;
public RenderLTank()
public RenderTank()
{
model = new ModelLiquidTank();
modelC = new ModelLiquidTankCorner();
}
public void renderAModelAt(TileEntityLTank te, double d, double d1, double d2, float f)
public void renderAModelAt(TileEntityTank te, double d, double d1, double d2, float f)
{
type = te.getType();
if(te.tank.getLiquid() != null) pos = Math.min(te.tank.getLiquid().amount/LiquidContainerRegistry.BUCKET_VOLUME,4);
if(te.tank.getLiquid() != null) pos = Math.min((te.tank.getLiquid().amount/LiquidContainerRegistry.BUCKET_VOLUME),4);
GL11.glPushMatrix();
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
GL11.glScalef(1.0F, -1F, -1F);
@ -60,7 +62,7 @@ public class RenderLTank extends TileEntitySpecialRenderer
@Override
public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) {
this.renderAModelAt((TileEntityLTank)tileEntity, var2, var4, var6, var8);
this.renderAModelAt((TileEntityTank)tileEntity, var2, var4, var6, var8);
}
}

2
minecraft/dark/BasicUtilities/renders/ModelGearRod.java → minecraft/dark/BasicUtilities/renders/models/ModelGearRod.java
View file

@ -9,7 +9,7 @@
package dark.BasicUtilities.renders;
package dark.BasicUtilities.renders.models;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
minecraft/dark/BasicUtilities/renders/ModelGenerator.java → minecraft/dark/BasicUtilities/renders/models/ModelGenerator.java
View file

@ -9,7 +9,7 @@
package dark.BasicUtilities.renders;
package dark.BasicUtilities.renders.models;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
minecraft/dark/BasicUtilities/renders/ModelLargePipe.java → minecraft/dark/BasicUtilities/renders/models/ModelLargePipe.java
View file

@ -9,7 +9,7 @@
package dark.BasicUtilities.renders;
package dark.BasicUtilities.renders.models;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

419
minecraft/dark/BasicUtilities/renders/models/ModelLiquidTank.java Normal file
View file

@ -0,0 +1,419 @@
// Date: 10/8/2012 7:31:40 PM
// Template version 1.1
// Java generated by Techne
// Keep in mind that you still need to fill in some blanks
// - ZeuX
package dark.BasicUtilities.renders.models;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import dark.BasicUtilities.Tile.TileEntityTank;
import dark.BasicUtilities.Tile.TileEntityPipe;
public class ModelLiquidTank extends ModelBase
{
// fields
ModelRenderer Mid;
ModelRenderer Corner;
ModelRenderer Corner2;
ModelRenderer Corner3;
ModelRenderer Corner4;
ModelRenderer C8;
ModelRenderer C7;
ModelRenderer C6;
ModelRenderer C5;
ModelRenderer C4;
ModelRenderer C;
ModelRenderer C3;
ModelRenderer C2;
ModelRenderer GuageT;
ModelRenderer GuageB;
ModelRenderer Guage;
ModelRenderer GuageR;
// ModelRenderer GuageGlass;
ModelRenderer GuageL;
ModelRenderer GuageT2;
ModelRenderer GuageB2;
ModelRenderer Guage2;
ModelRenderer GuageR2;
// ModelRenderer GuageGlass2;
ModelRenderer GuageL2;
ModelRenderer GuageT3;
ModelRenderer GuageB3;
ModelRenderer Guage3;
ModelRenderer GuageR3;
// ModelRenderer GuageGlass3;
ModelRenderer GuageL3;
ModelRenderer GuageT4;
ModelRenderer GuageB4;
ModelRenderer Guage4;
ModelRenderer GuageR4;
// ModelRenderer GuageGlass4;
ModelRenderer GuageL4;
ModelRenderer CCBottom;
ModelRenderer CCRight;
ModelRenderer CCLeft;
ModelRenderer CCFront;
ModelRenderer CCBack;
ModelRenderer CCTop;
public ModelLiquidTank()
{
textureWidth = 128;
textureHeight = 128;
Mid = new ModelRenderer(this, 0, 50);
Mid.addBox(-6F, 0F, -6F, 12, 14, 12);
Mid.setRotationPoint(0F, 9F, 0F);
Mid.setTextureSize(128, 128);
Mid.mirror = true;
setRotation(Mid, 0F, 0F, 0F);
Corner = new ModelRenderer(this, 0, 30);
Corner.addBox(-1F, 0F, -1F, 2, 16, 2);
Corner.setRotationPoint(-7F, 8F, 7F);
Corner.setTextureSize(128, 128);
Corner.mirror = true;
setRotation(Corner, 0F, 0F, 0F);
Corner2 = new ModelRenderer(this, 0, 30);
Corner2.addBox(-1F, 0F, -1F, 2, 16, 2);
Corner2.setRotationPoint(-7F, 8F, -7F);
Corner2.setTextureSize(128, 128);
Corner2.mirror = true;
setRotation(Corner2, 0F, 0F, 0F);
Corner3 = new ModelRenderer(this, 0, 30);
Corner3.addBox(-1F, 0F, -1F, 2, 16, 2);
Corner3.setRotationPoint(7F, 8F, -7F);
Corner3.setTextureSize(128, 128);
Corner3.mirror = true;
setRotation(Corner3, 0F, 0F, 0F);
Corner4 = new ModelRenderer(this, 0, 30);
Corner4.addBox(-1F, 0F, -1F, 2, 16, 2);
Corner4.setRotationPoint(7F, 8F, 7F);
Corner4.setTextureSize(128, 128);
Corner4.mirror = true;
setRotation(Corner4, 0F, 0F, 0F);
C8 = new ModelRenderer(this, 9, 35);
C8.addBox(-1F, 0F, -1F, 2, 2, 12);
C8.setRotationPoint(6F, 22F, -5F);
C8.setTextureSize(128, 128);
C8.mirror = true;
setRotation(C8, 0F, 0F, 0F);
C7 = new ModelRenderer(this, 9, 35);
C7.addBox(-1F, 0F, -1F, 2, 2, 12);
C7.setRotationPoint(-6F, 8F, -5F);
C7.setTextureSize(128, 128);
C7.mirror = true;
setRotation(C7, 0F, 0F, 0F);
C6 = new ModelRenderer(this, 9, 35);
C6.addBox(-1F, 0F, -1F, 2, 2, 12);
C6.setRotationPoint(6F, 8F, -5F);
C6.setTextureSize(128, 128);
C6.mirror = true;
setRotation(C6, 0F, 0F, 0F);
C5 = new ModelRenderer(this, 9, 30);
C5.addBox(-1F, 0F, -1F, 12, 2, 2);
C5.setRotationPoint(-5F, 8F, 6F);
C5.setTextureSize(128, 128);
C5.mirror = true;
setRotation(C5, 0F, 0F, 0F);
C4 = new ModelRenderer(this, 9, 35);
C4.addBox(-1F, 0F, -1F, 2, 2, 12);
C4.setRotationPoint(-6F, 22F, -5F);
C4.setTextureSize(128, 128);
C4.mirror = true;
setRotation(C4, 0F, 0F, 0F);
C = new ModelRenderer(this, 9, 30);
C.addBox(-1F, 0F, -1F, 12, 2, 2);
C.setRotationPoint(-5F, 22F, 6F);
C.setTextureSize(128, 128);
C.mirror = true;
setRotation(C, 0F, 0F, 0F);
C3 = new ModelRenderer(this, 9, 30);
C3.addBox(-1F, 0F, -1F, 12, 2, 2);
C3.setRotationPoint(-5F, 8F, -6F);
C3.setTextureSize(128, 128);
C3.mirror = true;
setRotation(C3, 0F, 0F, 0F);
C2 = new ModelRenderer(this, 9, 30);
C2.addBox(-1F, 0F, -1F, 12, 2, 2);
C2.setRotationPoint(-5F, 22F, -6F);
C2.setTextureSize(128, 128);
C2.mirror = true;
setRotation(C2, 0F, 0F, 0F);
// G1--------------------------------------
GuageT = new ModelRenderer(this, 54, 42);
GuageT.addBox(-1F, -1F, 0F, 2, 1, 2);
GuageT.setRotationPoint(0F, 12F, -8F);
GuageT.setTextureSize(128, 128);
GuageT.mirror = true;
setRotation(GuageT, 0F, 0F, 0F);
GuageB = new ModelRenderer(this, 54, 42);
GuageB.addBox(-1F, 8F, 0F, 2, 1, 2);
GuageB.setRotationPoint(0F, 12F, -8F);
GuageB.setTextureSize(128, 128);
GuageB.mirror = true;
setRotation(GuageB, 0F, 0F, 0F);
Guage = new ModelRenderer(this, 54, 32);
Guage.addBox(-1F, 0F, 0F, 2, 8, 1);
Guage.setRotationPoint(0F, 12F, -7F);
Guage.setTextureSize(128, 128);
Guage.mirror = true;
setRotation(Guage, 0F, 0F, 0F);
GuageR = new ModelRenderer(this, 44, 32);
GuageR.addBox(1F, -1F, -1F, 2, 10, 2);
GuageR.setRotationPoint(0F, 12F, -7F);
GuageR.setTextureSize(128, 128);
GuageR.mirror = true;
setRotation(GuageR, 0F, 0F, 0F);
// GuageGlass = new ModelRenderer(this, 60, 32);
// GuageGlass.addBox(-1F, 0F, 0F, 2, 8, 1);
// GuageGlass.setRotationPoint(0F, 12F, -8F);
// GuageGlass.setTextureSize(128, 128);
// GuageGlass.mirror = true;
// setRotation(GuageGlass, 0F, 0F, 0F);
GuageL = new ModelRenderer(this, 44, 32);
GuageL.addBox(-3F, -1F, -1F, 2, 10, 2);
GuageL.setRotationPoint(0F, 12F, -7F);
GuageL.setTextureSize(128, 128);
GuageL.mirror = true;
setRotation(GuageL, 0F, 0F, 0F);
// G2----------------------------------
GuageT2 = new ModelRenderer(this, 54, 42);
GuageT2.addBox(-1F, -1F, 0F, 2, 1, 2);
GuageT2.setRotationPoint(-8F, 12F, 0F);
GuageT2.setTextureSize(128, 128);
GuageT2.mirror = true;
setRotation(GuageT2, 0F, 1.570796F, 0F);
GuageB2 = new ModelRenderer(this, 54, 42);
GuageB2.addBox(-1F, 8F, 0F, 2, 1, 2);
GuageB2.setRotationPoint(-8F, 12F, 0F);
GuageB2.setTextureSize(128, 128);
GuageB2.mirror = true;
setRotation(GuageB2, 0F, 1.570796F, 0F);
Guage2 = new ModelRenderer(this, 54, 32);
Guage2.addBox(-1F, 0F, 0F, 2, 8, 1);
Guage2.setRotationPoint(-7F, 12F, 0F);
Guage2.setTextureSize(128, 128);
Guage2.mirror = true;
setRotation(Guage2, 0F, 1.570796F, 0F);
GuageR2 = new ModelRenderer(this, 44, 32);
GuageR2.addBox(1F, -1F, -1F, 2, 10, 2);
GuageR2.setRotationPoint(-7F, 12F, 0F);
GuageR2.setTextureSize(128, 128);
GuageR2.mirror = true;
setRotation(GuageR2, 0F, 1.570796F, 0F);
// GuageGlass2 = new ModelRenderer(this, 60, 32);
// GuageGlass2.addBox(-1F, 0F, 0F, 2, 8, 1);
// GuageGlass2.setRotationPoint(-8F, 12F, 0F);
// GuageGlass2.setTextureSize(128, 128);
// GuageGlass2.mirror = true;
// setRotation(GuageGlass2, 0F, 1.570796F, 0F);
GuageL2 = new ModelRenderer(this, 44, 32);
GuageL2.addBox(-3F, -1F, -1F, 2, 10, 2);
GuageL2.setRotationPoint(-7F, 12F, 0F);
GuageL2.setTextureSize(128, 128);
GuageL2.mirror = true;
setRotation(GuageL2, 0F, 1.570796F, 0F);
// G3--------------------------------------
GuageT3 = new ModelRenderer(this, 54, 42);
GuageT3.addBox(-1F, -1F, 0F, 2, 1, 2);
GuageT3.setRotationPoint(0F, 12F, 8F);
GuageT3.setTextureSize(128, 128);
GuageT3.mirror = true;
setRotation(GuageT3, 0F, 3.141593F, 0F);
GuageB3 = new ModelRenderer(this, 54, 42);
GuageB3.addBox(-1F, 8F, 0F, 2, 1, 2);
GuageB3.setRotationPoint(0F, 12F, 8F);
GuageB3.setTextureSize(128, 128);
GuageB3.mirror = true;
setRotation(GuageB3, 0F, 3.141593F, 0F);
Guage3 = new ModelRenderer(this, 54, 32);
Guage3.addBox(-1F, 0F, 0F, 2, 8, 1);
Guage3.setRotationPoint(0F, 12F, 7F);
Guage3.setTextureSize(128, 128);
Guage3.mirror = true;
setRotation(Guage3, 0F, 3.141593F, 0F);
GuageR3 = new ModelRenderer(this, 44, 32);
GuageR3.addBox(1F, -1F, -1F, 2, 10, 2);
GuageR3.setRotationPoint(0F, 12F, 7F);
GuageR3.setTextureSize(128, 128);
GuageR3.mirror = true;
setRotation(GuageR3, 0F, 3.141593F, 0F);
// GuageGlass3 = new ModelRenderer(this, 60, 32);
// GuageGlass3.addBox(-1F, 0F, 0F, 2, 8, 1);
// GuageGlass3.setRotationPoint(0F, 12F, 8F);
// GuageGlass3.setTextureSize(128, 128);
// GuageGlass3.mirror = true;
// setRotation(GuageGlass3, 0F, 3.141593F, 0F);
GuageL3 = new ModelRenderer(this, 44, 32);
GuageL3.addBox(-3F, -1F, -1F, 2, 10, 2);
GuageL3.setRotationPoint(0F, 12F, 7F);
GuageL3.setTextureSize(128, 128);
GuageL3.mirror = true;
setRotation(GuageL3, 0F, 3.141593F, 0F);
// G4-------------------------------
GuageT4 = new ModelRenderer(this, 54, 42);
GuageT4.addBox(-1F, -1F, 0F, 2, 1, 2);
GuageT4.setRotationPoint(8F, 12F, 0F);
GuageT4.setTextureSize(128, 128);
GuageT4.mirror = true;
setRotation(GuageT4, 0F, -1.570796F, 0F);
GuageB4 = new ModelRenderer(this, 54, 42);
GuageB4.addBox(-1F, 8F, 0F, 2, 1, 2);
GuageB4.setRotationPoint(8F, 12F, 0F);
GuageB4.setTextureSize(128, 128);
GuageB4.mirror = true;
setRotation(GuageB4, 0F, -1.570796F, 0F);
Guage4 = new ModelRenderer(this, 54, 32);
Guage4.addBox(-1F, 0F, 0F, 2, 8, 1);
Guage4.setRotationPoint(7F, 12F, 0F);
Guage4.setTextureSize(128, 128);
Guage4.mirror = true;
setRotation(Guage4, 0F, -1.570796F, 0F);
GuageR4 = new ModelRenderer(this, 44, 32);
GuageR4.addBox(1F, -1F, -1F, 2, 10, 2);
GuageR4.setRotationPoint(7F, 12F, 0F);
GuageR4.setTextureSize(128, 128);
GuageR4.mirror = true;
setRotation(GuageR4, 0F, -1.570796F, 0F);
// GuageGlass4 = new ModelRenderer(this, 60, 32);
// GuageGlass4.addBox(-1F, 0F, 0F, 2, 8, 1);
// GuageGlass4.setRotationPoint(8F, 12F, 0F);
// GuageGlass4.setTextureSize(128, 128);
// GuageGlass4.mirror = true;
// setRotation(GuageGlass4, 0F, -1.570796F, 0F);
GuageL4 = new ModelRenderer(this, 44, 32);
GuageL4.addBox(-3F, -1F, -1F, 2, 10, 2);
GuageL4.setRotationPoint(7F, 12F, 0F);
GuageL4.setTextureSize(128, 128);
GuageL4.mirror = true;
setRotation(GuageL4, 0F, -1.570796F, 0F);
// Pipe Connectors
CCBottom = new ModelRenderer(this, 0, 0);
CCBottom.addBox(-3F, -9F, -3F, 6, 1, 6);
CCBottom.setRotationPoint(0F, 15F, 0F);
CCBottom.setTextureSize(128, 128);
CCBottom.mirror = true;
setRotation(CCBottom, 3.141593F, 0F, 0F);
CCRight = new ModelRenderer(this, 0, 0);
CCRight.addBox(-3F, -8F, -3F, 6, 2, 6);
CCRight.setRotationPoint(0F, 15F, 0F);
CCRight.setTextureSize(128, 128);
CCRight.mirror = true;
setRotation(CCRight, 0F, 0F, -1.570796F);
CCLeft = new ModelRenderer(this, 0, 0);
CCLeft.addBox(-3F, -8F, -3F, 6, 2, 6);
CCLeft.setRotationPoint(0F, 15F, 0F);
CCLeft.setTextureSize(128, 128);
CCLeft.mirror = true;
setRotation(CCLeft, 0F, 0F, 1.570796F);
CCFront = new ModelRenderer(this, 0, 0);
CCFront.addBox(-3F, -8F, -3F, 6, 2, 6);
CCFront.setRotationPoint(0F, 15F, 0F);
CCFront.setTextureSize(128, 128);
CCFront.mirror = true;
setRotation(CCFront, 1.570796F, 0F, 0F);
CCBack = new ModelRenderer(this, 0, 0);
CCBack.addBox(-3F, -8F, -3F, 6, 2, 6);
CCBack.setRotationPoint(0F, 15F, 0F);
CCBack.setTextureSize(128, 128);
CCBack.mirror = true;
setRotation(CCBack, -1.570796F, 0F, 0F);
CCTop = new ModelRenderer(this, 0, 0);
CCTop.addBox(-3F, -7F, -3F, 6, 1, 6);
CCTop.setRotationPoint(0F, 15F, 0F);
CCTop.setTextureSize(128, 128);
CCTop.mirror = true;
setRotation(CCTop, 0F, 0F, 0F);
}
public void renderMain(TileEntityTank te, float f5)
{
// render regardless of sides
Mid.render(f5);
Corner.render(f5);
Corner2.render(f5);
Corner3.render(f5);
Corner4.render(f5);
C8.render(f5);
C7.render(f5);
C6.render(f5);
C5.render(f5);
C4.render(f5);
C.render(f5);
C3.render(f5);
C2.render(f5);
CCTop.render(f5);
CCBottom.render(f5);
// Front
if (te.cc[2] instanceof TileEntityPipe)
{
CCFront.render(f5);
}
else
{
GuageT.render(f5);
GuageB.render(f5);
Guage.render(f5);
GuageR.render(f5);
// GuageGlass.render(f5);
GuageL.render(f5);
}
// back
if (te.cc[3] instanceof TileEntityPipe)
{
CCBack.render(f5);
}
else
{
GuageT3.render(f5);
Guage3.render(f5);
Guage3.render(f5);
GuageR3.render(f5);
// GuageGlass3.render(f5);
GuageL3.render(f5);
}
// right
if (te.cc[4] instanceof TileEntityPipe)
{
CCRight.render(f5);
}
else
{
GuageT4.render(f5);
Guage4.render(f5);
Guage4.render(f5);
GuageR4.render(f5);
// GuageGlass4.render(f5);
GuageL4.render(f5);
}
// left
if (te.cc[5] instanceof TileEntityPipe)
{
CCLeft.render(f5);
}
else
{
GuageT2.render(f5);
Guage2.render(f5);
Guage2.render(f5);
GuageR2.render(f5);
// GuageGlass2.render(f5);
GuageL2.render(f5);
}
}
private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
}

2
minecraft/dark/BasicUtilities/renders/ModelLiquidTankCorner.java → minecraft/dark/BasicUtilities/renders/models/ModelLiquidTankCorner.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.renders;
package dark.BasicUtilities.renders.models;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
minecraft/dark/BasicUtilities/renders/ModelPipe.java → minecraft/dark/BasicUtilities/renders/models/ModelPipe.java
View file

@ -1,4 +1,4 @@
package dark.BasicUtilities.renders;
package dark.BasicUtilities.renders.models;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
minecraft/dark/BasicUtilities/renders/ModelPump.java → minecraft/dark/BasicUtilities/renders/models/ModelPump.java
View file

@ -9,7 +9,7 @@
package dark.BasicUtilities.renders;
package dark.BasicUtilities.renders.models;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

BIN
minecraft/dark/BasicUtilities/textures/tanks/LiquidTank0.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 594 B

BIN
minecraft/dark/BasicUtilities/textures/tanks/LiquidTank1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 626 B

BIN
minecraft/dark/BasicUtilities/textures/tanks/LiquidTank2.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 626 B

BIN
minecraft/dark/BasicUtilities/textures/tanks/LiquidTank3.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 623 B

BIN
minecraft/dark/BasicUtilities/textures/tanks/LiquidTank4.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 614 B

0
minecraft/dark/BasicUtilities/textures/blocks.png → minecraft/dark/BasicUtilities/zResources/blocks.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

0
minecraft/dark/BasicUtilities/textures/mechanical/GearRod.png → minecraft/dark/BasicUtilities/zResources/mechanical/GearRod.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 257 B

After

Width:  |  Height:  |  Size: 257 B

0
minecraft/dark/BasicUtilities/textures/mechanical/Generator.png → minecraft/dark/BasicUtilities/zResources/mechanical/Generator.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
minecraft/dark/BasicUtilities/textures/pipes/SixLavaPipe.png → minecraft/dark/BasicUtilities/zResources/pipes/SixLavaPipe.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 796 B

After

Width:  |  Height:  |  Size: 796 B

0
minecraft/dark/BasicUtilities/textures/pipes/SixOilPipe.png → minecraft/dark/BasicUtilities/zResources/pipes/SixOilPipe.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 782 B

After

Width:  |  Height:  |  Size: 782 B

0
minecraft/dark/BasicUtilities/textures/pipes/SixSteamPipe.png → minecraft/dark/BasicUtilities/zResources/pipes/SixSteamPipe.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
minecraft/dark/BasicUtilities/textures/pipes/SixWaterPipe.png → minecraft/dark/BasicUtilities/zResources/pipes/SixWaterPipe.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 791 B

After

Width:  |  Height:  |  Size: 791 B

0
minecraft/dark/BasicUtilities/textures/pumps/LavaPump.png → minecraft/dark/BasicUtilities/zResources/pumps/LavaPump.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 740 B

After

Width:  |  Height:  |  Size: 740 B

0
minecraft/dark/BasicUtilities/textures/pumps/OilPump.png → minecraft/dark/BasicUtilities/zResources/pumps/OilPump.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 727 B

0
minecraft/dark/BasicUtilities/textures/pumps/Pump.png → minecraft/dark/BasicUtilities/zResources/pumps/Pump.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 735 B

After

Width:  |  Height:  |  Size: 735 B

0
minecraft/dark/BasicUtilities/textures/pumps/WaterPump.png → minecraft/dark/BasicUtilities/zResources/pumps/WaterPump.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 733 B

After

Width:  |  Height:  |  Size: 733 B

0
minecraft/dark/BasicUtilities/textures/tanks/LiquidTank.png → minecraft/dark/BasicUtilities/zResources/tanks/LiquidTank.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 614 B

After

Width:  |  Height:  |  Size: 614 B

BIN
minecraft/dark/BasicUtilities/zResources/tanks/LiquidTank0.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 596 B

BIN
minecraft/dark/BasicUtilities/zResources/tanks/LiquidTank1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 630 B

BIN
minecraft/dark/BasicUtilities/zResources/tanks/LiquidTank2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 623 B

BIN
minecraft/dark/BasicUtilities/zResources/tanks/LiquidTank3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 621 B

BIN
minecraft/dark/BasicUtilities/zResources/tanks/LiquidTank4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 593 B

0
minecraft/dark/BasicUtilities/textures/tanks/LiquidTankCorner.png → minecraft/dark/BasicUtilities/zResources/tanks/LiquidTankCorner.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 446 B

After

Width:  |  Height:  |  Size: 446 B