move some class to my code lib
This commit is contained in:
parent
4e6275a891
commit
222f31db5b
12 changed files with 21 additions and 154 deletions
|
@ -1,7 +1,6 @@
|
||||||
package fluidmech.client.render;
|
package fluidmech.client.render;
|
||||||
|
|
||||||
import hydraulic.api.ColorCode;
|
import hydraulic.api.ColorCode;
|
||||||
import hydraulic.helpers.connectionHelper;
|
|
||||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.liquids.LiquidContainerRegistry;
|
import net.minecraftforge.liquids.LiquidContainerRegistry;
|
||||||
|
@ -9,6 +8,8 @@ import net.minecraftforge.liquids.LiquidStack;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import dark.helpers.ConnectionHelper;
|
||||||
|
|
||||||
import fluidmech.client.model.ModelLiquidTank;
|
import fluidmech.client.model.ModelLiquidTank;
|
||||||
import fluidmech.client.model.ModelLiquidTankCorner;
|
import fluidmech.client.model.ModelLiquidTankCorner;
|
||||||
import fluidmech.common.FluidMech;
|
import fluidmech.common.FluidMech;
|
||||||
|
@ -44,10 +45,10 @@ public class RenderTank extends TileEntitySpecialRenderer
|
||||||
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
|
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
|
||||||
GL11.glScalef(1.0F, -1F, -1F);
|
GL11.glScalef(1.0F, -1F, -1F);
|
||||||
|
|
||||||
if (connectionHelper.corner(te) > 0)
|
if (ConnectionHelper.corner(te) > 0)
|
||||||
{
|
{
|
||||||
bindTextureByName(this.getCornerTexture(meta));
|
bindTextureByName(this.getCornerTexture(meta));
|
||||||
int corner = connectionHelper.corner(te);
|
int corner = ConnectionHelper.corner(te);
|
||||||
switch (corner)
|
switch (corner)
|
||||||
{
|
{
|
||||||
case 2:
|
case 2:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package fluidmech.common.block;
|
package fluidmech.common.block;
|
||||||
|
|
||||||
|
import dark.helpers.MetaGroup;
|
||||||
import hydraulic.helpers.FluidHelper;
|
import hydraulic.helpers.FluidHelper;
|
||||||
import hydraulic.helpers.MetaGroup;
|
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.entity.EntityLiving;
|
import net.minecraft.entity.EntityLiving;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
|
|
@ -25,7 +25,7 @@ public class ItemBasic extends Item
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
@Override
|
@Override
|
||||||
public void updateIcons(IconRegister iconRegister)
|
public void registerIcons(IconRegister iconRegister)
|
||||||
{
|
{
|
||||||
List<ItemStack> list = new ArrayList<ItemStack>();
|
List<ItemStack> list = new ArrayList<ItemStack>();
|
||||||
this.getSubItems(this.itemID, this.getCreativeTab(), list);
|
this.getSubItems(this.itemID, this.getCreativeTab(), list);
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
package fluidmech.common.machines.mech;
|
package fluidmech.common.machines.mech;
|
||||||
|
|
||||||
import hydraulic.api.IReadOut;
|
import hydraulic.api.IReadOut;
|
||||||
import hydraulic.helpers.MetaGroup;
|
|
||||||
import hydraulic.helpers.connectionHelper;
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.network.INetworkManager;
|
import net.minecraft.network.INetworkManager;
|
||||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||||
|
@ -20,6 +18,9 @@ import universalelectricity.prefab.tile.TileEntityElectrical;
|
||||||
|
|
||||||
import com.google.common.io.ByteArrayDataInput;
|
import com.google.common.io.ByteArrayDataInput;
|
||||||
|
|
||||||
|
import dark.helpers.MetaGroup;
|
||||||
|
import dark.helpers.ConnectionHelper;
|
||||||
|
|
||||||
import fluidmech.api.mech.IForce;
|
import fluidmech.api.mech.IForce;
|
||||||
|
|
||||||
public class TileEntityGenerator extends TileEntityElectrical implements IPacketReceiver, IForce, IReadOut, IRedstoneReceptor
|
public class TileEntityGenerator extends TileEntityElectrical implements IPacketReceiver, IForce, IReadOut, IRedstoneReceptor
|
||||||
|
@ -45,7 +46,7 @@ public class TileEntityGenerator extends TileEntityElectrical implements IPacket
|
||||||
this.genAmmount = Math.abs(force / this.getVoltage());
|
this.genAmmount = Math.abs(force / this.getVoltage());
|
||||||
// wire count update
|
// wire count update
|
||||||
int wireCount = 0;
|
int wireCount = 0;
|
||||||
TileEntity[] ents = connectionHelper.getSurroundingTileEntities(worldObj, xCoord, yCoord, zCoord);
|
TileEntity[] ents = ConnectionHelper.getSurroundingTileEntities(worldObj, xCoord, yCoord, zCoord);
|
||||||
this.wires = new IConductor[6];
|
this.wires = new IConductor[6];
|
||||||
for (int i = 0; i < ents.length; i++)
|
for (int i = 0; i < ents.length; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -45,12 +45,6 @@ public class BlockConstructionPump extends BlockAdvanced
|
||||||
this.outputIcon = par1IconRegister.registerIcon(FluidMech.TEXTURE_NAME_PREFIX + "outputMachineSide");
|
this.outputIcon = par1IconRegister.registerIcon(FluidMech.TEXTURE_NAME_PREFIX + "outputMachineSide");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
|
|
||||||
{
|
|
||||||
return par1 != 1 && par1 != 0 ? this.blockIcon : this.inputIcon;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side)
|
public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
package fluidmech.common.pump;
|
package fluidmech.common.pump;
|
||||||
|
|
||||||
import hydraulic.helpers.MetaGroup;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import dark.helpers.MetaGroup;
|
||||||
|
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.EntityLiving;
|
import net.minecraft.entity.EntityLiving;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package fluidmech.common.pump;
|
package fluidmech.common.pump;
|
||||||
|
|
||||||
|
import dark.helpers.MetaGroup;
|
||||||
import hydraulic.api.IPipeConnection;
|
import hydraulic.api.IPipeConnection;
|
||||||
import hydraulic.fluidnetwork.HydraulicNetworkHelper;
|
import hydraulic.fluidnetwork.HydraulicNetworkHelper;
|
||||||
import hydraulic.fluidnetwork.IFluidNetworkPart;
|
import hydraulic.fluidnetwork.IFluidNetworkPart;
|
||||||
import hydraulic.helpers.MetaGroup;
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
import net.minecraftforge.liquids.ILiquidTank;
|
import net.minecraftforge.liquids.ILiquidTank;
|
||||||
|
|
|
@ -5,7 +5,6 @@ import hydraulic.api.IColorCoded;
|
||||||
import hydraulic.api.IPipeConnection;
|
import hydraulic.api.IPipeConnection;
|
||||||
import hydraulic.api.IReadOut;
|
import hydraulic.api.IReadOut;
|
||||||
import hydraulic.helpers.FluidHelper;
|
import hydraulic.helpers.FluidHelper;
|
||||||
import hydraulic.helpers.MetaGroup;
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.network.INetworkManager;
|
import net.minecraft.network.INetworkManager;
|
||||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||||
|
@ -22,6 +21,8 @@ import universalelectricity.prefab.tile.TileEntityElectricityRunnable;
|
||||||
|
|
||||||
import com.google.common.io.ByteArrayDataInput;
|
import com.google.common.io.ByteArrayDataInput;
|
||||||
|
|
||||||
|
import dark.helpers.MetaGroup;
|
||||||
|
|
||||||
public class TileEntityStarterPump extends TileEntityElectricityRunnable implements IPacketReceiver, IReadOut, IPipeConnection
|
public class TileEntityStarterPump extends TileEntityElectricityRunnable implements IPacketReceiver, IReadOut, IPipeConnection
|
||||||
{
|
{
|
||||||
public final double WATTS_PER_TICK = (400 / 20);
|
public final double WATTS_PER_TICK = (400 / 20);
|
||||||
|
|
|
@ -6,12 +6,13 @@ import hydraulic.api.IColorCoded;
|
||||||
import hydraulic.api.IPipeConnection;
|
import hydraulic.api.IPipeConnection;
|
||||||
import hydraulic.api.IReadOut;
|
import hydraulic.api.IReadOut;
|
||||||
import hydraulic.fluidnetwork.IFluidNetworkPart;
|
import hydraulic.fluidnetwork.IFluidNetworkPart;
|
||||||
import hydraulic.helpers.connectionHelper;
|
|
||||||
import hydraulic.prefab.tile.TileEntityFluidDevice;
|
import hydraulic.prefab.tile.TileEntityFluidDevice;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import dark.helpers.ConnectionHelper;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
@ -38,7 +39,7 @@ public class TileEntityReleaseValve extends TileEntityFluidDevice implements IPi
|
||||||
|
|
||||||
this.isPowered = worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord);
|
this.isPowered = worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord);
|
||||||
|
|
||||||
connected = connectionHelper.getSurroundingTileEntities(this);
|
connected = ConnectionHelper.getSurroundingTileEntities(this);
|
||||||
|
|
||||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
|
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
|
||||||
{
|
{
|
||||||
|
@ -135,7 +136,7 @@ public class TileEntityReleaseValve extends TileEntityFluidDevice implements IPi
|
||||||
public void validateNBuildList()
|
public void validateNBuildList()
|
||||||
{
|
{
|
||||||
// cleanup
|
// cleanup
|
||||||
this.connected = connectionHelper.getSurroundingTileEntities(worldObj, xCoord, yCoord, zCoord);
|
this.connected = ConnectionHelper.getSurroundingTileEntities(worldObj, xCoord, yCoord, zCoord);
|
||||||
this.input = new ITankContainer[6];
|
this.input = new ITankContainer[6];
|
||||||
this.output.clear();
|
this.output.clear();
|
||||||
// read surroundings
|
// read surroundings
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package hydraulic.fluidnetwork;
|
package hydraulic.fluidnetwork;
|
||||||
|
|
||||||
import hydraulic.api.ColorCode;
|
import hydraulic.api.ColorCode;
|
||||||
import hydraulic.helpers.connectionHelper;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
@ -22,6 +21,7 @@ import net.minecraftforge.liquids.LiquidTank;
|
||||||
import universalelectricity.core.path.Pathfinder;
|
import universalelectricity.core.path.Pathfinder;
|
||||||
import universalelectricity.core.vector.Vector3;
|
import universalelectricity.core.vector.Vector3;
|
||||||
import cpw.mods.fml.common.FMLLog;
|
import cpw.mods.fml.common.FMLLog;
|
||||||
|
import dark.helpers.ConnectionHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Side note: the network should act like this when done {@link http
|
* Side note: the network should act like this when done {@link http
|
||||||
|
@ -309,7 +309,7 @@ public class HydraulicNetwork
|
||||||
{
|
{
|
||||||
if (tankContainer instanceof TileEntity && tankContainer != source && !(tankContainer instanceof IFluidNetworkPart))
|
if (tankContainer instanceof TileEntity && tankContainer != source && !(tankContainer instanceof IFluidNetworkPart))
|
||||||
{
|
{
|
||||||
TileEntity[] connectedTiles = connectionHelper.getSurroundingTileEntities((TileEntity) tankContainer);
|
TileEntity[] connectedTiles = ConnectionHelper.getSurroundingTileEntities((TileEntity) tankContainer);
|
||||||
|
|
||||||
for (int i = 0; i < 6; i++)
|
for (int i = 0; i < 6; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,46 +0,0 @@
|
||||||
package hydraulic.helpers;
|
|
||||||
|
|
||||||
|
|
||||||
public class MetaGroup
|
|
||||||
{
|
|
||||||
public static int getFacingMeta(int metaData)
|
|
||||||
{
|
|
||||||
int meta = metaData % 4;
|
|
||||||
int newMeta = 0;
|
|
||||||
switch (meta)
|
|
||||||
{
|
|
||||||
case 0:
|
|
||||||
newMeta = 2;
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
newMeta = 5;
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
newMeta = 3;
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
newMeta = 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
return newMeta;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int getGrouping(int meta)
|
|
||||||
{
|
|
||||||
if ((meta >= 0) && (meta <= 3))
|
|
||||||
return 0;
|
|
||||||
if ((meta >= 4) && (meta <= 7))
|
|
||||||
return 1;
|
|
||||||
if ((meta >= 8) && (meta <= 11))
|
|
||||||
return 2;
|
|
||||||
if ((meta >= 12) && (meta <= 15))
|
|
||||||
return 3;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int getGroupStartMeta(int grouping)
|
|
||||||
{
|
|
||||||
return grouping * 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,86 +0,0 @@
|
||||||
package hydraulic.helpers;
|
|
||||||
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
|
||||||
import universalelectricity.core.vector.Vector3;
|
|
||||||
|
|
||||||
public class connectionHelper
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Used to find all tileEntities sounding the location you will have to filter for selective
|
|
||||||
* tileEntities
|
|
||||||
*
|
|
||||||
* @param world - the world being searched threw
|
|
||||||
* @param x
|
|
||||||
* @param y
|
|
||||||
* @param z
|
|
||||||
* @return an array of up to 6 tileEntities
|
|
||||||
*/
|
|
||||||
public static TileEntity[] getSurroundingTileEntities(TileEntity ent)
|
|
||||||
{
|
|
||||||
return getSurroundingTileEntities(ent.worldObj, ent.xCoord, ent.yCoord, ent.zCoord);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TileEntity[] getSurroundingTileEntities(World world, int x, int y, int z)
|
|
||||||
{
|
|
||||||
TileEntity[] list = new TileEntity[6];
|
|
||||||
for (int i = 0; i < 6; i++)
|
|
||||||
{
|
|
||||||
ForgeDirection direction = ForgeDirection.getOrientation(i);
|
|
||||||
list[i] = world.getBlockTileEntity(x + direction.offsetX, y + direction.offsetY, z + direction.offsetZ);
|
|
||||||
}
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int[] getSurroundingBlocks(TileEntity ent)
|
|
||||||
{
|
|
||||||
return getSurroundingBlocks(ent.worldObj, ent.xCoord, ent.yCoord, ent.zCoord);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int[] getSurroundingBlocks(World world, Vector3 v)
|
|
||||||
{
|
|
||||||
return connectionHelper.getSurroundingBlocks(world, v.intX(), v.intY(), v.intZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int[] getSurroundingBlocks(World world, int x, int y, int z)
|
|
||||||
{
|
|
||||||
int[] list = new int[6];
|
|
||||||
for (int i = 0; i < 6; i++)
|
|
||||||
{
|
|
||||||
ForgeDirection d = ForgeDirection.getOrientation(i);
|
|
||||||
int id = world.getBlockId(x + d.offsetX, y + d.offsetY, z + d.offsetZ);
|
|
||||||
list[i] = id;
|
|
||||||
}
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Used to find which of 4 Corners this block is in a group of blocks 0 = not a corner 1-4 = a
|
|
||||||
* corner of some direction
|
|
||||||
*/
|
|
||||||
public static int corner(TileEntity entity)
|
|
||||||
{
|
|
||||||
TileEntity[] en = getSurroundingTileEntities(entity.worldObj, entity.xCoord, entity.yCoord, entity.zCoord);
|
|
||||||
if (en[4] != null && en[2] != null && en[5] == null && en[3] == null)
|
|
||||||
{
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
if (en[2] != null && en[5] != null && en[3] == null && en[4] == null)
|
|
||||||
{
|
|
||||||
return 4;
|
|
||||||
}
|
|
||||||
if (en[5] != null && en[3] != null && en[4] == null && en[2] == null)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (en[3] != null && en[4] != null && en[2] == null && en[5] == null)
|
|
||||||
{
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in a new issue