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

Auto-Sync

Browse source
This commit is contained in:
DarkGuardsman 2013-09-25 16:37:55 -04:00
parent d4dbda70c0
commit 7f44501e7a
26 changed files with 71 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java
View file

@ -4,15 +4,16 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import com.builtbroken.common.Pair;
import com.builtbroken.common.Triple;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import com.builtbroken.common.Pair;
import com.builtbroken.common.Triple;
import dark.core.prefab.helpers.FluidHelper;
import dark.core.prefab.tilenetwork.fluid.FluidRecipeInfo.SimpleFluidRecipe;

6
src/dark/core/prefab/tilenetwork/fluid/FluidRecipeInfo.java
View file

@ -1,13 +1,13 @@
package dark.core.prefab.tilenetwork.fluid;
import com.builtbroken.common.Pair;
import com.builtbroken.common.Triple;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import com.builtbroken.common.Pair;
import com.builtbroken.common.Triple;
/** Used to store more complex info, than A + B = C, on two FluidStack mixing behavior
*
* @author DarkGuardsman */

2
src/dark/fluid/client/render/RenderBoiler.java
View file

@ -32,7 +32,7 @@ public class RenderBoiler extends RenderTileMachine
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float d3)
public void renderModel(TileEntity tileEntity, double d, double d1, double d2, float d3)
{
GL11.glPushMatrix();

4
src/dark/fluid/client/render/RenderConstructionPump.java
View file

@ -25,9 +25,9 @@ public class RenderConstructionPump extends RenderTileMachine
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float d3)
public void renderModel(TileEntity tileEntity, double d, double d1, double d2, float d3)
{
bindTextureByName(this.getTexture(0, 0));
bindTexture(this.getTexture(0, 0));
GL11.glPushMatrix();
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.45F, (float) d2 + 0.5F);
GL11.glScalef(1.0F, -1F, -1F);

2
src/dark/fluid/client/render/RenderFurnace.java
View file

@ -24,7 +24,7 @@ public class RenderFurnace extends RenderTileMachine
}
@Override
public void renderTileEntityAt(TileEntity te, double d, double d1, double d2, float d3)
public void renderModel(TileEntity te, double d, double d1, double d2, float d3)
{
bindTextureByName(FluidMech.instance.PREFIX, ModPrefab.MODEL_DIRECTORY + "Furnace.png");
GL11.glPushMatrix();

2
src/dark/fluid/client/render/RenderGearPiston.java
View file

@ -57,7 +57,7 @@ public class RenderGearPiston extends RenderTileMachine
}
@Override
public void renderTileEntityAt(TileEntity var1, double d, double d1, double d2, float d3)
public void renderModel(TileEntity var1, double d, double d1, double d2, float d3)
{
this.renderTileEntityAt(((TileEntitySteamPiston) var1), d, d1, d2, d3);

4
src/dark/fluid/client/render/RenderPipe.java
View file

@ -70,7 +70,7 @@ public class RenderPipe extends RenderTileMachine
public void render(int blockID, int meta, boolean[] side)
{
bindTextureByName(this.getTexture(blockID, meta));
bindTexture(this.getTexture(blockID, meta));
if (side[0])
{
SixPipe.renderBottom();
@ -99,7 +99,7 @@ public class RenderPipe extends RenderTileMachine
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8)
public void renderModel(TileEntity tileEntity, double var2, double var4, double var6, float var8)
{
this.renderAModelAt(tileEntity, var2, var4, var6, var8);
}

4
src/dark/fluid/client/render/RenderPump.java
View file

@ -28,7 +28,7 @@ public class RenderPump extends RenderTileMachine
{
int meta = te.worldObj.getBlockMetadata(te.xCoord, te.yCoord, te.zCoord);
bindTextureByName(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata()));
bindTexture(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata()));
GL11.glPushMatrix();
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
GL11.glScalef(1.0F, -1F, -1F);
@ -54,7 +54,7 @@ public class RenderPump extends RenderTileMachine
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8)
public void renderModel(TileEntity tileEntity, double var2, double var4, double var6, float var8)
{
if (tileEntity instanceof TileEntityStarterPump)
{

4
src/dark/fluid/client/render/RenderReleaseValve.java
View file

@ -38,7 +38,7 @@ public class RenderReleaseValve extends RenderTileMachine
{
ents = ((TileEntityReleaseValve) te).connected;
}
bindTextureByName(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata()));
bindTexture(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata()));
if (ents[0] != null)
SixPipe.renderBottom();
if (ents[1] != null)
@ -65,7 +65,7 @@ public class RenderReleaseValve extends RenderTileMachine
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8)
public void renderModel(TileEntity tileEntity, double var2, double var4, double var6, float var8)
{
this.renderAModelAt(tileEntity, var2, var4, var6, var8);
}

4
src/dark/fluid/client/render/RenderSink.java
View file

@ -49,7 +49,7 @@ public class RenderSink extends RenderTileMachine
{
int meta = te.worldObj.getBlockMetadata(te.xCoord, te.yCoord, te.zCoord);
bindTextureByName(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata()));
bindTexture(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata()));
GL11.glPushMatrix();
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
GL11.glScalef(1.0F, -1F, -1F);
@ -75,7 +75,7 @@ public class RenderSink extends RenderTileMachine
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8)
public void renderModel(TileEntity tileEntity, double var2, double var4, double var6, float var8)
{
this.renderAModelAt((TileEntitySink) tileEntity, var2, var4, var6, var8);
}

7
src/dark/fluid/client/render/RenderTank.java
View file

@ -125,4 +125,11 @@ public class RenderTank extends RenderTileMachine
}
return new ResourceLocation(texture);
}
@Override
public void renderModel(TileEntity tileEntity, double x, double y, double z, float size)
{
// TODO Auto-generated method stub
}
}

4
src/dark/fluid/common/FluidMech.java
View file

@ -128,8 +128,8 @@ public class FluidMech extends ModPrefab
}
CONFIGURATION.load();
FMRecipeLoader.blockWasteLiquid = ModObjectRegistry.createNewFluidBlock(this.PREFIX, FluidMech.CONFIGURATION, new Fluid(WASTE_FLUID_NAME).setUnlocalizedName("fluid.waste.name").setDensity(1300).setViscosity(1800));
FMRecipeLoader.blockOilLiquid = ModObjectRegistry.createNewFluidBlock(this.PREFIX, FluidMech.CONFIGURATION, new Fluid(OIL_FLUID_NAME).setUnlocalizedName("fluid.oil.name").setDensity(1500).setViscosity(4700));
FMRecipeLoader.blockWasteLiquid = ModObjectRegistry.createNewFluidBlock(FluidMech.MOD_ID, FluidMech.CONFIGURATION, new Fluid(WASTE_FLUID_NAME).setUnlocalizedName("fluid.waste.name").setDensity(1300).setViscosity(1800));
FMRecipeLoader.blockOilLiquid = ModObjectRegistry.createNewFluidBlock(FluidMech.MOD_ID, FluidMech.CONFIGURATION, new Fluid(OIL_FLUID_NAME).setUnlocalizedName("fluid.oil.name").setDensity(1500).setViscosity(4700));
FMRecipeLoader.blockPipe = ModObjectRegistry.createNewBlock("FMBlockPipe", FluidMech.MOD_ID, BlockPipe.class, ItemBlockPipe.class);
FMRecipeLoader.blockPumpMachine = ModObjectRegistry.createNewBlock("FMBlockPump", FluidMech.MOD_ID, BlockPumpMachine.class, ItemBlockHolder.class);

5
src/dark/fluid/common/machines/BlockBoiler.java
View file

@ -3,13 +3,14 @@ package dark.fluid.common.machines;
import java.util.List;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.fluid.common.BlockFM;

5
src/dark/fluid/common/machines/BlockReleaseValve.java
View file

@ -3,14 +3,15 @@ package dark.fluid.common.machines;
import java.util.Random;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.fluid.common.BlockFM;

5
src/dark/fluid/common/machines/BlockSink.java
View file

@ -2,8 +2,6 @@ package dark.fluid.common.machines;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@ -13,6 +11,9 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.prefab.helpers.FluidHelper;

5
src/dark/fluid/common/machines/BlockTank.java
View file

@ -3,8 +3,6 @@ package dark.fluid.common.machines;
import java.util.List;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@ -13,6 +11,9 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ColorCode.IColorCoded;

5
src/dark/fluid/common/pipes/BlockPipe.java
View file

@ -3,8 +3,6 @@ package dark.fluid.common.pipes;
import java.util.List;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
@ -15,6 +13,9 @@ import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.IFluidTank;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ColorCode;

5
src/dark/fluid/common/pump/BlockConstructionPump.java
View file

@ -3,8 +3,6 @@ package dark.fluid.common.pump;
import java.util.List;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
@ -18,6 +16,9 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.prefab.tilenetwork.fluid.FluidNetworkHelper;

5
src/dark/fluid/common/pump/BlockDrain.java
View file

@ -2,8 +2,6 @@ package dark.fluid.common.pump;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.EntityLivingBase;
@ -16,6 +14,9 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.common.Pair;
import dark.fluid.common.BlockFM;
import dark.fluid.common.FluidMech;

5
src/dark/fluid/common/pump/BlockPumpMachine.java
View file

@ -3,8 +3,6 @@ package dark.fluid.common.pump;
import java.util.List;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
@ -12,6 +10,9 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.fluid.client.render.BlockRenderHelper;

5
src/dark/fluid/common/pump/TileEntityConstructionPump.java
View file

@ -3,8 +3,6 @@ package dark.fluid.common.pump;
import java.util.ArrayList;
import java.util.List;
import com.builtbroken.common.Pair;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
@ -17,6 +15,9 @@ import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import com.builtbroken.common.Pair;
import dark.api.fluid.IDrain;
import dark.api.fluid.INetworkPipe;
import dark.api.parts.ITileConnector;

5
src/dark/fluid/common/pump/TileEntityDrain.java
View file

@ -6,8 +6,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
@ -18,6 +16,9 @@ import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.Pair;
import dark.api.fluid.IDrain;
import dark.core.prefab.helpers.FluidHelper;
import dark.fluid.common.prefab.TileEntityFluidDevice;

5
src/dark/fluid/common/pump/TileEntityStarterPump.java
View file

@ -3,8 +3,6 @@ package dark.fluid.common.pump;
import java.util.Iterator;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
@ -13,6 +11,9 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.Pair;
import dark.api.IToolReadOut;
import dark.api.fluid.IDrain;
import dark.api.parts.ITileConnector;

5
src/dark/mech/common/machines/BlockMechanicalGenerator.java
View file

@ -3,8 +3,6 @@ package dark.mech.common.machines;
import java.util.ArrayList;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@ -13,6 +11,9 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.fluid.client.render.BlockRenderHelper;

5
src/dark/mech/common/machines/BlockRod.java
View file

@ -2,8 +2,6 @@ package dark.mech.common.machines;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@ -13,6 +11,9 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.fluid.client.render.BlockRenderHelper;

5
src/dark/mech/common/machines/BlockSteamPiston.java
View file

@ -3,13 +3,14 @@ package dark.mech.common.machines;
import java.util.Random;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.fluid.common.BlockFM;