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

changes due to core machine

Browse source
This commit is contained in:
Robert 2013-12-19 23:43:24 -05:00
parent da08059eb9
commit 6f1c61427a
17 changed files with 46 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
package dark.api.fluid; package dark.api.fluid;
import com.dark.tile.network.INetworkPart; import com.dark.tilenetwork.INetworkPart;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;

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

@ -4,8 +4,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.dark.fluid.FluidHelper; import com.dark.fluid.FluidHelper;
import com.dark.prefab.tile.network.NetworkUpdateHandler; import com.dark.tilenetwork.INetworkPart;
import com.dark.tile.network.INetworkPart; import com.dark.tilenetwork.prefab.NetworkUpdateHandler;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;

8
src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java
View file

@ -5,10 +5,10 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import com.dark.fluid.FluidHelper; import com.dark.fluid.FluidHelper;
import com.dark.prefab.tile.network.NetworkTileEntities; import com.dark.tilenetwork.INetworkPart;
import com.dark.prefab.tile.network.NetworkUpdateHandler; import com.dark.tilenetwork.ITileNetwork;
import com.dark.tile.network.INetworkPart; import com.dark.tilenetwork.prefab.NetworkTileEntities;
import com.dark.tile.network.ITileNetwork; import com.dark.tilenetwork.prefab.NetworkUpdateHandler;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;

4
src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java
View file

@ -4,8 +4,8 @@ import java.util.EnumSet;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.dark.fluid.FluidHelper; import com.dark.fluid.FluidHelper;
import com.dark.prefab.tile.network.NetworkUpdateHandler; import com.dark.tilenetwork.INetworkPart;
import com.dark.tile.network.INetworkPart; import com.dark.tilenetwork.prefab.NetworkUpdateHandler;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;

3
src/dark/fluid/common/FMRecipeLoader.java
View file

@ -1,5 +1,7 @@
package dark.fluid.common; package dark.fluid.common;
import com.dark.prefab.RecipeLoader;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -11,7 +13,6 @@ import dark.core.basics.EnumMaterial;
import dark.core.basics.EnumOrePart; import dark.core.basics.EnumOrePart;
import dark.core.basics.ItemParts; import dark.core.basics.ItemParts;
import dark.core.basics.ItemParts.Parts; import dark.core.basics.ItemParts.Parts;
import dark.core.prefab.RecipeLoader;
import dark.machines.CoreRecipeLoader; import dark.machines.CoreRecipeLoader;
public class FMRecipeLoader extends RecipeLoader public class FMRecipeLoader extends RecipeLoader

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

@ -13,7 +13,7 @@ import universalelectricity.prefab.TranslationHelper;
import com.dark.DarkCore; import com.dark.DarkCore;
import com.dark.CoreRegistry; import com.dark.CoreRegistry;
import com.dark.IndustryCreativeTab; import com.dark.IndustryTabs;
import com.dark.prefab.ItemBlockHolder; import com.dark.prefab.ItemBlockHolder;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
@ -36,7 +36,7 @@ import dark.fluid.common.pipes.ItemBlockPipe;
import dark.fluid.common.pump.BlockConstructionPump; import dark.fluid.common.pump.BlockConstructionPump;
import dark.fluid.common.pump.BlockDrain; import dark.fluid.common.pump.BlockDrain;
import dark.fluid.common.pump.BlockPumpMachine; import dark.fluid.common.pump.BlockPumpMachine;
import dark.machines.DarkMain; import dark.machines.CoreMachine;
@ModstatInfo(prefix = "fluidmech") @ModstatInfo(prefix = "fluidmech")
@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, dependencies = "after:DarkCore", useMetadata = true) @Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, dependencies = "after:DarkCore", useMetadata = true)
@ -52,6 +52,14 @@ public class FluidMech extends ModPrefab
// @Mod // @Mod
public static final String MOD_ID = "FluidMech"; public static final String MOD_ID = "FluidMech";
public static final String MOD_NAME = "Fluid_Mechanics"; public static final String MOD_NAME = "Fluid_Mechanics";
public static final String DOMAIN = "fm";
public static final String PREFIX = DOMAIN + ":";
public static String DIRECTORY_NO_SLASH = "assets/" + DOMAIN + "/";
public static String DIRECTORY = "/" + DIRECTORY_NO_SLASH;
public static String LANGUAGE_PATH = DIRECTORY + "languages/";
public static String SOUND_PATH = DIRECTORY + "audio/";
public static final String WASTE_FLUID_NAME = "mixedWaste"; public static final String WASTE_FLUID_NAME = "mixedWaste";
public static final String OIL_FLUID_NAME = "oil"; public static final String OIL_FLUID_NAME = "oil";
@ -106,7 +114,7 @@ public class FluidMech extends ModPrefab
FMLog.info(" Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages."); FMLog.info(" Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages.");
if (FMRecipeLoader.blockPipe instanceof BlockPipe) if (FMRecipeLoader.blockPipe instanceof BlockPipe)
{ {
IndustryCreativeTab.tabHydraulic().setIconItemStack(FluidPartsMaterial.IRON.getStack()); IndustryTabs.tabHydraulic().setIconItemStack(FluidPartsMaterial.IRON.getStack());
} }
} }
@ -157,7 +165,7 @@ public class FluidMech extends ModPrefab
meta.url = "http://www.universalelectricity.com/coremachine"; meta.url = "http://www.universalelectricity.com/coremachine";
meta.logoFile = DarkCore.TEXTURE_DIRECTORY + "FM_Banner.png"; meta.logoFile = DarkCore.TEXTURE_DIRECTORY + "FM_Banner.png";
meta.version = DarkMain.VERSION; meta.version = CoreMachine.VERSION;
meta.authorList = Arrays.asList(new String[] { "DarkGuardsman AKA DarkCow" }); meta.authorList = Arrays.asList(new String[] { "DarkGuardsman AKA DarkCow" });
meta.credits = "Please see the website."; meta.credits = "Please see the website.";
meta.autogenerated = false; meta.autogenerated = false;

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

@ -1,9 +1,9 @@
package dark.fluid.common.machines; package dark.fluid.common.machines;
import com.dark.IndustryCreativeTab; import com.dark.IndustryTabs;
import com.dark.prefab.BlockMachine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import dark.core.prefab.machine.BlockMachine;
import dark.fluid.common.FluidMech; import dark.fluid.common.FluidMech;
public abstract class BlockFM extends BlockMachine public abstract class BlockFM extends BlockMachine
@ -12,6 +12,6 @@ public abstract class BlockFM extends BlockMachine
public BlockFM(String name, Material material) public BlockFM(String name, Material material)
{ {
super(FluidMech.CONFIGURATION, name, material); super(FluidMech.CONFIGURATION, name, material);
this.setCreativeTab(IndustryCreativeTab.tabHydraulic()); this.setCreativeTab(IndustryTabs.tabHydraulic());
} }
} }

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

@ -1,7 +1,7 @@
package dark.fluid.common.machines; package dark.fluid.common.machines;
import com.dark.helpers.ConnectionHelper; import com.dark.helpers.ConnectionHelper;
import com.dark.tile.network.ITileConnector; import com.dark.tilenetwork.ITileConnector;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

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

@ -17,7 +17,7 @@ import com.google.common.io.ByteArrayDataInput;
import dark.api.ColorCode; import dark.api.ColorCode;
import dark.fluid.common.prefab.TileEntityFluidStorage; import dark.fluid.common.prefab.TileEntityFluidStorage;
import dark.machines.DarkMain; import dark.machines.CoreMachine;
public class TileEntitySink extends TileEntityFluidStorage implements IPacketReceiver public class TileEntitySink extends TileEntityFluidStorage implements IPacketReceiver
{ {
@ -47,7 +47,7 @@ public class TileEntitySink extends TileEntityFluidStorage implements IPacketRec
{ {
stack = this.getTank().getFluid(); stack = this.getTank().getFluid();
} }
return PacketHandler.instance().getTilePacket(DarkMain.CHANNEL, this, stack.writeToNBT(new NBTTagCompound())); return PacketHandler.instance().getTilePacket(CoreMachine.CHANNEL, this, stack.writeToNBT(new NBTTagCompound()));
} }
@Override @Override

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

@ -1,7 +1,7 @@
package dark.fluid.common.machines; package dark.fluid.common.machines;
import com.dark.tile.network.INetworkPart; import com.dark.tilenetwork.INetworkPart;
import com.dark.tile.network.ITileNetwork; import com.dark.tilenetwork.ITileNetwork;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;

4
src/dark/fluid/common/pipes/TileEntityPipe.java
View file

@ -1,7 +1,7 @@
package dark.fluid.common.pipes; package dark.fluid.common.pipes;
import com.dark.tile.network.ITileConnector; import com.dark.tilenetwork.ITileConnector;
import com.dark.tile.network.ITileNetwork; import com.dark.tilenetwork.ITileNetwork;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;

4
src/dark/fluid/common/prefab/TileEntityFluidDevice.java
View file

@ -2,8 +2,8 @@ package dark.fluid.common.prefab;
import java.util.Random; import java.util.Random;
import com.dark.prefab.tile.network.NetworkTileEntities; import com.dark.tilenetwork.ITileConnector;
import com.dark.tile.network.ITileConnector; import com.dark.tilenetwork.prefab.NetworkTileEntities;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;

12
src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java
View file

@ -24,8 +24,8 @@ import universalelectricity.core.vector.Vector3;
import com.dark.network.ISimplePacketReceiver; import com.dark.network.ISimplePacketReceiver;
import com.dark.network.PacketHandler; import com.dark.network.PacketHandler;
import com.dark.tile.network.INetworkPart; import com.dark.tilenetwork.INetworkPart;
import com.dark.tile.network.ITileNetwork; import com.dark.tilenetwork.ITileNetwork;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.network.Player;
@ -35,7 +35,7 @@ import dark.api.FluidMasterList;
import dark.api.fluid.INetworkFluidPart; import dark.api.fluid.INetworkFluidPart;
import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles; import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles;
import dark.fluid.common.FluidPartsMaterial; import dark.fluid.common.FluidPartsMaterial;
import dark.machines.DarkMain; import dark.machines.CoreMachine;
public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver
{ {
@ -429,7 +429,7 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
data[7] = this.renderConnection[5]; data[7] = this.renderConnection[5];
data[8] = this.getTank().getCapacity(); data[8] = this.getTank().getCapacity();
data[9] = this.getTank().writeToNBT(new NBTTagCompound()); data[9] = this.getTank().writeToNBT(new NBTTagCompound());
return PacketHandler.instance().getTilePacket(DarkMain.CHANNEL, this, data); return PacketHandler.instance().getTilePacket(CoreMachine.CHANNEL, this, data);
} }
public void sendRenderUpdate() public void sendRenderUpdate()
@ -443,14 +443,14 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i
data[5] = this.renderConnection[3]; data[5] = this.renderConnection[3];
data[6] = this.renderConnection[4]; data[6] = this.renderConnection[4];
data[7] = this.renderConnection[5]; data[7] = this.renderConnection[5];
PacketHandler.instance().sendPacketToClients(PacketHandler.instance().getTilePacket(DarkMain.CHANNEL, this, data)); PacketHandler.instance().sendPacketToClients(PacketHandler.instance().getTilePacket(CoreMachine.CHANNEL, this, data));
} }
public void sendTankUpdate(int index) public void sendTankUpdate(int index)
{ {
if (this.getTank() != null && index == 0) if (this.getTank() != null && index == 0)
{ {
PacketHandler.instance().sendPacketToClients(PacketHandler.instance().getTilePacket(DarkMain.CHANNEL, this, "SingleTank", this.getTank().getCapacity(), this.getTank().writeToNBT(new NBTTagCompound())), this.worldObj, new Vector3(this), 60); PacketHandler.instance().sendPacketToClients(PacketHandler.instance().getTilePacket(CoreMachine.CHANNEL, this, "SingleTank", this.getTank().getCapacity(), this.getTank().writeToNBT(new NBTTagCompound())), this.worldObj, new Vector3(this), 60);
} }
} }

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

@ -18,7 +18,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.common.Pair; import com.builtbroken.common.Pair;
import com.dark.prefab.tile.network.NetworkTileEntities; import com.dark.tilenetwork.prefab.NetworkTileEntities;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

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

@ -19,7 +19,7 @@ import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper; import universalelectricity.core.vector.VectorHelper;
import com.builtbroken.common.Pair; import com.builtbroken.common.Pair;
import com.dark.tile.network.ITileConnector; import com.dark.tilenetwork.ITileConnector;
import dark.api.fluid.IDrain; import dark.api.fluid.IDrain;
import dark.api.fluid.INetworkPipe; import dark.api.fluid.INetworkPipe;

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

@ -14,11 +14,11 @@ import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.Pair; import com.builtbroken.common.Pair;
import com.dark.fluid.FluidHelper; import com.dark.fluid.FluidHelper;
import com.dark.tile.network.ITileConnector; import com.dark.prefab.TileEntityEnergyMachine;
import com.dark.tilenetwork.ITileConnector;
import dark.api.IToolReadOut; import dark.api.IToolReadOut;
import dark.api.fluid.IDrain; import dark.api.fluid.IDrain;
import dark.core.prefab.machine.TileEntityEnergyMachine;
public class TileEntityStarterPump extends TileEntityEnergyMachine implements IToolReadOut, ITileConnector public class TileEntityStarterPump extends TileEntityEnergyMachine implements IToolReadOut, ITileConnector
{ {

2
src/dark/mech/common/machines/TileEntitySteamPiston.java
View file

@ -1,6 +1,6 @@
package dark.mech.common.machines; package dark.mech.common.machines;
import dark.core.prefab.machine.TileEntityEnergyMachine; import com.dark.prefab.TileEntityEnergyMachine;
public class TileEntitySteamPiston extends TileEntityEnergyMachine public class TileEntitySteamPiston extends TileEntityEnergyMachine
{ {