Fixed pipe & tank placement issue
This commit is contained in:
parent
2f8eff86dd
commit
a9b373e639
1 changed files with 40 additions and 42 deletions
|
@ -7,6 +7,7 @@ import resonantinduction.core.Settings;
|
||||||
import resonantinduction.mechanical.belt.BlockConveyorBelt;
|
import resonantinduction.mechanical.belt.BlockConveyorBelt;
|
||||||
import resonantinduction.mechanical.belt.TileConveyorBelt;
|
import resonantinduction.mechanical.belt.TileConveyorBelt;
|
||||||
import resonantinduction.mechanical.fluid.pipe.BlockPipe;
|
import resonantinduction.mechanical.fluid.pipe.BlockPipe;
|
||||||
|
import resonantinduction.mechanical.fluid.pipe.ItemBlockFluidContainer;
|
||||||
import resonantinduction.mechanical.fluid.pipe.TilePipe;
|
import resonantinduction.mechanical.fluid.pipe.TilePipe;
|
||||||
import resonantinduction.mechanical.fluid.pump.BlockGrate;
|
import resonantinduction.mechanical.fluid.pump.BlockGrate;
|
||||||
import resonantinduction.mechanical.fluid.pump.BlockPump;
|
import resonantinduction.mechanical.fluid.pump.BlockPump;
|
||||||
|
@ -26,60 +27,57 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||||
import cpw.mods.fml.common.network.NetworkMod;
|
import cpw.mods.fml.common.network.NetworkMod;
|
||||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||||
|
|
||||||
/**
|
/** Resonant Induction Archaic Module
|
||||||
* Resonant Induction Archaic Module
|
|
||||||
*
|
*
|
||||||
* @author DarkCow, Calclavia
|
* @author DarkCow, Calclavia */
|
||||||
*
|
|
||||||
*/
|
|
||||||
@Mod(modid = Mechanical.ID, name = Mechanical.NAME, version = Reference.VERSION, dependencies = "required-after:" + ResonantInduction.ID)
|
@Mod(modid = Mechanical.ID, name = Mechanical.NAME, version = Reference.VERSION, dependencies = "required-after:" + ResonantInduction.ID)
|
||||||
@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
|
@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
|
||||||
public class Mechanical
|
public class Mechanical
|
||||||
{
|
{
|
||||||
/** Mod Information */
|
/** Mod Information */
|
||||||
public static final String ID = "ResonantInduction|Mechanical";
|
public static final String ID = "ResonantInduction|Mechanical";
|
||||||
public static final String NAME = Reference.NAME + " Mechanical";
|
public static final String NAME = Reference.NAME + " Mechanical";
|
||||||
|
|
||||||
@Instance(ID)
|
@Instance(ID)
|
||||||
public static Mechanical INSTANCE;
|
public static Mechanical INSTANCE;
|
||||||
|
|
||||||
@SidedProxy(clientSide = "resonantinduction.mechanical.ClientProxy", serverSide = "resonantinduction.mechanical.CommonProxy")
|
@SidedProxy(clientSide = "resonantinduction.mechanical.ClientProxy", serverSide = "resonantinduction.mechanical.CommonProxy")
|
||||||
public static CommonProxy proxy;
|
public static CommonProxy proxy;
|
||||||
|
|
||||||
@Mod.Metadata(ID)
|
@Mod.Metadata(ID)
|
||||||
public static ModMetadata metadata;
|
public static ModMetadata metadata;
|
||||||
|
|
||||||
public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, ID);
|
public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, ID);
|
||||||
|
|
||||||
// Transport
|
// Transport
|
||||||
public static Block blockConveyorBelt;
|
public static Block blockConveyorBelt;
|
||||||
|
|
||||||
// #Fluids
|
// #Fluids
|
||||||
public static Block blockTank;
|
public static Block blockTank;
|
||||||
public static Block blockPipe;
|
public static Block blockPipe;
|
||||||
public static Block blockReleaseValve;
|
public static Block blockReleaseValve;
|
||||||
public static Block blockGrate;
|
public static Block blockGrate;
|
||||||
public static Block blockPump;
|
public static Block blockPump;
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void preInit(FMLPreInitializationEvent evt)
|
public void preInit(FMLPreInitializationEvent evt)
|
||||||
{
|
{
|
||||||
Settings.load();
|
Settings.load();
|
||||||
NetworkRegistry.instance().registerGuiHandler(this, proxy);
|
NetworkRegistry.instance().registerGuiHandler(this, proxy);
|
||||||
blockConveyorBelt = contentRegistry.createTile(BlockConveyorBelt.class, TileConveyorBelt.class);
|
blockConveyorBelt = contentRegistry.createTile(BlockConveyorBelt.class, TileConveyorBelt.class);
|
||||||
|
|
||||||
blockTank = contentRegistry.createTile(BlockTank.class, TileTank.class);
|
blockTank = contentRegistry.createBlock(BlockTank.class, ItemBlockFluidContainer.class, TileTank.class);
|
||||||
blockPipe = contentRegistry.createTile(BlockPipe.class, TilePipe.class);
|
blockPipe = contentRegistry.createBlock(BlockPipe.class, ItemBlockFluidContainer.class, TilePipe.class);
|
||||||
blockGrate = contentRegistry.createTile(BlockGrate.class, TileGrate.class);
|
blockGrate = contentRegistry.createTile(BlockGrate.class, TileGrate.class);
|
||||||
blockPump = contentRegistry.createTile(BlockPump.class, TilePump.class);
|
blockPump = contentRegistry.createTile(BlockPump.class, TilePump.class);
|
||||||
proxy.preInit();
|
proxy.preInit();
|
||||||
Settings.save();
|
Settings.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void init(FMLInitializationEvent evt)
|
public void init(FMLInitializationEvent evt)
|
||||||
{
|
{
|
||||||
Settings.setModMetadata(metadata, ID, NAME);
|
Settings.setModMetadata(metadata, ID, NAME);
|
||||||
proxy.init();
|
proxy.init();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue