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

Cleanup and optimization

Browse source 
Removed some code that is no longer support in the core mod
Merged all ItemBlock classes into a simple class that will later be
moved to the core.
Optimized blockID and config
This commit is contained in:
DarkGuardsman 2013-07-21 22:56:25 -04:00
parent c21700e633
commit 2763a6c964
7 changed files with 24 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/assets/fm/textures/models/pipes/milkPipe.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 816 B

42
src/minecraft/dark/fluid/common/FluidMech.java
View file

@ -21,7 +21,6 @@ import org.modstats.Modstats;
import universalelectricity.prefab.TranslationHelper;
import universalelectricity.prefab.network.PacketManager;
import cpw.mods.fml.common.DummyModContainer;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
@ -43,9 +42,7 @@ import dark.fluid.common.item.ItemTools;
import dark.fluid.common.machines.BlockReleaseValve;
import dark.fluid.common.machines.BlockSink;
import dark.fluid.common.machines.BlockTank;
import dark.fluid.common.machines.ItemBlockLiquidMachine;
import dark.fluid.common.machines.ItemBlockReleaseValve;
import dark.fluid.common.machines.ItemBlockTank;
import dark.fluid.common.machines.ItemBlockHolder;
import dark.fluid.common.machines.TileEntityReleaseValve;
import dark.fluid.common.machines.TileEntitySink;
import dark.fluid.common.machines.TileEntityTank;
@ -127,6 +124,7 @@ public class FluidMech extends ModPrefab
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
super.preInit(event);
/* LOGGER SETUP */
FMLog.setParent(FMLLog.getLogger());
FMLog.info("Initializing...");
@ -143,11 +141,11 @@ public class FluidMech extends ModPrefab
/* BLOCK REGISTER CALLS */
GameRegistry.registerBlock(blockPipe, ItemBlockPipe.class, "lmPipe");
GameRegistry.registerBlock(blockGenPipe, ItemBlockPipe.class, "lmGenPipe");
GameRegistry.registerBlock(blockReleaseValve, ItemBlockReleaseValve.class, "eValve");
GameRegistry.registerBlock(blockReleaseValve, ItemBlockHolder.class, "eValve");
GameRegistry.registerBlock(blockRod, "mechRod");
GameRegistry.registerBlock(blockGenerator, "lmGen");
GameRegistry.registerBlock(blockMachine, ItemBlockLiquidMachine.class, "lmMachines");
GameRegistry.registerBlock(blockTank, ItemBlockTank.class, "lmTank");
GameRegistry.registerBlock(blockMachine, ItemBlockHolder.class, "lmMachines");
GameRegistry.registerBlock(blockTank, ItemBlockHolder.class, "lmTank");
GameRegistry.registerBlock(blockSink, "lmSink");
GameRegistry.registerBlock(blockDrain, "lmDrain");
GameRegistry.registerBlock(blockConPump, "lmConPump");
@ -155,9 +153,9 @@ public class FluidMech extends ModPrefab
}
@EventHandler
public void Init(FMLInitializationEvent event)
public void init(FMLInitializationEvent event)
{
super.init(event);
/* LOGGER */
FMLog.info("Loading...");
proxy.Init();
@ -167,7 +165,7 @@ public class FluidMech extends ModPrefab
GameRegistry.registerTileEntity(TileEntityGenericPipe.class, "lmGenPipeTile");
GameRegistry.registerTileEntity(TileEntityStarterPump.class, "lmPumpTile");
//GameRegistry.registerTileEntity(TileEntityRod.class, "lmRodTile");
GameRegistry.registerTileEntity(TileEntityReleaseValve.class, "lmeValve");
GameRegistry.registerTileEntity(TileEntityReleaseValve.class, "lmReleaseValve");
GameRegistry.registerTileEntity(TileEntityTank.class, "lmTank");
//GameRegistry.registerTileEntity(TileEntityGenerator.class, "lmGen");
GameRegistry.registerTileEntity(TileEntitySink.class, "lmSink");
@ -192,8 +190,9 @@ public class FluidMech extends ModPrefab
}
@EventHandler
public void PostInit(FMLPostInitializationEvent event)
public void postInit(FMLPostInitializationEvent event)
{
super.postInit(event);
/* LOGGER */
FMLog.info("Finalizing...");
proxy.postInit();
@ -288,17 +287,17 @@ public class FluidMech extends ModPrefab
Fluid waste = new Fluid("waste").setBlockID(FluidMech.CONFIGURATION.getBlock("WasteLiquid", BLOCK_ID_PREFIX++).getInt());
/* BLOCK DECLARATION -- CONFIG LOADER */
blockGenPipe = new BlockPipe(FluidMech.CONFIGURATION.getBlock("Pipes", BLOCK_ID_PREFIX).getInt());
blockMachine = new BlockPumpMachine(FluidMech.CONFIGURATION.getBlock("Machines", BLOCK_ID_PREFIX + 1).getInt());
blockRod = new BlockRod(FluidMech.CONFIGURATION.getBlock("MechRod", BLOCK_ID_PREFIX + 3).getInt());
blockGenerator = new BlockGenerator((FluidMech.CONFIGURATION.getBlock("Generator", BLOCK_ID_PREFIX + 4).getInt()));
blockReleaseValve = new BlockReleaseValve((FluidMech.CONFIGURATION.getBlock("ReleaseValve", BLOCK_ID_PREFIX + 5).getInt()));
blockTank = new BlockTank(FluidMech.CONFIGURATION.getBlock("Tank", BLOCK_ID_PREFIX + 6).getInt());
blockGenPipe = new BlockPipe(BLOCK_ID_PREFIX++);
blockMachine = new BlockPumpMachine(BLOCK_ID_PREFIX++);
blockRod = new BlockRod(BLOCK_ID_PREFIX++);
blockGenerator = new BlockGenerator(BLOCK_ID_PREFIX++);
blockReleaseValve = new BlockReleaseValve(BLOCK_ID_PREFIX++);
blockTank = new BlockTank(BLOCK_ID_PREFIX++);
blockWasteLiquid = new BlockFluidFinite(waste.getBlockID(), waste, Material.water);
blockSink = new BlockSink(FluidMech.CONFIGURATION.getBlock("Sink", BLOCK_ID_PREFIX + 8).getInt());
blockDrain = new BlockDrain(FluidMech.CONFIGURATION.getBlock("Drain", BLOCK_ID_PREFIX + 9).getInt());
blockConPump = new BlockConstructionPump(FluidMech.CONFIGURATION.getBlock("ConstructionPump", BLOCK_ID_PREFIX + 10).getInt());
blockPipe = new BlockPipe(FluidMech.CONFIGURATION.getBlock("RestrictedPipes", BLOCK_ID_PREFIX + 11).getInt());
blockSink = new BlockSink(BLOCK_ID_PREFIX++);
blockDrain = new BlockDrain(BLOCK_ID_PREFIX++);
blockConPump = new BlockConstructionPump(BLOCK_ID_PREFIX++);
blockPipe = new BlockPipe(BLOCK_ID_PREFIX++);
/* ITEM DECLARATION */
itemParts = new ItemParts(FluidMech.CONFIGURATION.getItem("Parts", ITEM_ID_PREFIX).getInt());
@ -330,7 +329,6 @@ public class FluidMech extends ModPrefab
public static final CreativeTabs TabFluidMech = new CreativeTabs("Fluid Mechanics")
{
public ItemStack getIconItemStack()
{
return new ItemStack(blockPipe, 1, 4);

4
src/minecraft/dark/fluid/common/machines/ItemBlockTank.java → src/minecraft/dark/fluid/common/machines/ItemBlockHolder.java
View file

@ -4,10 +4,10 @@ import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public class ItemBlockTank extends ItemBlock
public class ItemBlockHolder extends ItemBlock
{
public ItemBlockTank(int id)
public ItemBlockHolder(int id)
{
super(id);
this.setMaxDamage(0);

28
src/minecraft/dark/fluid/common/machines/ItemBlockLiquidMachine.java
View file

@ -1,28 +0,0 @@
package dark.fluid.common.machines;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public class ItemBlockLiquidMachine extends ItemBlock
{
public ItemBlockLiquidMachine(int id)
{
super(id);
this.setMaxDamage(0);
this.setHasSubtypes(true);
}
@Override
public int getMetadata(int damage)
{
return damage;
}
@Override
public String getUnlocalizedName(ItemStack itemStack)
{
return Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage();
}
}

28
src/minecraft/dark/fluid/common/machines/ItemBlockReleaseValve.java
View file

@ -1,28 +0,0 @@
package dark.fluid.common.machines;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public class ItemBlockReleaseValve extends ItemBlock
{
public ItemBlockReleaseValve(int id)
{
super(id);
this.setMaxDamage(0);
this.setHasSubtypes(true);
}
@Override
public int getMetadata(int damage)
{
return damage;
}
@Override
public String getUnlocalizedName(ItemStack itemStack)
{
return Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage();
}
}

6
src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java
View file

@ -25,12 +25,6 @@ public class TileEntityConstructionPump extends TileEntityRunnableMachine implem
private int liquidRequest = 5;
public int rotation = 0;
public TileEntityConstructionPump()
{
super(100);
// TODO Auto-generated constructor stub
}
@Override
public void initiate()
{

10
src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java
View file

@ -35,12 +35,6 @@ public class TileEntityStarterPump extends TileEntityRunnableMachine implements
ForgeDirection wireConnection = ForgeDirection.EAST;
ForgeDirection pipeConnection = ForgeDirection.EAST;
public TileEntityStarterPump()
{
super(20);
// TODO Auto-generated constructor stub
}
/** gets the side connection for the wire and pipe */
public void getConnections()
{
@ -119,7 +113,7 @@ public class TileEntityStarterPump extends TileEntityRunnableMachine implements
}
/** checks to see if this pump can pump the selected target block
*
*
* @param x y z - location of the block, use the tileEntities world
* @return true if it can pump */
boolean canPump(Vector3 vec)
@ -129,7 +123,7 @@ public class TileEntityStarterPump extends TileEntityRunnableMachine implements
}
/** drains the block(removes) at the location given
*
*
* @param loc - vector 3 location
* @return true if the block was drained */
boolean drainBlock(Vector3 loc)