Cleanup && Packet handler work
This commit is contained in:
parent
4c0d4c4ea2
commit
7b8e6c2eaf
41 changed files with 74 additions and 105 deletions
|
@ -1,7 +1,7 @@
|
|||
package dark.api.mech;
|
||||
|
||||
import dark.api.parts.ITileConnector;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import dark.api.parts.ITileConnector;
|
||||
|
||||
/** Think of this in the same way as an electrical device from UE. getforce methods are designed to
|
||||
* get the idea amount of foce that a side should be outputing at the time. Apply force is the input
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
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,9 +1,9 @@
|
|||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.fluid.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -7,7 +7,6 @@ import org.lwjgl.opengl.GL11;
|
|||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import dark.core.client.renders.RenderMachine;
|
||||
import dark.core.prefab.helpers.ConnectionHelper;
|
||||
import dark.fluid.client.model.ModelCenterTank;
|
||||
|
|
|
@ -7,7 +7,6 @@ import org.lwjgl.opengl.GL11;
|
|||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import dark.core.client.renders.RenderMachine;
|
||||
import dark.fluid.client.model.ModelFurnace;
|
||||
import dark.fluid.common.FluidMech;
|
||||
|
|
|
@ -7,7 +7,6 @@ import org.lwjgl.opengl.GL11;
|
|||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import dark.core.client.renders.RenderMachine;
|
||||
import dark.fluid.client.model.ModelGearPiston;
|
||||
import dark.fluid.common.FluidMech;
|
||||
|
|
|
@ -9,7 +9,6 @@ import dark.core.common.CoreRecipeLoader;
|
|||
import dark.core.common.RecipeLoader;
|
||||
import dark.core.common.items.ItemParts.Parts;
|
||||
import dark.core.interfaces.ColorCode;
|
||||
import dark.fluid.common.machines.BlockFluid;
|
||||
|
||||
public class FMRecipeLoader extends RecipeLoader
|
||||
{
|
||||
|
|
|
@ -16,7 +16,6 @@ import net.minecraftforge.fluids.FluidRegistry;
|
|||
import org.modstats.ModstatInfo;
|
||||
|
||||
import universalelectricity.prefab.TranslationHelper;
|
||||
import universalelectricity.prefab.network.PacketManager;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.Mod.EventHandler;
|
||||
|
@ -58,7 +57,7 @@ import dark.mech.common.machines.BlockRod;
|
|||
|
||||
@ModstatInfo(prefix = "fluidmech")
|
||||
@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:DarkCore", useMetadata = true)
|
||||
@NetworkMod(channels = { FluidMech.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
|
||||
@NetworkMod(clientSideRequired = true, serverSideRequired = false)
|
||||
public class FluidMech extends ModPrefab
|
||||
{
|
||||
|
||||
|
@ -74,8 +73,6 @@ public class FluidMech extends ModPrefab
|
|||
public static Fluid fmWaste, fmOil, fmFuel, fmBio;
|
||||
public static Fluid waste, oil, fuel, bio;
|
||||
|
||||
// @NetworkMod
|
||||
public static final String CHANNEL = "FluidMech";
|
||||
|
||||
@Metadata(FluidMech.MOD_ID)
|
||||
public static ModMetadata meta;
|
||||
|
|
|
@ -2,14 +2,13 @@ package dark.fluid.common.machines;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
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 cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.fluid.common.BlockFM;
|
||||
|
||||
public class BlockBoiler extends BlockFM
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package dark.fluid.common.machines;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraftforge.fluids.BlockFluidFinite;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.fluid.common.FluidMech;
|
||||
|
||||
public class BlockFluid extends BlockFluidFinite
|
||||
|
|
|
@ -2,15 +2,14 @@ package dark.fluid.common.machines;
|
|||
|
||||
import java.util.Random;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
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 cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.fluid.common.BlockFM;
|
||||
import dark.fluid.common.FluidMech;
|
||||
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
package dark.fluid.common.machines;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -11,6 +9,8 @@ import net.minecraft.util.MathHelper;
|
|||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import universalelectricity.prefab.tile.TileEntityAdvanced;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.core.prefab.helpers.MetaGroup;
|
||||
import dark.fluid.client.render.BlockRenderHelper;
|
||||
import dark.fluid.common.BlockFM;
|
||||
|
|
|
@ -2,14 +2,13 @@ package dark.fluid.common.machines;
|
|||
|
||||
import java.util.Random;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
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 cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.fluid.common.BlockFM;
|
||||
|
||||
public class BlockSteamPiston extends BlockFM
|
||||
|
|
|
@ -2,9 +2,6 @@ package dark.fluid.common.machines;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -16,6 +13,8 @@ import net.minecraft.world.World;
|
|||
import net.minecraftforge.common.ForgeDirection;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.api.parts.INetworkPart;
|
||||
import dark.core.prefab.helpers.AutoCraftingManager;
|
||||
import dark.core.prefab.helpers.FluidHelper;
|
||||
|
|
|
@ -3,8 +3,6 @@ package dark.fluid.common.machines;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
@ -12,6 +10,7 @@ import net.minecraftforge.common.ForgeDirection;
|
|||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
import dark.api.IToolReadOut;
|
||||
import dark.api.fluid.INetworkPipe;
|
||||
import dark.api.parts.ITileConnector;
|
||||
|
|
|
@ -11,12 +11,12 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
|
|||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import universalelectricity.prefab.network.IPacketReceiver;
|
||||
import universalelectricity.prefab.network.PacketManager;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
|
||||
import dark.core.common.DarkMain;
|
||||
import dark.core.interfaces.ColorCode;
|
||||
import dark.fluid.common.FluidMech;
|
||||
import dark.core.network.PacketHandler;
|
||||
import dark.fluid.common.prefab.TileEntityFluidStorage;
|
||||
|
||||
public class TileEntitySink extends TileEntityFluidStorage implements IPacketReceiver
|
||||
|
@ -47,7 +47,7 @@ public class TileEntitySink extends TileEntityFluidStorage implements IPacketRec
|
|||
{
|
||||
stack = this.getTank().getFluid();
|
||||
}
|
||||
return PacketManager.getPacket(FluidMech.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(PacketManager.readNBTTagCompound(data)));
|
||||
this.getTank().setFluid(FluidStack.loadFluidStackFromNBT( PacketHandler.instance().readNBTTagCompound(data)));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
|
@ -1,14 +1,7 @@
|
|||
package dark.fluid.common.machines;
|
||||
|
||||
import dark.core.prefab.TileEntityMachine;
|
||||
import dark.fluid.common.FluidMech;
|
||||
|
||||
public class TileEntitySteamPiston extends TileEntityMachine
|
||||
{
|
||||
|
||||
@Override
|
||||
public String getChannel()
|
||||
{
|
||||
return FluidMech.CHANNEL;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,7 +24,6 @@ import org.bouncycastle.util.Arrays;
|
|||
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
import universalelectricity.prefab.network.IPacketReceiver;
|
||||
import universalelectricity.prefab.network.PacketManager;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
|
||||
|
@ -33,13 +32,14 @@ import cpw.mods.fml.relauncher.SideOnly;
|
|||
import dark.api.IToolReadOut;
|
||||
import dark.api.fluid.INetworkFluidPart;
|
||||
import dark.api.fluid.INetworkPipe;
|
||||
import dark.core.common.DarkMain;
|
||||
import dark.core.interfaces.ColorCode;
|
||||
import dark.core.interfaces.ColorCode.IColorCoded;
|
||||
import dark.core.network.PacketHandler;
|
||||
import dark.core.network.fluid.NetworkFluidContainers;
|
||||
import dark.core.network.fluid.NetworkFluidTiles;
|
||||
import dark.core.prefab.helpers.FluidHelper;
|
||||
import dark.core.prefab.tilenetwork.NetworkTileEntities;
|
||||
import dark.fluid.common.FluidMech;
|
||||
import dark.fluid.common.prefab.TileEntityFluidStorage;
|
||||
|
||||
public class TileEntityTank extends TileEntityFluidStorage implements IFluidHandler, IToolReadOut, IColorCoded, INetworkFluidPart, IPacketReceiver
|
||||
|
@ -95,7 +95,7 @@ public class TileEntityTank extends TileEntityFluidStorage implements IFluidHand
|
|||
{
|
||||
if (id == 0)
|
||||
{
|
||||
this.getTank().setFluid(FluidStack.loadFluidStackFromNBT(PacketManager.readNBTTagCompound(dataStream)));
|
||||
this.getTank().setFluid(FluidStack.loadFluidStackFromNBT( PacketHandler.instance().readNBTTagCompound(dataStream)));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -126,7 +126,7 @@ public class TileEntityTank extends TileEntityFluidStorage implements IFluidHand
|
|||
{
|
||||
stack = this.getTank().getFluid();
|
||||
}
|
||||
return PacketManager.getPacket(FluidMech.CHANNEL, this, stack != null ? 0 : 1, stack != null ? stack.writeToNBT(new NBTTagCompound()) : 1, this.renderConnection[0], this.renderConnection[1], this.renderConnection[2], this.renderConnection[3], this.renderConnection[4], this.renderConnection[5]);
|
||||
return PacketHandler.instance().getPacket(DarkMain.CHANNEL, this, stack != null ? 0 : 1, stack != null ? stack.writeToNBT(new NBTTagCompound()) : 1, this.renderConnection[0], this.renderConnection[1], this.renderConnection[2], this.renderConnection[3], this.renderConnection[4], this.renderConnection[5]);
|
||||
}
|
||||
|
||||
/** gets the current color mark of the pipe */
|
||||
|
|
|
@ -2,9 +2,6 @@ package dark.fluid.common.pipes;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
@ -14,6 +11,8 @@ import net.minecraft.util.MovingObjectPosition;
|
|||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import net.minecraftforge.fluids.IFluidTank;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.api.fluid.INetworkPipe;
|
||||
import dark.core.prefab.helpers.FluidHelper;
|
||||
import dark.fluid.common.BlockFM;
|
||||
|
|
|
@ -26,7 +26,6 @@ import org.bouncycastle.util.Arrays;
|
|||
import universalelectricity.core.vector.Vector3;
|
||||
import universalelectricity.core.vector.VectorHelper;
|
||||
import universalelectricity.prefab.network.IPacketReceiver;
|
||||
import universalelectricity.prefab.network.PacketManager;
|
||||
import universalelectricity.prefab.tile.TileEntityAdvanced;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
|
@ -36,12 +35,13 @@ import cpw.mods.fml.relauncher.SideOnly;
|
|||
import dark.api.IToolReadOut;
|
||||
import dark.api.fluid.INetworkPipe;
|
||||
import dark.api.parts.ITileConnector;
|
||||
import dark.core.common.DarkMain;
|
||||
import dark.core.interfaces.ColorCode;
|
||||
import dark.core.interfaces.ColorCode.IColorCoded;
|
||||
import dark.core.network.PacketHandler;
|
||||
import dark.core.network.fluid.NetworkPipes;
|
||||
import dark.core.prefab.helpers.FluidHelper;
|
||||
import dark.core.prefab.tilenetwork.NetworkTileEntities;
|
||||
import dark.fluid.common.FluidMech;
|
||||
import dark.fluid.common.pipes.addon.IPipeExtention;
|
||||
|
||||
public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, IToolReadOut, IColorCoded, INetworkPipe, IPacketReceiver
|
||||
|
@ -130,8 +130,8 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler,
|
|||
((TileEntity) extention).updateEntity();
|
||||
if (extention.shouldSendPacket(!this.worldObj.isRemote) && extention.getExtentionPacketData(!this.worldObj.isRemote) != null)
|
||||
{
|
||||
Packet packet = PacketManager.getPacket(FluidMech.CHANNEL, this, PacketID.EXTENTION_UPDATE.ordinal(), ForgeDirection.getOrientation(i), extention.getExtentionPacketData(!this.worldObj.isRemote));
|
||||
PacketManager.sendPacketToClients(packet, worldObj, new Vector3(this), 50);
|
||||
Packet packet = PacketHandler.instance().getPacket(DarkMain.CHANNEL, this, PacketID.EXTENTION_UPDATE.ordinal(), ForgeDirection.getOrientation(i), extention.getExtentionPacketData(!this.worldObj.isRemote));
|
||||
PacketHandler.instance().sendPacketToClients(packet, worldObj, new Vector3(this), 50);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -170,7 +170,7 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler,
|
|||
{
|
||||
System.out.println("Handling Packet for Pipe addon");
|
||||
int side = dataStream.readInt();
|
||||
NBTTagCompound tag = PacketManager.readNBTTagCompound(dataStream);
|
||||
NBTTagCompound tag = PacketHandler.instance().readNBTTagCompound(dataStream);
|
||||
this.loadOrCreateSubTile(side, tag);
|
||||
|
||||
}
|
||||
|
@ -194,7 +194,7 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler,
|
|||
@Override
|
||||
public Packet getDescriptionPacket()
|
||||
{
|
||||
return PacketManager.getPacket(FluidMech.CHANNEL, this, PacketID.PIPE_CONNECTIONS.ordinal(), this.renderConnection[0], this.renderConnection[1], this.renderConnection[2], this.renderConnection[3], this.renderConnection[4], this.renderConnection[5]);
|
||||
return PacketHandler.instance().getPacket(DarkMain.CHANNEL, this, PacketID.PIPE_CONNECTIONS.ordinal(), this.renderConnection[0], this.renderConnection[1], this.renderConnection[2], this.renderConnection[3], this.renderConnection[4], this.renderConnection[5]);
|
||||
}
|
||||
|
||||
/** Reads a tile entity from NBT. */
|
||||
|
@ -317,8 +317,8 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler,
|
|||
if (tag != null && tag.hasKey("id"))
|
||||
{
|
||||
System.out.println("Sending TileEntity to Client");
|
||||
Packet packet = PacketManager.getPacket(FluidMech.CHANNEL, this, PacketID.EXTENTION_CREATE.ordinal(), ForgeDirection.getOrientation(side), tag);
|
||||
PacketManager.sendPacketToClients(packet, this.worldObj, new Vector3(this), 50);
|
||||
Packet packet = PacketHandler.instance().getPacket(DarkMain.CHANNEL, this, PacketID.EXTENTION_CREATE.ordinal(), ForgeDirection.getOrientation(side), tag);
|
||||
PacketHandler.instance().sendPacketToClients(packet, this.worldObj, new Vector3(this), 50);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package dark.fluid.common.prefab;
|
||||
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
@ -12,6 +11,7 @@ import net.minecraftforge.fluids.FluidStack;
|
|||
import net.minecraftforge.fluids.FluidTank;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import universalelectricity.core.vector.Vector3;
|
||||
import dark.core.interfaces.ColorCode.IColorCoded;
|
||||
import dark.core.prefab.helpers.FluidHelper;
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@ package dark.fluid.common.pump;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
@ -18,6 +15,8 @@ import net.minecraft.util.MovingObjectPosition;
|
|||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.core.network.fluid.HydraulicNetworkHelper;
|
||||
import dark.fluid.client.render.BlockRenderHelper;
|
||||
import dark.fluid.common.BlockFM;
|
||||
|
|
|
@ -18,7 +18,6 @@ import dark.core.common.ExternalModHandler;
|
|||
import dark.core.prefab.TileEntityMachine;
|
||||
import dark.core.prefab.helpers.FluidHelper;
|
||||
import dark.core.prefab.helpers.Pair;
|
||||
import dark.fluid.common.FluidMech;
|
||||
|
||||
public class TileEntityStarterPump extends TileEntityMachine implements IToolReadOut, ITileConnector
|
||||
{
|
||||
|
@ -225,10 +224,4 @@ public class TileEntityStarterPump extends TileEntityMachine implements IToolRea
|
|||
return direction != ForgeDirection.DOWN;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getChannel()
|
||||
{
|
||||
return FluidMech.CHANNEL;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
package dark.mech.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
package dark.mech.client.model;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
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
|
||||
{
|
||||
|
|
|
@ -7,7 +7,6 @@ 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
|
||||
|
|
|
@ -7,7 +7,6 @@ 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
|
||||
|
|
|
@ -2,9 +2,6 @@ package dark.mech.common.machines;
|
|||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -13,6 +10,8 @@ import net.minecraft.tileentity.TileEntity;
|
|||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.fluid.client.render.BlockRenderHelper;
|
||||
import dark.fluid.common.BlockFM;
|
||||
import dark.fluid.common.FluidMech;
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
package dark.mech.common.machines;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -11,6 +9,8 @@ import net.minecraft.util.MathHelper;
|
|||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import dark.fluid.client.render.BlockRenderHelper;
|
||||
import dark.fluid.common.BlockFM;
|
||||
import dark.fluid.common.FluidMech;
|
||||
|
|
Loading…
Reference in a new issue