a3c43609ea
What i have is not much diffrent but its a start to allowing more liquid types without having to add them myself. The current method has 3 defualt liquids that are preset. The new system also uses String names to ID liquid instead of Enums. A new class Called LiquidData will keep track of the data need to ID, and use the Liquids. In the process i also fixed a few crafting recipes that were removed/messed up in a patch a while back. Plan for new system *Have default liquid type that come with textures/renders *Have several univeral pipes that can accept all Liquid types *Have a way of placeing a universal pipe and then converting to a regulated pipe, pipe that only take one liquid type *Have a tool for doing the above *Change the release Valve to be univeral with a GUI to restrict flow and Liquid type extracted
291 lines
13 KiB
Java
291 lines
13 KiB
Java
package liquidmechanics.common;
|
|
|
|
import java.io.File;
|
|
|
|
import liquidmechanics.common.block.BlockGenerator;
|
|
import liquidmechanics.common.block.BlockMachine;
|
|
import liquidmechanics.common.block.BlockPipe;
|
|
import liquidmechanics.common.block.BlockReleaseValve;
|
|
import liquidmechanics.common.block.BlockRod;
|
|
import liquidmechanics.common.block.BlockSteam;
|
|
import liquidmechanics.common.handlers.LiquidData;
|
|
import liquidmechanics.common.handlers.LiquidHandler;
|
|
import liquidmechanics.common.item.ItemEValve;
|
|
import liquidmechanics.common.item.ItemGuage;
|
|
import liquidmechanics.common.item.ItemMachine;
|
|
import liquidmechanics.common.item.ItemParts;
|
|
import liquidmechanics.common.item.ItemParts.Parts;
|
|
import liquidmechanics.common.item.ItemPipe;
|
|
import liquidmechanics.common.item.ItemTank;
|
|
import liquidmechanics.common.tileentity.TileEntityGenerator;
|
|
import liquidmechanics.common.tileentity.TileEntityPipe;
|
|
import liquidmechanics.common.tileentity.TileEntityPump;
|
|
import liquidmechanics.common.tileentity.TileEntityReleaseValve;
|
|
import liquidmechanics.common.tileentity.TileEntityRod;
|
|
import liquidmechanics.common.tileentity.TileEntityTank;
|
|
import net.minecraft.block.Block;
|
|
import net.minecraft.item.Item;
|
|
import net.minecraft.item.ItemStack;
|
|
import net.minecraft.item.crafting.CraftingManager;
|
|
import net.minecraftforge.common.Configuration;
|
|
import net.minecraftforge.liquids.LiquidContainerRegistry;
|
|
import net.minecraftforge.liquids.LiquidDictionary;
|
|
import net.minecraftforge.liquids.LiquidStack;
|
|
import net.minecraftforge.oredict.OreDictionary;
|
|
import net.minecraftforge.oredict.ShapedOreRecipe;
|
|
import universalelectricity.prefab.network.PacketManager;
|
|
import cpw.mods.fml.common.DummyModContainer;
|
|
import cpw.mods.fml.common.Loader;
|
|
import cpw.mods.fml.common.Mod;
|
|
import cpw.mods.fml.common.Mod.Init;
|
|
import cpw.mods.fml.common.Mod.Instance;
|
|
import cpw.mods.fml.common.Mod.PostInit;
|
|
import cpw.mods.fml.common.Mod.PreInit;
|
|
import cpw.mods.fml.common.SidedProxy;
|
|
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
|
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 cpw.mods.fml.common.registry.LanguageRegistry;
|
|
|
|
/**
|
|
* Used in the creation of a new mod class
|
|
*
|
|
* @author Rseifert
|
|
*
|
|
*/
|
|
@Mod(modid = LiquidMechanics.NAME, name = LiquidMechanics.NAME, version = LiquidMechanics.VERSION, dependencies = "after:BasicComponents")
|
|
@NetworkMod(channels = { LiquidMechanics.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
|
|
public class LiquidMechanics extends DummyModContainer
|
|
{
|
|
// TODO Change in Version Release
|
|
public static final String VERSION = "0.2.3";
|
|
|
|
// Constants
|
|
public static final String NAME = "Liquid Mechanics";
|
|
public static final String CHANNEL = "liquidMech";
|
|
|
|
public static final String PATH = "/liquidmechanics/";
|
|
public static final String RESOURCE_PATH = PATH + "resource/";
|
|
public static final String BLOCK_TEXTURE_FILE = RESOURCE_PATH + "blocks.png";
|
|
public static final String ITEM_TEXTURE_FILE = RESOURCE_PATH + "items.png";
|
|
public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir() + "/UniversalElectricity/", NAME + ".cfg"));
|
|
|
|
public final static int BLOCK_ID_PREFIX = 3100;
|
|
public final static int LIQUID_ID_PREFIX = 200;
|
|
public final static int ITEM_ID_PREFIX = 13200;
|
|
|
|
public static Block blockPipe;
|
|
public static Block blockMachine;
|
|
public static Block blockRod;
|
|
public static Block blockGenerator;
|
|
public static Block blockReleaseValve;
|
|
public static Block blockSteamBlock;
|
|
|
|
public static LiquidStack liquidSteam;
|
|
|
|
public static Item itemParts;
|
|
public static Item itemPipes;
|
|
public static Item itemGauge;
|
|
public static Item itemOilBucket;
|
|
public static Item itemTank;
|
|
|
|
@SidedProxy(clientSide = "liquidmechanics.client.ClientProxy", serverSide = "liquidmechanics.common.CommonProxy")
|
|
public static CommonProxy proxy;
|
|
|
|
@Instance(NAME)
|
|
public static LiquidMechanics instance;
|
|
|
|
@PreInit
|
|
public void preInit(FMLPreInitializationEvent event)
|
|
{
|
|
instance = this;
|
|
|
|
CONFIGURATION.load();
|
|
|
|
// Blocks
|
|
blockPipe = new BlockPipe(this.CONFIGURATION.getBlock("Pipes", BLOCK_ID_PREFIX).getInt());
|
|
blockMachine = new BlockMachine(this.CONFIGURATION.getBlock("Machines", BLOCK_ID_PREFIX + 1).getInt());
|
|
blockRod = new BlockRod(this.CONFIGURATION.getBlock("Mechanical Rod", BLOCK_ID_PREFIX + 3).getInt());
|
|
blockGenerator = new BlockGenerator((this.CONFIGURATION.getBlock("Generator", BLOCK_ID_PREFIX + 4).getInt()));
|
|
blockReleaseValve = new BlockReleaseValve((this.CONFIGURATION.getBlock("Release Valve", BLOCK_ID_PREFIX + 5).getInt()));
|
|
|
|
// Liquid Blocks
|
|
blockSteamBlock = new BlockSteam(this.CONFIGURATION.getBlock("SteamBlock", LIQUID_ID_PREFIX).getInt());
|
|
|
|
// Items
|
|
itemParts = new ItemParts(this.CONFIGURATION.getItem("Parts", ITEM_ID_PREFIX).getInt());
|
|
itemPipes = new ItemPipe(this.CONFIGURATION.getItem("PipeItem", ITEM_ID_PREFIX + 1).getInt());
|
|
|
|
// Valve item
|
|
itemGauge = new ItemGuage(this.CONFIGURATION.getItem("PipeGuage", ITEM_ID_PREFIX + 3).getInt());
|
|
itemTank = new ItemTank(this.CONFIGURATION.getItem("TankItem", ITEM_ID_PREFIX + 5).getInt());
|
|
|
|
// Liquid Registry
|
|
liquidSteam = LiquidDictionary.getOrCreateLiquid("Steam", new LiquidStack(blockSteamBlock, LiquidContainerRegistry.BUCKET_VOLUME));
|
|
CONFIGURATION.save();
|
|
|
|
proxy.preInit();
|
|
|
|
// block registry
|
|
GameRegistry.registerBlock(blockPipe, "Pipe");
|
|
GameRegistry.registerBlock(blockReleaseValve, ItemEValve.class, "Electric Valve");
|
|
GameRegistry.registerBlock(blockRod, "Mechanical Rod");
|
|
GameRegistry.registerBlock(blockGenerator, "Generator");
|
|
GameRegistry.registerBlock(blockMachine, ItemMachine.class, "Machines");
|
|
GameRegistry.registerBlock(blockSteamBlock, "Steam");
|
|
}
|
|
|
|
@Init
|
|
public void Init(FMLInitializationEvent event)
|
|
{
|
|
proxy.Init();
|
|
// TileEntities
|
|
GameRegistry.registerTileEntity(TileEntityPipe.class, "Pipe");
|
|
GameRegistry.registerTileEntity(TileEntityPump.class, "Pump");
|
|
GameRegistry.registerTileEntity(TileEntityRod.class, "Rod");
|
|
GameRegistry.registerTileEntity(TileEntityReleaseValve.class, "Valve");
|
|
GameRegistry.registerTileEntity(TileEntityTank.class, "Tank");
|
|
GameRegistry.registerTileEntity(TileEntityGenerator.class, "Generator");
|
|
|
|
// Liquid Item/Block common name writer
|
|
for (int i = 0; i < LiquidHandler.allowedLiquids.size() - 1; i++)
|
|
{
|
|
// eValves
|
|
LanguageRegistry.addName((new ItemStack(blockReleaseValve, 1, i)),LiquidData.getName(LiquidHandler.getFromMeta(i)) + " Release Valve");
|
|
// pipes
|
|
LanguageRegistry.addName((new ItemStack(itemPipes, 1, i)), LiquidData.getName(LiquidHandler.getFromMeta(i)) + " Pipe");
|
|
|
|
// Storage Tanks
|
|
LanguageRegistry.addName((new ItemStack(itemTank, 1, i)), LiquidData.getName(LiquidHandler.getFromMeta(i)) + " Tank");
|
|
}
|
|
|
|
for (int i = 0; i < ItemParts.Parts.values().length; i++)
|
|
{
|
|
// parts
|
|
LanguageRegistry.addName((new ItemStack(itemParts, 1, i)), ItemParts.Parts.values()[i].name);
|
|
}
|
|
|
|
// machines
|
|
LanguageRegistry.addName((new ItemStack(blockMachine, 1, 0)), "Pump");
|
|
LanguageRegistry.addName((new ItemStack(blockMachine, 1, 4)), "Water Condensor");
|
|
|
|
LanguageRegistry.addName((new ItemStack(blockGenerator, 1)), "Generator");
|
|
// mechanical rod
|
|
LanguageRegistry.addName((new ItemStack(blockRod, 1)), "Geared Rod");
|
|
// Tools
|
|
LanguageRegistry.addName((new ItemStack(itemGauge, 1, 0)), "Pipe Gauge");
|
|
}
|
|
|
|
@PostInit
|
|
public void PostInit(FMLPostInitializationEvent event)
|
|
{
|
|
proxy.postInit();
|
|
TabLiquidMechanics.setItemStack(new ItemStack(itemPipes, 1, 1));
|
|
// generator
|
|
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(this.blockGenerator, 1), new Object[] {
|
|
"@T@", "OVO", "@T@",
|
|
'T', new ItemStack(LiquidMechanics.blockRod, 1),
|
|
'@', "plateSteel",
|
|
'O', "basicCircuit",
|
|
'V', "motor" }));
|
|
// pipe gauge
|
|
GameRegistry.addRecipe(new ItemStack(this.itemGauge, 1, 0), new Object[] {
|
|
"TVT", " T ",
|
|
'V', new ItemStack(itemParts, 1, 7),
|
|
'T', new ItemStack(itemParts, 1, Parts.Iron.ordinal()) });
|
|
// iron tube
|
|
GameRegistry.addRecipe(new ItemStack(itemParts, 2, Parts.Iron.ordinal()), new Object[] {
|
|
"@@@",
|
|
'@', Item.ingotIron });
|
|
// bronze tube
|
|
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(itemParts, 2, Parts.Bronze.ordinal()), new Object[] {
|
|
"@@@",
|
|
'@', "ingotBronze" }));
|
|
// obby tube
|
|
GameRegistry.addRecipe(new ItemStack(itemParts, 2, Parts.Obby.ordinal()), new Object[] {
|
|
"@@@",
|
|
'@', Block.obsidian });
|
|
// nether tube
|
|
GameRegistry.addRecipe(new ItemStack(itemParts, 2, Parts.Nether.ordinal()), new Object[] {
|
|
"N@N",
|
|
'N', Block.netherrack,
|
|
'@', new ItemStack(itemParts, 2, Parts.Obby.ordinal()) });
|
|
// seal
|
|
GameRegistry.addRecipe(new ItemStack(itemParts, 2, Parts.Seal.ordinal()), new Object[] {
|
|
"@@", "@@",
|
|
'@', Item.leather });
|
|
// slime steal
|
|
GameRegistry.addShapelessRecipe(new ItemStack(itemParts, 1, Parts.SlimeSeal.ordinal()), new Object[] {
|
|
new ItemStack(itemParts, 1, Parts.Seal.ordinal()),
|
|
new ItemStack(Item.slimeBall, 1) });
|
|
// part valve
|
|
GameRegistry.addRecipe(new ItemStack(itemParts, 1, Parts.Valve.ordinal()), new Object[] {
|
|
"T@T",
|
|
'T', new ItemStack(itemParts, 1, Parts.Iron.ordinal()),
|
|
'@', Block.lever });
|
|
|
|
// unfinished tank
|
|
GameRegistry.addRecipe(new ItemStack(itemParts, 1, Parts.Tank.ordinal()), new Object[] {
|
|
" @ ", "@ @", " @ ",
|
|
'@', Item.ingotIron });
|
|
// mechanical rod
|
|
GameRegistry.addRecipe(new ItemStack(blockRod, 1), new Object[] {
|
|
"I@I",
|
|
'I', Item.ingotIron,
|
|
'@', new ItemStack(itemParts, 1, Parts.Iron.ordinal()) });
|
|
|
|
// steam pipe
|
|
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 0), new Object[] {
|
|
new ItemStack(itemParts, 1, Parts.Iron.ordinal()),
|
|
new ItemStack(itemParts, 1, Parts.Seal.ordinal()) });
|
|
// water pipe
|
|
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 1), new Object[] {
|
|
new ItemStack(itemParts, 1, Parts.Iron.ordinal()),
|
|
new ItemStack(itemParts, 1, Parts.Seal.ordinal()),
|
|
new ItemStack(Item.dyePowder, 1, 4) });
|
|
// lava pipe
|
|
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 2), new Object[] {
|
|
new ItemStack(itemParts, 1, Parts.Obby.ordinal()),
|
|
new ItemStack(Item.dyePowder, 1, 1) });
|
|
|
|
// steam tank
|
|
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 0), new Object[] {
|
|
new ItemStack(itemParts, 1, Parts.Tank.ordinal()),
|
|
new ItemStack(itemParts, 1, Parts.Seal.ordinal()),
|
|
new ItemStack(Item.dyePowder, 1, 15) });
|
|
// water tank
|
|
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 1), new Object[] {
|
|
new ItemStack(itemParts, 1, Parts.Tank.ordinal()),
|
|
new ItemStack(itemParts, 1, Parts.Seal.ordinal()),
|
|
new ItemStack(Item.dyePowder, 1, 4) });
|
|
// lava tank
|
|
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 2), new Object[] {
|
|
new ItemStack(itemParts, 1, Parts.Tank.ordinal()), Block.obsidian, Block.obsidian, Block.obsidian, Block.obsidian });
|
|
|
|
// pump
|
|
GameRegistry.addRecipe(new ItemStack(blockMachine, 1, 0), new Object[] {
|
|
"@T@", "BPB", "@P@",
|
|
'@', new ItemStack(Item.ingotIron, 2),
|
|
'B', new ItemStack(itemParts, 1, Parts.Valve.ordinal()),
|
|
'P', new ItemStack(Block.pistonBase),
|
|
'T', new ItemStack(itemParts, 1, Parts.Tank.ordinal()) });
|
|
|
|
// eVavles
|
|
for (int i = 0; i < LiquidHandler.allowedLiquids.size() - 1; i++)
|
|
{
|
|
GameRegistry.addRecipe(new ItemStack(blockMachine, 1, i), new Object[] {
|
|
" P ", "PVP", " P ",
|
|
'P', new ItemStack(itemPipes, 1, i),
|
|
'V', new ItemStack(itemParts, 1, Parts.Valve.ordinal()), });
|
|
}
|
|
|
|
|
|
|
|
//reg ore directory for parts
|
|
OreDictionary.registerOre("bronzeTube", new ItemStack(itemParts, 1, Parts.Bronze.ordinal()));
|
|
//add Default Liquids to current list, done last to let other mods use there liquid data first if used
|
|
LiquidHandler.addDefaultLiquids();
|
|
}
|
|
}
|