tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Mass Import cleanup

Browse source
This commit is contained in:
Rseifert 2013-04-02 14:00:03 -04:00
parent 67454a0a29
commit a934bb4ad2
20 changed files with 9 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/minecraft/fluidmech/client/ClientProxy.java
View file

@ -8,7 +8,6 @@ import fluidmech.client.render.ItemRenderHelper;
import fluidmech.client.render.RenderGearRod;
import fluidmech.client.render.RenderGenerator;
import fluidmech.client.render.RenderPipe;
import fluidmech.client.render.RenderPipe;
import fluidmech.client.render.RenderPump;
import fluidmech.client.render.RenderReleaseValve;
import fluidmech.client.render.RenderSink;
@ -22,7 +21,6 @@ import fluidmech.common.machines.TileEntityTank;
import fluidmech.common.machines.mech.TileEntityGenerator;
import fluidmech.common.machines.mech.TileEntityRod;
import fluidmech.common.machines.pipes.TileEntityPipe;
import fluidmech.common.machines.pipes.TileEntityPipe;
public class ClientProxy extends CommonProxy
{

2
src/minecraft/fluidmech/client/render/RenderPipe.java
View file

@ -8,13 +8,11 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector3;
import fluidmech.client.model.ModelLargePipe;
import fluidmech.client.render.pipeextentions.IPipeExtentionRender;
import fluidmech.common.FluidMech;
import fluidmech.common.machines.pipes.IPipeExtention;
import fluidmech.common.machines.pipes.TileEntityPipe;
import fluidmech.common.machines.pipes.TileEntityPipe;
public class RenderPipe extends TileEntitySpecialRenderer
{

10
src/minecraft/fluidmech/client/render/RenderPipeWindow.java
View file

@ -1,19 +1,9 @@
package fluidmech.client.render;
import hydraulic.api.ColorCode;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector3;
import fluidmech.client.model.ModelLargePipe;
import fluidmech.client.render.pipeextentions.IPipeExtentionRender;
import fluidmech.common.FluidMech;
import fluidmech.common.machines.pipes.IPipeExtention;
import fluidmech.common.machines.pipes.TileEntityPipe;
import fluidmech.common.machines.pipes.TileEntityPipe;
public class RenderPipeWindow implements IPipeExtentionRender

4
src/minecraft/fluidmech/client/render/pipeextentions/IPipeExtentionRender.java
View file

@ -1,11 +1,9 @@
package fluidmech.client.render.pipeextentions;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import fluidmech.client.render.RenderPipe;
import fluidmech.common.machines.pipes.TileEntityPipe;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
/**
* Class for TileEntity Renders that extend the pipe class to use instead of extending

1
src/minecraft/fluidmech/common/block/BlockPumpMachine.java
View file

@ -14,7 +14,6 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import universalelectricity.prefab.block.BlockAdvanced;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import fluidmech.client.render.BlockRenderHelper;
import fluidmech.common.FluidMech;
import fluidmech.common.TabFluidMech;

3
src/minecraft/fluidmech/common/machines/TileEntityMinorPump.java
View file

@ -1,6 +1,5 @@
package fluidmech.common.machines;
import fluidmech.common.FluidMech;
import hydraulic.api.ColorCode;
import hydraulic.api.IColorCoded;
import hydraulic.api.IPipeConnection;
@ -9,7 +8,6 @@ import hydraulic.helpers.FluidHelper;
import hydraulic.helpers.MetaGroup;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
@ -20,7 +18,6 @@ import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.network.PacketManager;
import universalelectricity.prefab.tile.TileEntityElectricityRunnable;
import com.google.common.io.ByteArrayDataInput;

10
src/minecraft/fluidmech/common/machines/TileEntitySink.java
View file

@ -1,28 +1,18 @@
package fluidmech.common.machines;
import java.util.Random;
import fluidmech.common.FluidMech;
import hydraulic.api.ColorCode;
import hydraulic.api.IColorCoded;
import hydraulic.helpers.FluidHelper;
import hydraulic.prefab.tile.TileEntityFluidStorage;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.ILiquidTank;
import net.minecraftforge.liquids.ITankContainer;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidStack;
import net.minecraftforge.liquids.LiquidTank;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.network.PacketManager;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import com.google.common.io.ByteArrayDataInput;

2
src/minecraft/fluidmech/common/machines/pipes/IPipeExtention.java
View file

@ -2,8 +2,6 @@ package fluidmech.common.machines.pipes;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
import fluidmech.client.render.RenderPipeWindow;
import fluidmech.client.render.pipeextentions.IPipeExtentionRender;
import universalelectricity.prefab.network.IPacketReceiver;
public interface IPipeExtention extends IPacketReceiver

1
src/minecraft/fluidmech/common/machines/pipes/TileEntityPipe.java
View file

@ -12,7 +12,6 @@ import hydraulic.helpers.FluidHelper;
import java.io.IOException;
import java.util.Random;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;

6
src/minecraft/fluidmech/common/machines/pipes/TileEntityPipeExtention.java
View file

@ -1,16 +1,14 @@
package fluidmech.common.machines.pipes;
import com.google.common.io.ByteArrayDataInput;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import com.google.common.io.ByteArrayDataInput;
/**
* Pipe Extension for the TileEntityPipe.class is a sub TileEntity and is not loaded the same way as
* a normal TileEntity

13
src/minecraft/fluidmech/common/machines/pipes/TileEntityPipeWindow.java
View file

@ -1,18 +1,15 @@
package fluidmech.common.machines.pipes;
import com.google.common.io.ByteArrayDataInput;
import fluidmech.client.render.RenderPipeWindow;
import fluidmech.client.render.pipeextentions.IPipeExtentionRender;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.LiquidStack;
import com.google.common.io.ByteArrayDataInput;
import fluidmech.client.render.RenderPipeWindow;
public class TileEntityPipeWindow extends TileEntityPipeExtention
{
@ -93,7 +90,7 @@ public class TileEntityPipeWindow extends TileEntityPipeExtention
}
@Override
public Class<RenderPipeWindow> getExtentionRenderClass()
public Class<?> getExtentionRenderClass()
{
return RenderPipeWindow.class;
}

5
src/minecraft/hydraulic/api/ColorCode.java
View file

@ -1,10 +1,5 @@
package hydraulic.api;
import hydraulic.helpers.FluidHelper;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidDictionary;

1
src/minecraft/hydraulic/api/IPipeConnection.java
View file

@ -2,7 +2,6 @@ package hydraulic.api;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.LiquidStack;
public interface IPipeConnection
{

5
src/minecraft/hydraulic/api/IPsiReciever.java
View file

@ -1,10 +1,5 @@
package hydraulic.api;
import java.util.List;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.LiquidStack;
/**
* A tileEntity that receives a pressure driven fluid. Suggested to use some of the class from

1
src/minecraft/hydraulic/fluidnetwork/HydraulicNetwork.java
View file

@ -20,7 +20,6 @@ import net.minecraftforge.liquids.LiquidStack;
import net.minecraftforge.liquids.LiquidTank;
import universalelectricity.core.block.IConnectionProvider;
import universalelectricity.core.path.Pathfinder;
import universalelectricity.core.path.PathfinderChecker;
import cpw.mods.fml.common.FMLLog;
/**

6
src/minecraft/hydraulic/fluidnetwork/HydraulicNetworkHelper.java
View file

@ -1,14 +1,8 @@
package hydraulic.fluidnetwork;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.block.IConnector;
import universalelectricity.core.block.INetworkProvider;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;

4
src/minecraft/hydraulic/fluidnetwork/IFluidNetworkPart.java
View file

@ -1,14 +1,12 @@
package hydraulic.fluidnetwork;
import universalelectricity.core.block.IConnectionProvider;
import hydraulic.api.IColorCoded;
import hydraulic.api.IPipeConnection;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.ILiquidTank;
import net.minecraftforge.liquids.ITankContainer;
import net.minecraftforge.liquids.LiquidStack;
import net.minecraftforge.liquids.LiquidTank;
import universalelectricity.core.block.IConnectionProvider;
/**
* A machine that acts as one with the liquid network using the networks pressure for some function

1
src/minecraft/hydraulic/fluidnetwork/PathfinderCheckerPipes.java
View file

@ -6,7 +6,6 @@ import java.util.Arrays;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.block.IConductor;
import universalelectricity.core.block.IConnectionProvider;
import universalelectricity.core.path.Pathfinder;

6
src/minecraft/hydraulic/helpers/FluidHelper.java
View file

@ -1,13 +1,7 @@
package hydraulic.helpers;
import hydraulic.api.ColorCode;
import java.util.HashMap;
import java.util.logging.Logger;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.liquids.ILiquid;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidDictionary;

5
src/minecraft/hydraulic/prefab/tile/TileEntityFluidStorage.java
View file

@ -1,12 +1,7 @@
package hydraulic.prefab.tile;
import fluidmech.common.machines.TileEntityTank;
import hydraulic.api.ColorCode;
import hydraulic.api.IColorCoded;
import hydraulic.helpers.FluidHelper;
import java.util.EnumSet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;