version changes and cleanup

Going to copy Electrical Expantion a bit and add a similiar system for
version #s and info file management. This way version # match up better
between the 3+ things that use it.
This commit is contained in:
Rseifert 2013-04-10 02:13:41 -04:00
parent bf52947a57
commit d5572c63d4
5 changed files with 291 additions and 290 deletions

View file

@ -1,27 +0,0 @@
@ Fluid-Mechanics_v0.2.4.1.jar Fluid-Mechanics_v0.2.4.1_api.zip
@ Fluid-Mechanics_v0.2.4.2.jar Fluid-Mechanics_v0.2.4.2_api.zip
@ Fluid-Mechanics_v0.2.5.3.jar Fluid-Mechanics_v0.2.5.3_api.zip
@ Fluid-Mechanics_v0.2.5.4.jar Fluid-Mechanics_v0.2.5.4_api.zip
@ Fluid-Mechanics_v0.2.5.5.jar Fluid-Mechanics_v0.2.5.5_api.zip
x Fluid-Mechanics_v0.2.5.6.jar Fluid-Mechanics_v0.2.5.6_api.zip
@ Fluid-Mechanics_v0.2.5.7.jar Fluid-Mechanics_v0.2.5.7_api.zip
@ Fluid-Mechanics_v0.2.5.8.jar Fluid-Mechanics_v0.2.5.8_api.zip
@ Fluid-Mechanics_v0.2.5.9.jar Fluid-Mechanics_v0.2.5.9_api.zip
@ Fluid-Mechanics_v0.2.5.10.jar Fluid-Mechanics_v0.2.5.10_api.zip
@ Fluid-Mechanics_v0.2.5.11.jar Fluid-Mechanics_v0.2.5.11_api.zip
@ Fluid-Mechanics_v0.2.6.12.jar Fluid-Mechanics_v0.2.6.12_api.zip
@ Fluid-Mechanics_v0.2.6.13.jar Fluid-Mechanics_v0.2.6.13_api.zip
* Fluid-Mechanics_v0.2.6.14.jar Fluid-Mechanics_v0.2.6.14_api.zip
x Fluid-Mechanics_v0.2.7.15.jar Fluid-Mechanics_v0.2.7.15_api.zip
@ Fluid-Mechanics_v0.2.7.16.jar Fluid-Mechanics_v0.2.7.16_api.zip
@ Fluid-Mechanics_v0.2.7.17.jar Fluid-Mechanics_v0.2.7.17_api.zip
* Fluid-Mechanics_v0.2.7.18.jar Fluid-Mechanics_v0.2.7.18_api.zip
x Fluid-Mechanics_v0.2.7.19.jar Fluid-Mechanics_v0.2.7.19_api.zip
x Fluid-Mechanics_v0.2.7.20.jar Fluid-Mechanics_v0.2.7.20_api.zip
x Fluid-Mechanics_v0.2.7.21.jar hydraulic_v0.2.7.21_api.zip
@ Fluid-Mechanics_v0.2.7.22.jar hydraulic_v0.2.7.22_api.zip
@ Fluid-Mechanics_v0.2.8.23.jar hydraulic_v0.2.8.23_api.zip
* Fluid-Mechanics_v0.2.8.24.jar hydraulic_v0.2.8.24_api.zip
* Fluid-Mechanics_v0.2.8.25.jar hydraulic_v0.2.8.25_api.zip
* Fluid-Mechanics_v0.2.8.26.jar hydraulic_v0.2.8.26_api.zip
* Fluid-Mechanics_v0.2.8.27.jar hydraulic_v0.2.8.27_api.zip

View file

@ -1,3 +0,0 @@
@ Fluid-Mechanics_v0.3.0.30.jar hydraulic_v0.3.0.30_api.zip
@ Fluid-Mechanics_v0.3.0.31.jar hydraulic_v0.3.0.31_api.zip
x Fluid-Mechanics_v0.3.0.32.jar hydraulic_v0.3.0.32_api.zip

View file

@ -1,18 +0,0 @@
[
{
"modid" : "FluidMechanics",
"name" : "Fluid Mechanics",
"version" : "0.3.0",
"url" : "http://calclavia.com/universalelectricity/?m=18",
"credits" : "",
"authors": [
"Darkguardsman"
],
"description": "A basic fluid and mechanics support system for other mods to work off of",
"logoFile" : "/fm_logo.png",
"updateUrl" : "http://universalelectricity.com/?m=fluid_mechanics",
"parent" : "",
"screenshots": [
]
}
]

Binary file not shown.

View file

@ -31,6 +31,7 @@ import hydraulic.api.ColorCode;
import hydraulic.helpers.FluidHelper;
import java.io.File;
import java.util.Arrays;
import java.util.logging.Logger;
import net.minecraft.block.Block;
@ -55,8 +56,10 @@ 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.Metadata;
import cpw.mods.fml.common.Mod.PostInit;
import cpw.mods.fml.common.Mod.PreInit;
import cpw.mods.fml.common.ModMetadata;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
@ -70,35 +73,53 @@ import cpw.mods.fml.common.registry.GameRegistry;
* @author Rseifert
*/
@ModstatInfo(prefix = "MyPrefix")
@Mod(modid = FluidMech.NAME, name = FluidMech.NAME, version = FluidMech.VERSION, dependencies = "after:BasicComponents")
@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, dependencies = "after:BasicComponents", useMetadata = true)
@NetworkMod(channels = { FluidMech.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
public class FluidMech extends DummyModContainer
{
// TODO Change in Version Release
public static final String VERSION = "0.3.7";
// Constants
public static final String NAME = "Fluid_Mechanics";
// @Mod Prerequisites
public static final String MAJOR_VERSION = "@MAJOR@";
public static final String MINOR_VERSION = "@MINOR@";
public static final String REVIS_VERSION = "@REVIS@";
public static final String BUILD_VERSION = "@BUILD@";
// @Mod
public static final String MOD_ID = "Fluid_Mechanics";
public static final String MOD_NAME = "Fluid Mechanics";
public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVIS_VERSION + "." + BUILD_VERSION;
public static final String DEPENDENCIES = "after:UniversalElectricity;after:AtomicScience";
public static final boolean USE_METADATA = true;
// @NetworkMod
public static final boolean USES_CLIENT = true;
public static final boolean USES_SERVER = false;
public static final String CHANNEL = "FluidMech";
@Metadata(FluidMech.MOD_ID)
public static ModMetadata meta;
/* RESOURCE FILE PATHS */
public static final String RESOURCE_PATH = "/mods/fluidmech/";
public static final String TEXTURE_DIRECTORY = RESOURCE_PATH + "textures/";
public static final String GUI_DIRECTORY = TEXTURE_DIRECTORY + "gui/";
public static final String BLOCK_TEXTURE_DIRECTORY = TEXTURE_DIRECTORY + "blocks/";
public static final String ITEM_TEXTURE_DIRECTORY = TEXTURE_DIRECTORY + "items/";
public static final String MODEL_TEXTURE_DIRECTORY = TEXTURE_DIRECTORY + "models/";
public static final String TEXTURE_NAME_PREFIX = "fluidmech:";
public static final String LANGUAGE_PATH = RESOURCE_PATH + "languages/";
/* SUPPORTED LANGS */
private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US" };
public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir() + "/UniversalElectricity/", NAME + ".cfg"));
/* CONFIG FILE */
public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir() + "/UniversalElectricity/", FluidMech.MOD_NAME + ".cfg"));
/* START IDS */
public final static int BLOCK_ID_PREFIX = 3100;
public final static int ITEM_ID_PREFIX = 13200;
/* BLOCKS */
public static Block blockPipe;
public static Block blockTank;
public static Block blockMachine;
@ -108,35 +129,40 @@ public class FluidMech extends DummyModContainer
public static Block blockSink;
public static Block blockDrain;
public static Block blockConPump;
public static Block blockWasteLiquid;
public static LiquidStack liquidSteam;
/* ITEMS */
public static Item itemParts;
// public static Item itemPipes;
public static Item itemGauge;
@SidedProxy(clientSide = "fluidmech.client.ClientProxy", serverSide = "fluidmech.common.CommonProxy")
public static CommonProxy proxy;
@Instance(NAME)
@Instance(FluidMech.MOD_NAME)
public static FluidMech instance;
public static Logger FMLog = Logger.getLogger(NAME);
/* LOGGER - EXTENDS FORGE'S LOG SYSTEM */
public static Logger FMLog = Logger.getLogger(FluidMech.MOD_NAME);
@PreInit
public void preInit(FMLPreInitializationEvent event)
{
/* LOGGER SETUP */
FMLog.setParent(FMLLog.getLogger());
FMLog.info("Initializing...");
/* EVENT BUS */
MinecraftForge.EVENT_BUS.register(new FluidHelper());
instance = this;
/* UPDATE NOTIFIER */
Modstats.instance().getReporter().registerMod(this);
/* CONFIGS */
CONFIGURATION.load();
// Blocks
/* BLOCK DECLARATION -- CONFIG LOADER */
blockPipe = new BlockPipe(this.CONFIGURATION.getBlock("Pipes", BLOCK_ID_PREFIX).getInt());
blockMachine = new BlockPumpMachine(this.CONFIGURATION.getBlock("Machines", BLOCK_ID_PREFIX + 1).getInt());
blockRod = new BlockRod(this.CONFIGURATION.getBlock("Mechanical Rod", BLOCK_ID_PREFIX + 3).getInt());
@ -148,17 +174,15 @@ public class FluidMech extends DummyModContainer
blockDrain = new BlockDrain(this.CONFIGURATION.getBlock("Drain", BLOCK_ID_PREFIX + 9).getInt());
blockConPump = new BlockConstructionPump(this.CONFIGURATION.getBlock("ConstructionPump", BLOCK_ID_PREFIX + 10).getInt());
// Items
/* ITEM DECLARATION -- COFNGI LOADER */
itemParts = new ItemParts(this.CONFIGURATION.getItem("Parts", ITEM_ID_PREFIX).getInt());
// Valve item
itemGauge = new ItemTools(this.CONFIGURATION.getItem("PipeGuage", ITEM_ID_PREFIX + 3).getInt());
CONFIGURATION.save();
CONFIGURATION.save();/* CONFIG END */
proxy.preInit();
// block registry
/* BLOCK REGISTER CALLS */
GameRegistry.registerBlock(blockPipe, ItemBlockPipe.class, "lmPipe");
GameRegistry.registerBlock(blockReleaseValve, ItemBlockReleaseValve.class, "eValve");
GameRegistry.registerBlock(blockRod, "mechRod");
@ -174,9 +198,24 @@ public class FluidMech extends DummyModContainer
@Init
public void Init(FMLInitializationEvent event)
{
/* MCMOD.INFO FILE BUILDER? */
meta.modId = FluidMech.MOD_ID;
meta.name = FluidMech.MOD_NAME;
meta.description = "Simple liquid and mechanical handling support system. Adds pumps, pipes, tanks, and tools to work with liquids";
meta.url = "http://universalelectricity.com/?m=fluid_mechanics";
meta.logoFile = "/EELogo.png";
meta.version = FluidMech.VERSION;
meta.authorList = Arrays.asList(new String[] { "DarkGuardsman AKA DarkCow" });
meta.credits = "Please see the website.";
meta.autogenerated = false;
/* LOGGER */
FMLog.info("Loading...");
proxy.Init();
// TileEntities
/* TILE ENTITY REGISTER CALLS */
GameRegistry.registerTileEntity(TileEntityPipe.class, "lmPipeTile");
GameRegistry.registerTileEntity(TileEntityStarterPump.class, "lmPumpTile");
GameRegistry.registerTileEntity(TileEntityRod.class, "lmRodTile");
@ -186,29 +225,57 @@ public class FluidMech extends DummyModContainer
GameRegistry.registerTileEntity(TileEntitySink.class, "lmSink");
GameRegistry.registerTileEntity(TileEntityDrain.class, "lmDrain");
GameRegistry.registerTileEntity(TileEntityConstructionPump.class, "lmConPump");
// Pipe Extention TileEntities
GameRegistry.registerTileEntity(TileEntityPipeWindow.class, "lmPipeWindow");
/* LANG LOADING */
FMLog.info(" Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages.");
/* MOD CHECK */
if (!Loader.isModLoaded("BasicComponents"))
{
// FMLog.fine("");
}
/* ORE DIRECTORY REGISTER */
OreDictionary.registerOre("bronzeTube", new ItemStack(itemParts, 1, Parts.Bronze.ordinal()));
OreDictionary.registerOre("ironTube", new ItemStack(itemParts, 1, Parts.Iron.ordinal()));
OreDictionary.registerOre("netherTube", new ItemStack(itemParts, 1, Parts.Nether.ordinal()));
OreDictionary.registerOre("obbyTube", new ItemStack(itemParts, 1, Parts.Obby.ordinal()));
OreDictionary.registerOre("leatherSeal", new ItemStack(itemParts, 1, Parts.Seal.ordinal()));
OreDictionary.registerOre("leatherSlimeSeal", new ItemStack(itemParts, 1, Parts.SlimeSeal.ordinal()));
OreDictionary.registerOre("valvePart", new ItemStack(itemParts, 1, Parts.Valve.ordinal()));
OreDictionary.registerOre("bronzeTube", new ItemStack(itemParts, 1, Parts.Bronze.ordinal()));
OreDictionary.registerOre("unfinishedTank", new ItemStack(itemParts, 1, Parts.Tank.ordinal()));
/* LIQUID DIRECTORY CALL */
LiquidStack waste = LiquidDictionary.getOrCreateLiquid("Waste", new LiquidStack(FluidMech.blockWasteLiquid, 1));
}
@PostInit
public void PostInit(FMLPostInitializationEvent event)
{
/* LOGGER */
FMLog.info("Finalizing...");
proxy.postInit();
/* TAB ITEM SET */
TabFluidMech.setItemStack(new ItemStack(blockPipe, 1, 4));
/* RECIPES */
// generator
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(this.blockGenerator, 1), new Object[] {
"@T@", "OVO", "@T@",
"@T@",
"OVO",
"@T@",
'T', new ItemStack(FluidMech.blockRod, 1),
'@', "plateSteel",
'O', "basicCircuit",
'V', "motor" }));
// pipe gauge
GameRegistry.addRecipe(new ItemStack(this.itemGauge, 1, 0), new Object[] {
"TVT", " T ",
"TVT",
" T ",
'V', new ItemStack(itemParts, 1, Parts.Valve.ordinal()),
'T', new ItemStack(itemParts, 1, Parts.Iron.ordinal()) });
// iron tube
@ -230,12 +297,11 @@ public class FluidMech extends DummyModContainer
'@', new ItemStack(itemParts, 2, Parts.Obby.ordinal()) });
// seal
GameRegistry.addRecipe(new ItemStack(itemParts, 4, 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) });
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",
@ -244,7 +310,9 @@ public class FluidMech extends DummyModContainer
// 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[] {
@ -253,66 +321,55 @@ public class FluidMech extends DummyModContainer
'@', new ItemStack(itemParts, 1, Parts.Iron.ordinal()) });
// Iron Pipe
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 1, 15), new Object[] {
new ItemStack(itemParts, 1, Parts.Iron.ordinal()),
new ItemStack(itemParts, 1, Parts.Seal.ordinal()) });
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 1, 15), new Object[] { new ItemStack(itemParts, 1, Parts.Iron.ordinal()), new ItemStack(itemParts, 1, Parts.Seal.ordinal()) });
for (int it = 0; it < 15; it++)
{
if (it != ColorCode.WHITE.ordinal() && it != ColorCode.ORANGE.ordinal())
{
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 4, it), new Object[] {
new ItemStack(blockPipe, 1, 15),
new ItemStack(blockPipe, 1, 15),
new ItemStack(blockPipe, 1, 15),
new ItemStack(blockPipe, 1, 15),
new ItemStack(Item.dyePowder, 1, it) });
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 4, it), new Object[] { new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(Item.dyePowder, 1, it) });
}
}
// steam pipes
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 1, ColorCode.ORANGE.ordinal()), new Object[] {
new ItemStack(itemParts, 1, Parts.Bronze.ordinal()),
new ItemStack(itemParts, 1, Parts.Seal.ordinal()) });
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 1, ColorCode.ORANGE.ordinal()), new Object[] { new ItemStack(itemParts, 1, Parts.Bronze.ordinal()), new ItemStack(itemParts, 1, Parts.Seal.ordinal()) });
// milk pipes
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 4, ColorCode.WHITE.ordinal()), new Object[] {
new ItemStack(blockPipe, 1, 15),
new ItemStack(blockPipe, 1, 15),
new ItemStack(blockPipe, 1, 15),
new ItemStack(blockPipe, 1, 15),
new ItemStack(Item.dyePowder, 1, 15) });
// steam tank
GameRegistry.addShapelessRecipe(new ItemStack(blockTank, 1, ColorCode.ORANGE.ordinal()), new Object[] {
new ItemStack(itemParts, 1, Parts.Tank.ordinal()),
new ItemStack(itemParts, 1, Parts.Seal.ordinal()),
new ItemStack(itemParts, 1, Parts.Bronze.ordinal()),
new ItemStack(itemParts, 1, Parts.Bronze.ordinal()) });
GameRegistry.addShapelessRecipe(new ItemStack(blockPipe, 4, ColorCode.WHITE.ordinal()), new Object[] { new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(blockPipe, 1, 15), new ItemStack(Item.dyePowder, 1, 15) });
// lava tank
GameRegistry.addRecipe(new ItemStack(blockTank, 1, ColorCode.RED.ordinal()), new Object[] {
"N@N", "@ @", "N@N",
"N@N",
"@ @",
"N@N",
'T', new ItemStack(itemParts, 1, Parts.Tank.ordinal()),
'@', Block.obsidian,
'N', Block.netherrack });
'@', Block.obsidian, 'N', Block.netherrack });
// water tank
GameRegistry.addRecipe(new ItemStack(blockTank, 1, ColorCode.BLUE.ordinal()), new Object[] {
"@G@", "STS", "@G@",
"@G@",
"STS",
"@G@",
'T', new ItemStack(itemParts, 1, Parts.Tank.ordinal()),
'@', Block.planks,
'G', Block.glass,
'S', new ItemStack(itemParts, 1, Parts.Seal.ordinal()) });
// milk tank
GameRegistry.addRecipe(new ItemStack(blockTank, 1, ColorCode.WHITE.ordinal()), new Object[] {
"W@W", "WTW", "W@W",
"W@W",
"WTW",
"W@W",
'T', new ItemStack(itemParts, 1, Parts.Tank.ordinal()),
'@', Block.stone,
'W', Block.planks });
// generic Tank
GameRegistry.addRecipe(new ItemStack(blockTank, 1, ColorCode.NONE.ordinal()), new Object[] {
"@@@", "@T@", "@@@",
"@@@",
"@T@",
"@@@",
'T', new ItemStack(itemParts, 1, Parts.Tank.ordinal()),
'@', Block.stone });
// pump
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(blockMachine, 1, 0), new Object[] {
"C@C", "BMB", "@X@",
"C@C",
"BMB",
"@X@",
'@', "plateSteel",
'X', new ItemStack(blockPipe, 1, ColorCode.NONE.ordinal()),
'B', new ItemStack(itemParts, 1, Parts.Valve.ordinal()),
@ -321,30 +378,22 @@ public class FluidMech extends DummyModContainer
// release valve
GameRegistry.addRecipe(new ItemStack(blockReleaseValve, 1), new Object[] {
"RPR", "PVP", "RPR",
"RPR",
"PVP",
"RPR",
'P', new ItemStack(blockPipe, 1, 15),
'V', new ItemStack(itemParts, 1, Parts.Valve.ordinal()),
'R', Item.redstone });
// sink
GameRegistry.addRecipe(new ItemStack(blockSink, 1), new Object[] {
"I I", "SIS", "SPS",
"I I",
"SIS",
"SPS",
'P', new ItemStack(blockPipe, 1, 15),
'I', Item.ingotIron,
'S', Block.stone });
// reg ore directory for parts
OreDictionary.registerOre("bronzeTube", new ItemStack(itemParts, 1, Parts.Bronze.ordinal()));
OreDictionary.registerOre("ironTube", new ItemStack(itemParts, 1, Parts.Iron.ordinal()));
OreDictionary.registerOre("netherTube", new ItemStack(itemParts, 1, Parts.Nether.ordinal()));
OreDictionary.registerOre("obbyTube", new ItemStack(itemParts, 1, Parts.Obby.ordinal()));
OreDictionary.registerOre("leatherSeal", new ItemStack(itemParts, 1, Parts.Seal.ordinal()));
OreDictionary.registerOre("leatherSlimeSeal", new ItemStack(itemParts, 1, Parts.SlimeSeal.ordinal()));
OreDictionary.registerOre("valvePart", new ItemStack(itemParts, 1, Parts.Valve.ordinal()));
OreDictionary.registerOre("bronzeTube", new ItemStack(itemParts, 1, Parts.Bronze.ordinal()));
OreDictionary.registerOre("unfinishedTank", new ItemStack(itemParts, 1, Parts.Tank.ordinal()));
// add Default Liquids to current list, done last to let other mods use
// there liquid data first if used
LiquidStack waste = LiquidDictionary.getOrCreateLiquid("Waste", new LiquidStack(FluidMech.blockWasteLiquid, 1));
FMLog.info("Done Loading");
}
}