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-16 08:01:14 -04:00
parent 9a10f8be31
commit 7cef9abb1e
40 changed files with 58 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dark/api/fluid/INetworkFluidPart.java
View file

@ -1,13 +1,10 @@
package dark.api.fluid;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.IFluidTank;
import dark.api.parts.INetworkPart;
import dark.core.interfaces.ColorCode.IColorCoded;
import dark.core.prefab.helpers.Pair;
public interface INetworkFluidPart extends IColorCoded, IFluidHandler, INetworkPart
{

1
src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java
View file

@ -3,7 +3,6 @@ package dark.core.prefab.tilenetwork.fluid;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;

1
src/dark/fluid/client/ClientProxy.java
View file

@ -22,6 +22,7 @@ import dark.fluid.common.pipes.TileEntityGenericPipe;
import dark.fluid.common.pipes.TileEntityPipe;
import dark.fluid.common.pump.TileEntityConstructionPump;
import dark.fluid.common.pump.TileEntityStarterPump;
@SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy
{

1
src/dark/fluid/client/model/ModelCenterTank.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelCenterTank extends ModelBase
{

1
src/dark/fluid/client/model/ModelCornerTank.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelCornerTank extends ModelBase
{

1
src/dark/fluid/client/model/ModelEngine.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelEngine extends ModelBase
{

1
src/dark/fluid/client/model/ModelFurnace.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelFurnace extends ModelBase
{

1
src/dark/fluid/client/model/ModelGearPiston.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelGearPiston extends ModelBase
{

1
src/dark/fluid/client/model/ModelGenerator.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelGenerator extends ModelBase
{

1
src/dark/fluid/client/model/ModelLargePipe.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelLargePipe extends ModelBase
{

1
src/dark/fluid/client/model/ModelLiquidTank.java
View file

@ -12,6 +12,7 @@ import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.fluid.common.machines.TileEntityTank;
@SideOnly(Side.CLIENT)
public class ModelLiquidTank extends ModelBase
{

1
src/dark/fluid/client/model/ModelLiquidTankCorner.java
View file

@ -4,6 +4,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelLiquidTankCorner extends ModelBase
{

1
src/dark/fluid/client/model/ModelPump.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelPump extends ModelBase
{

1
src/dark/fluid/client/model/ModelReleaseValve.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelReleaseValve extends ModelBase
{

1
src/dark/fluid/client/model/ModelSink.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelSink extends ModelBase
{

1
src/dark/fluid/client/model/ModelTank.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelTank extends ModelBase
{

1
src/dark/fluid/client/model/ModelTankSide.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelTankSide extends ModelBase
{

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

@ -14,6 +14,7 @@ import dark.fluid.client.model.ModelCornerTank;
import dark.fluid.client.model.ModelTank;
import dark.fluid.common.FluidMech;
import dark.fluid.common.machines.TileEntityBoiler;
@SideOnly(Side.CLIENT)
public class RenderBoiler extends RenderTileMachine
{

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

@ -10,6 +10,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import dark.core.client.renders.RenderTileMachine;
import dark.fluid.client.model.ModelFurnace;
import dark.fluid.common.FluidMech;
@SideOnly(Side.CLIENT)
public class RenderFurnace extends RenderTileMachine
{

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

@ -11,6 +11,7 @@ import dark.core.client.renders.RenderTileMachine;
import dark.fluid.client.model.ModelGearPiston;
import dark.fluid.common.FluidMech;
import dark.mech.common.machines.TileEntitySteamPiston;
@SideOnly(Side.CLIENT)
public class RenderGearPiston extends RenderTileMachine
{

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

@ -10,11 +10,9 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.client.renders.RenderBlockFluid;
import dark.core.client.renders.RenderBlockFluid;
import dark.core.client.renders.RenderTileMachine;
import dark.core.interfaces.ColorCode;
import dark.fluid.client.model.ModelTankSide;
import dark.fluid.common.FluidMech;
import dark.fluid.common.machines.TileEntityTank;
@SideOnly(Side.CLIENT)

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

@ -1,13 +1,9 @@
package dark.fluid.common;
import java.util.Set;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.Configuration;
import dark.core.prefab.BlockMachine;
import dark.core.prefab.IExtraObjectInfo;
import dark.core.prefab.helpers.Pair;
public abstract class BlockFM extends BlockMachine implements IExtraObjectInfo
{

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

@ -36,24 +36,14 @@ import dark.fluid.common.machines.BlockFluid;
import dark.fluid.common.machines.BlockReleaseValve;
import dark.fluid.common.machines.BlockSink;
import dark.fluid.common.machines.BlockTank;
import dark.fluid.common.machines.TileEntityBoiler;
import dark.fluid.common.machines.TileEntityReleaseValve;
import dark.fluid.common.machines.TileEntitySink;
import dark.fluid.common.machines.TileEntityTank;
import dark.fluid.common.pipes.BlockPipe;
import dark.fluid.common.pipes.ItemBlockPipe;
import dark.fluid.common.pipes.TileEntityGenericPipe;
import dark.fluid.common.pipes.TileEntityPipe;
import dark.fluid.common.pump.BlockConstructionPump;
import dark.fluid.common.pump.BlockDrain;
import dark.fluid.common.pump.BlockPumpMachine;
import dark.fluid.common.pump.TileEntityConstructionPump;
import dark.fluid.common.pump.TileEntityDrain;
import dark.fluid.common.pump.TileEntityStarterPump;
import dark.mech.common.machines.BlockGenerator;
import dark.mech.common.machines.BlockRod;
import dark.mech.common.machines.BlockSteamPiston;
import dark.mech.common.machines.TileEntitySteamPiston;
@ModstatInfo(prefix = "fluidmech")
@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, dependencies = "after:DarkCore", useMetadata = true)
@ -78,7 +68,6 @@ public class FluidMech extends ModPrefab
public static Fluid fmWaste, fmOil, fmFuel, fmBio;
public static Fluid waste, oil, fuel, bio;
@Metadata(FluidMech.MOD_ID)
public static ModMetadata meta;

6
src/dark/fluid/common/machines/BlockFluid.java
View file

@ -22,7 +22,8 @@ public class BlockFluid extends BlockFluidFinite
}
@Override @SideOnly(Side.CLIENT)
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister par1IconRegister)
{
this.flowing = par1IconRegister.registerIcon(FluidMech.instance.PREFIX + this.getUnlocalizedName().replace("tile.", "") + "_flowing");
@ -30,7 +31,8 @@ public class BlockFluid extends BlockFluidFinite
fluid.setIcons(still, flowing);
}
@Override @SideOnly(Side.CLIENT)
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int par1, int par2)
{
return still;

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

@ -27,6 +27,7 @@ import dark.fluid.common.BlockFM;
public class BlockTank extends BlockFM
{
public static int tankVolume = 8;
public BlockTank(int id)
{
super("FluidTank", id, Material.rock);

4
src/dark/fluid/common/machines/TileEntitySink.java
View file

@ -47,7 +47,7 @@ public class TileEntitySink extends TileEntityFluidStorage implements IPacketRec
{
stack = this.getTank().getFluid();
}
return PacketHandler.instance().getPacket(DarkMain.CHANNEL, this, stack.writeToNBT(new NBTTagCompound()));
return PacketHandler.instance().getPacket(DarkMain.CHANNEL, this, stack.writeToNBT(new NBTTagCompound()));
}
@Override
@ -55,7 +55,7 @@ public class TileEntitySink extends TileEntityFluidStorage implements IPacketRec
{
try
{
this.getTank().setFluid(FluidStack.loadFluidStackFromNBT( PacketHandler.instance().readNBTTagCompound(data)));
this.getTank().setFluid(FluidStack.loadFluidStackFromNBT(PacketHandler.instance().readNBTTagCompound(data)));
}
catch (Exception e)
{

2
src/dark/fluid/common/machines/TileEntityTank.java
View file

@ -124,7 +124,7 @@ public class TileEntityTank extends TileEntityFluidStorage implements IFluidHand
public Packet getDescriptionPacket()
{
FluidStack stack = null;
if (this.getTank().getFluid() != null)
if (this.getTank().getFluid() != null && this.getTank().getFluid().getFluid() != null)
{
stack = this.getTank().getFluid();
}

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

@ -205,9 +205,9 @@ public class TileEntityStarterPump extends TileEntityMachine implements IToolRea
@Override
public String getMeterReading(EntityPlayer user, ForgeDirection side, EnumTools tool)
{
if(tool == EnumTools.PIPE_GUAGE)
if (tool == EnumTools.PIPE_GUAGE)
{
return "Source Blocks: "+this.getLiquidFinder().results.size();
return "Source Blocks: " + this.getLiquidFinder().results.size();
}
return null;
}

1
src/dark/mech/client/model/ModelGearRod.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelGearRod extends ModelBase
{

1
src/dark/mech/client/model/ModelGenerator.java
View file

@ -11,6 +11,7 @@ import net.minecraft.client.model.ModelRenderer;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelGenerator extends ModelBase
{

1
src/dark/mech/client/render/RenderGearRod.java
View file

@ -8,6 +8,7 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.mech.client.model.ModelGearRod;
@SideOnly(Side.CLIENT)
public class RenderGearRod extends TileEntitySpecialRenderer
{

1
src/dark/mech/client/render/RenderGenerator.java
View file

@ -8,6 +8,7 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.mech.client.model.ModelGenerator;
@SideOnly(Side.CLIENT)
public class RenderGenerator extends TileEntitySpecialRenderer
{