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

changed block registration to custom system

Browse source
This commit is contained in:
DarkGuardsman 2013-08-29 17:23:42 -04:00
parent 85461fce89
commit 8677d4e5b2
22 changed files with 61 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,8 +3,8 @@ package dark.api.fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.IFluidTank;
import dark.api.IColorCoded;
import dark.api.INetworkPart;
import dark.interfaces.IColorCoded;
import dark.interfaces.INetworkPart;
public interface INetworkFluidPart extends IColorCoded, IFluidHandler, INetworkPart
{

2
src/dark/core/network/fluid/HydraulicNetworkHelper.java
View file

@ -4,8 +4,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import dark.api.INetworkPart;
import dark.core.tile.network.NetworkTileEntities;
import dark.interfaces.INetworkPart;
public class HydraulicNetworkHelper
{

4
src/dark/core/network/fluid/NetworkFluidContainers.java
View file

@ -7,10 +7,10 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.ColorCode;
import dark.api.INetworkPart;
import dark.api.fluid.INetworkFluidPart;
import dark.core.tile.network.NetworkTileEntities;
import dark.interfaces.ColorCode;
import dark.interfaces.INetworkPart;
/** Side note: the network should act like this when done {@link http
* ://www.e4training.com/hydraulic_calculators/B1.htm} as well as stay compatible with the forge

4
src/dark/core/network/fluid/NetworkFluidTiles.java
View file

@ -18,8 +18,6 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector3;
import dark.api.ColorCode;
import dark.api.INetworkPart;
import dark.api.fluid.AdvancedFluidEvent;
import dark.api.fluid.AdvancedFluidEvent.FluidMergeEvent;
import dark.api.fluid.INetworkFluidPart;
@ -28,6 +26,8 @@ import dark.core.helpers.Pair;
import dark.core.tile.network.NetworkTileEntities;
import dark.fluid.common.machines.TileEntityTank;
import dark.fluid.common.pipes.TileEntityPipe;
import dark.interfaces.ColorCode;
import dark.interfaces.INetworkPart;
public class NetworkFluidTiles extends NetworkTileEntities
{

4
src/dark/core/network/fluid/NetworkPipes.java
View file

@ -9,13 +9,13 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.ColorCode;
import dark.api.INetworkPart;
import dark.api.fluid.INetworkPipe;
import dark.core.helpers.ConnectionHelper;
import dark.core.helpers.FluidHelper;
import dark.core.helpers.FluidRestrictionHandler;
import dark.core.tile.network.NetworkTileEntities;
import dark.interfaces.ColorCode;
import dark.interfaces.INetworkPart;
/** Side note: the network should act like this when done {@link http
* ://www.e4training.com/hydraulic_calculators/B1.htm} as well as stay compatible with the forge

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

@ -7,12 +7,12 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ColorCode;
import dark.client.renders.RenderMachine;
import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.client.model.ModelReleaseValve;
import dark.fluid.common.FluidMech;
import dark.fluid.common.machines.TileEntityReleaseValve;
import dark.interfaces.ColorCode;
@SideOnly(Side.CLIENT)
public class RenderReleaseValve extends RenderMachine

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

@ -9,12 +9,12 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ColorCode;
import dark.client.renders.FluidBlockRenderer;
import dark.client.renders.RenderMachine;
import dark.fluid.client.model.ModelTankSide;
import dark.fluid.common.FluidMech;
import dark.fluid.common.machines.TileEntityTank;
import dark.interfaces.ColorCode;
@SideOnly(Side.CLIENT)
public class RenderTank extends RenderMachine

2
src/dark/fluid/client/render/pipe/RenderPipe.java
View file

@ -10,13 +10,13 @@ import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ColorCode;
import dark.client.renders.RenderMachine;
import dark.core.helpers.FluidRestrictionHandler;
import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.common.FluidMech;
import dark.fluid.common.pipes.TileEntityPipe;
import dark.fluid.common.pipes.addon.IPipeExtention;
import dark.interfaces.ColorCode;
@SideOnly(Side.CLIENT)
public class RenderPipe extends RenderMachine

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

@ -1,7 +1,7 @@
package dark.fluid.common;
import net.minecraft.block.material.Material;
import dark.core.blocks.BlockMachine;
import dark.prefab.BlockMachine;
public abstract class BlockFM extends BlockMachine
{

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

@ -5,11 +5,11 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
import dark.api.ColorCode;
import dark.core.CoreRecipeLoader;
import dark.core.RecipeLoader;
import dark.core.items.ItemParts.Parts;
import dark.fluid.common.machines.BlockFluid;
import dark.interfaces.ColorCode;
public class FMRecipeLoader extends RecipeLoader
{

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

@ -1,7 +1,9 @@
package dark.fluid.common;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.logging.Logger;
import net.minecraft.creativetab.CreativeTabs;
@ -26,9 +28,11 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.registry.GameRegistry;
import dark.core.CoreRecipeLoader;
import dark.core.DarkMain;
import dark.core.ModPrefab;
import dark.core.BlockRegistry.BlockData;
import dark.core.items.ItemBlockHolder;
import dark.core.items.ItemBlockOre;
import dark.fluid.common.machines.BlockBoiler;
import dark.fluid.common.machines.BlockFluid;
import dark.fluid.common.machines.BlockReleaseValve;
@ -52,6 +56,7 @@ 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.prefab.ModPrefab;
@ModstatInfo(prefix = "fluidmech")
@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:DarkCore", useMetadata = true)
@ -95,19 +100,7 @@ public class FluidMech extends ModPrefab
super.preInit(event);
/* BLOCK REGISTER CALLS */
GameRegistry.registerBlock(FMRecipeLoader.blockPipe, ItemBlockPipe.class, "lmPipe");
GameRegistry.registerBlock(FMRecipeLoader.blockGenPipe, ItemBlockPipe.class, "lmGenPipe");
GameRegistry.registerBlock(FMRecipeLoader.blockReleaseValve, ItemBlockHolder.class, "eValve");
GameRegistry.registerBlock(FMRecipeLoader.blockRod, "mechRod");
GameRegistry.registerBlock(FMRecipeLoader.blockGenerator, "lmGen");
GameRegistry.registerBlock(FMRecipeLoader.blockMachine, ItemBlockHolder.class, "lmMachines");
GameRegistry.registerBlock(FMRecipeLoader.blockTank, ItemBlockHolder.class, "lmTank");
GameRegistry.registerBlock(FMRecipeLoader.blockSink, "lmSink");
GameRegistry.registerBlock(FMRecipeLoader.blockDrain, "lmDrain");
GameRegistry.registerBlock(FMRecipeLoader.blockConPump, "lmConPump");
GameRegistry.registerBlock(FMRecipeLoader.blockHeater, "SPHeater");
GameRegistry.registerBlock(FMRecipeLoader.blockPiston, "SPPiston");
GameRegistry.registerBlock(FMRecipeLoader.blockBoiler, "SPBoiler");
proxy.preInit();
}
@ -116,24 +109,8 @@ public class FluidMech extends ModPrefab
public void init(FMLInitializationEvent event)
{
super.init(event);
/* LOGGER */
FMLog.info("Loading...");
proxy.Init();
/* TILE ENTITY REGISTER CALLS */
GameRegistry.registerTileEntity(TileEntityPipe.class, "FluidPipe");
GameRegistry.registerTileEntity(TileEntityGenericPipe.class, "ColoredPipe");
GameRegistry.registerTileEntity(TileEntityStarterPump.class, "starterPump");
GameRegistry.registerTileEntity(TileEntityReleaseValve.class, "ReleaseValve");
GameRegistry.registerTileEntity(TileEntityTank.class, "FluidTank");
GameRegistry.registerTileEntity(TileEntitySink.class, "FluidSink");
GameRegistry.registerTileEntity(TileEntityDrain.class, "FluidDrain");
GameRegistry.registerTileEntity(TileEntityConstructionPump.class, "ConstructionPump");
GameRegistry.registerTileEntity(TileEntityBoiler.class, "FMSteamBoiler");
//GameRegistry.registerTileEntity(TileEntityFireBox.class, "FMFireBox");
GameRegistry.registerTileEntity(TileEntitySteamPiston.class, "FMSteamPiston");
/* LANG LOADING */
FMLog.info(" Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages.");
@ -143,8 +120,6 @@ public class FluidMech extends ModPrefab
public void postInit(FMLPostInitializationEvent event)
{
super.postInit(event);
/* LOGGER */
FMLog.info("Finalizing...");
proxy.postInit();
/* /******** RECIPES ************* */
@ -154,8 +129,9 @@ public class FluidMech extends ModPrefab
}
@Override
public void loadConfig()
public List<BlockData> getBlocks()
{
List<BlockData> dataList = new ArrayList<BlockData>();
if (recipeLoader == null)
{
recipeLoader = new FMRecipeLoader();
@ -188,9 +164,23 @@ public class FluidMech extends ModPrefab
FMRecipeLoader.blockPiston = new BlockSteamPiston(getNextID());
FMRecipeLoader.blockBoiler = new BlockBoiler(getNextID());
dataList.add(new BlockData(FMRecipeLoader.blockPipe, ItemBlockPipe.class, "lmPipe").addTileEntity(TileEntityPipe.class, "FluidPipe"));
dataList.add(new BlockData(FMRecipeLoader.blockGenPipe, ItemBlockPipe.class, "lmGenPipe").addTileEntity(TileEntityGenericPipe.class, "ColoredPipe"));
dataList.add(new BlockData(FMRecipeLoader.blockReleaseValve, ItemBlockHolder.class, "eValve").addTileEntity(TileEntityReleaseValve.class, "ReleaseValve"));
dataList.add(new BlockData(FMRecipeLoader.blockRod, "mechRod"));
dataList.add(new BlockData(FMRecipeLoader.blockGenerator, "mechGenerator"));
dataList.add(new BlockData(FMRecipeLoader.blockMachine, ItemBlockHolder.class, "lmMachines").addTileEntity(TileEntityStarterPump.class, "starterPump"));
dataList.add(new BlockData(FMRecipeLoader.blockTank, ItemBlockHolder.class, "lmTank").addTileEntity(TileEntityTank.class, "FluidTank"));
dataList.add(new BlockData(FMRecipeLoader.blockSink, "lmSink").addTileEntity(TileEntitySink.class, "FluidSink"));
dataList.add(new BlockData(FMRecipeLoader.blockDrain, "lmDrain").addTileEntity(TileEntityDrain.class, "FluidDrain"));
dataList.add(new BlockData(FMRecipeLoader.blockConPump, "lmConPump").addTileEntity(TileEntityConstructionPump.class, "ConstructionPump"));
dataList.add(new BlockData(FMRecipeLoader.blockHeater, "SPHeater"));
dataList.add(new BlockData(FMRecipeLoader.blockPiston, "SPPiston").addTileEntity(TileEntitySteamPiston.class, "FMSteamPiston"));
dataList.add(new BlockData(FMRecipeLoader.blockBoiler, "SPBoiler").addTileEntity(TileEntityBoiler.class, "FMSteamBoiler"));
/* ITEM DECLARATION */
CONFIGURATION.save();
return dataList;
}
@Override
@ -211,7 +201,7 @@ public class FluidMech extends ModPrefab
}
public static final CreativeTabs TabFluidMech = new CreativeTabs("Fluid Mechanics")
public static final CreativeTabs TabFluidMech = new CreativeTabs("Hydraulics")
{
public ItemStack getIconItemStack()
{

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

@ -13,12 +13,12 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import dark.api.INetworkPart;
import dark.core.helpers.AutoCraftingManager;
import dark.core.helpers.FluidHelper;
import dark.core.helpers.FluidRestrictionHandler;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.BlockFM;
import dark.interfaces.INetworkPart;
public class BlockTank extends BlockFM
{

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

@ -10,14 +10,14 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.ColorCode;
import dark.api.IColorCoded;
import dark.api.ITileConnector;
import dark.api.IToolReadOut;
import dark.api.fluid.INetworkPipe;
import dark.core.helpers.ConnectionHelper;
import dark.core.network.fluid.NetworkPipes;
import dark.fluid.common.prefab.TileEntityFluidDevice;
import dark.interfaces.ColorCode;
import dark.interfaces.IColorCoded;
import dark.interfaces.ITileConnector;
import dark.interfaces.IToolReadOut;
public class TileEntityReleaseValve extends TileEntityFluidDevice implements ITileConnector, IToolReadOut
{

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

@ -15,9 +15,9 @@ import universalelectricity.prefab.network.PacketManager;
import com.google.common.io.ByteArrayDataInput;
import dark.api.ColorCode;
import dark.fluid.common.FluidMech;
import dark.fluid.common.prefab.TileEntityFluidStorage;
import dark.interfaces.ColorCode;
public class TileEntitySink extends TileEntityFluidStorage implements IPacketReceiver
{

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

@ -1,7 +1,7 @@
package dark.fluid.common.machines;
import dark.core.blocks.TileEntityMachine;
import dark.fluid.common.FluidMech;
import dark.prefab.TileEntityMachine;
public class TileEntitySteamPiston extends TileEntityMachine
{

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

@ -29,9 +29,6 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ColorCode;
import dark.api.IColorCoded;
import dark.api.IToolReadOut;
import dark.api.fluid.INetworkFluidPart;
import dark.api.fluid.INetworkPipe;
import dark.core.helpers.FluidRestrictionHandler;
@ -40,6 +37,9 @@ import dark.core.network.fluid.NetworkFluidTiles;
import dark.core.tile.network.NetworkTileEntities;
import dark.fluid.common.FluidMech;
import dark.fluid.common.prefab.TileEntityFluidStorage;
import dark.interfaces.ColorCode;
import dark.interfaces.IColorCoded;
import dark.interfaces.IToolReadOut;
public class TileEntityTank extends TileEntityFluidStorage implements IFluidHandler, IToolReadOut, IColorCoded, INetworkFluidPart, IPacketReceiver
{

2
src/dark/fluid/common/pipes/TileEntityGenericPipe.java
View file

@ -7,8 +7,8 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import dark.api.ColorCode;
import dark.core.network.fluid.NetworkPipes;
import dark.interfaces.ColorCode;
public class TileEntityGenericPipe extends TileEntityPipe
{

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

@ -33,16 +33,16 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ColorCode;
import dark.api.IColorCoded;
import dark.api.ITileConnector;
import dark.api.IToolReadOut;
import dark.api.fluid.INetworkPipe;
import dark.core.helpers.FluidRestrictionHandler;
import dark.core.network.fluid.NetworkPipes;
import dark.core.tile.network.NetworkTileEntities;
import dark.fluid.common.FluidMech;
import dark.fluid.common.pipes.addon.IPipeExtention;
import dark.interfaces.ColorCode;
import dark.interfaces.IColorCoded;
import dark.interfaces.ITileConnector;
import dark.interfaces.IToolReadOut;
public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, IToolReadOut, IColorCoded, INetworkPipe, IPacketReceiver
{

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

@ -5,9 +5,9 @@ import java.util.Random;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import dark.api.ITileConnector;
import dark.api.IToolReadOut;
import dark.core.network.fluid.HydraulicNetworkHelper;
import dark.interfaces.ITileConnector;
import dark.interfaces.IToolReadOut;
public abstract class TileEntityFluidDevice extends TileEntityAdvanced implements IToolReadOut, ITileConnector
{

2
src/dark/fluid/common/prefab/TileEntityFluidStorage.java
View file

@ -11,9 +11,9 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.IColorCoded;
import dark.core.helpers.FluidHelper;
import dark.core.helpers.FluidRestrictionHandler;
import dark.interfaces.IColorCoded;
public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements IFluidHandler, IColorCoded
{

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

@ -14,13 +14,13 @@ import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import dark.api.ITileConnector;
import dark.api.fluid.IDrain;
import dark.api.fluid.INetworkPipe;
import dark.core.helpers.MetaGroup;
import dark.core.helpers.Pair;
import dark.core.network.fluid.HydraulicNetworkHelper;
import dark.core.network.fluid.NetworkFluidTiles;
import dark.interfaces.ITileConnector;
public class TileEntityConstructionPump extends TileEntityStarterPump implements IFluidHandler, ITileConnector
{

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

@ -11,13 +11,13 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector3;
import dark.api.ITileConnector;
import dark.api.IToolReadOut;
import dark.api.fluid.IDrain;
import dark.core.blocks.TileEntityMachine;
import dark.core.helpers.FluidHelper;
import dark.core.helpers.Pair;
import dark.fluid.common.FluidMech;
import dark.interfaces.ITileConnector;
import dark.interfaces.IToolReadOut;
import dark.prefab.TileEntityMachine;
public class TileEntityStarterPump extends TileEntityMachine implements IToolReadOut, ITileConnector
{