build 16
This commit is contained in:
parent
6c1b16c5f4
commit
17698f7fda
3 changed files with 31 additions and 29 deletions
|
@ -1 +1 @@
|
||||||
15
|
16
|
||||||
|
|
1
info.txt
1
info.txt
|
@ -13,3 +13,4 @@ x Fluid-Mechanics_v0.2.5.6.jar Fluid-Mechanics_v0.2.5.6_api.zip
|
||||||
@ Fluid-Mechanics_v0.2.6.13.jar Fluid-Mechanics_v0.2.6.13_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
|
* 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
|
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
|
||||||
|
|
|
@ -33,7 +33,7 @@ public class LiquidHandler
|
||||||
*/
|
*/
|
||||||
public static void addDefaultLiquids()
|
public static void addDefaultLiquids()
|
||||||
{
|
{
|
||||||
FMLog.setParent(FMLLog.getLogger());
|
FMLog.setParent(FMLLog.getLogger());
|
||||||
water = new LiquidData("water", LiquidDictionary.getOrCreateLiquid("Water", new LiquidStack(Block.waterStill, 1)), ColorCode.BLUE, false, 60);
|
water = new LiquidData("water", LiquidDictionary.getOrCreateLiquid("Water", new LiquidStack(Block.waterStill, 1)), ColorCode.BLUE, false, 60);
|
||||||
allowedLiquids.add(water);
|
allowedLiquids.add(water);
|
||||||
|
|
||||||
|
@ -43,9 +43,9 @@ public class LiquidHandler
|
||||||
unkown = new LiquidData("Unknown", LiquidDictionary.getOrCreateLiquid("Unknown", new LiquidStack(20, 1)), ColorCode.NONE, false, 32);
|
unkown = new LiquidData("Unknown", LiquidDictionary.getOrCreateLiquid("Unknown", new LiquidStack(20, 1)), ColorCode.NONE, false, 32);
|
||||||
allowedLiquids.add(unkown);
|
allowedLiquids.add(unkown);
|
||||||
|
|
||||||
for(LiquidData data : allowedLiquids)
|
for (LiquidData data : allowedLiquids)
|
||||||
{
|
{
|
||||||
FMLog.info(data.getName() + " registered as a liquid");
|
FMLog.info(data.getName() + " registered as a liquid");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -55,8 +55,8 @@ public class LiquidHandler
|
||||||
{
|
{
|
||||||
// TODO use this to add new liquid types to the data list
|
// TODO use this to add new liquid types to the data list
|
||||||
// or something along the lines of IDing liquids for use
|
// or something along the lines of IDing liquids for use
|
||||||
FMLog.info("LiquidRegistered: "+event.Name);
|
FMLog.info("LiquidRegistered: " + event.Name);
|
||||||
FMLog.setParent(FMLLog.getLogger());
|
FMLog.setParent(FMLLog.getLogger());
|
||||||
if (event.Name.equalsIgnoreCase("methane"))
|
if (event.Name.equalsIgnoreCase("methane"))
|
||||||
{
|
{
|
||||||
allowedLiquids.add(new LiquidData("methane", event.Liquid, ColorCode.LIME, true, 100));
|
allowedLiquids.add(new LiquidData("methane", event.Liquid, ColorCode.LIME, true, 100));
|
||||||
|
@ -72,11 +72,13 @@ public class LiquidHandler
|
||||||
else if (event.Name.equalsIgnoreCase("steam"))
|
else if (event.Name.equalsIgnoreCase("steam"))
|
||||||
{
|
{
|
||||||
steam = new LiquidData("steam", event.Liquid, ColorCode.ORANGE, true, 100);
|
steam = new LiquidData("steam", event.Liquid, ColorCode.ORANGE, true, 100);
|
||||||
}else if(event.Name.equalsIgnoreCase("Waste"))
|
}
|
||||||
|
else if (event.Name.equalsIgnoreCase("Waste"))
|
||||||
{
|
{
|
||||||
waste = new LiquidData("Waste", event.Liquid, ColorCode.BROWN, false, 40);
|
waste = new LiquidData("Waste", event.Liquid, ColorCode.BROWN, false, 40);
|
||||||
allowedLiquids.add(waste);
|
allowedLiquids.add(waste);
|
||||||
}else if(event.Name.equalsIgnoreCase("Milk"))
|
}
|
||||||
|
else if (event.Name.equalsIgnoreCase("Milk"))
|
||||||
{
|
{
|
||||||
milk = new LiquidData("Milk", event.Liquid, ColorCode.WHITE, false, 50);
|
milk = new LiquidData("Milk", event.Liquid, ColorCode.WHITE, false, 50);
|
||||||
allowedLiquids.add(milk);
|
allowedLiquids.add(milk);
|
||||||
|
@ -107,29 +109,29 @@ public class LiquidHandler
|
||||||
}
|
}
|
||||||
return unkown;
|
return unkown;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gets the name of the liquidStack using either LiquidData or
|
* gets the name of the liquidStack using either LiquidData or running threw
|
||||||
* running threw the LiquidDirectory mapping
|
* the LiquidDirectory mapping
|
||||||
*/
|
*/
|
||||||
public static String getName(LiquidStack stack)
|
public static String getName(LiquidStack stack)
|
||||||
{
|
{
|
||||||
if(get(stack) != unkown)
|
if (get(stack) != unkown)
|
||||||
{
|
{
|
||||||
return get(stack).getName();
|
return get(stack).getName();
|
||||||
}else
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
Map<String, LiquidStack> l = LiquidDictionary.getLiquids();
|
Map<String, LiquidStack> l = LiquidDictionary.getLiquids();
|
||||||
for(Entry<String, LiquidStack> liquid : l.entrySet())
|
for (Entry<String, LiquidStack> liquid : l.entrySet())
|
||||||
{
|
{
|
||||||
LiquidStack t = liquid.getValue();
|
LiquidStack t = liquid.getValue();
|
||||||
if(isEqual(t,stack))
|
if (isEqual(t, stack)) { return liquid.getKey(); }
|
||||||
{
|
|
||||||
return liquid.getKey();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return "unkown";
|
return "unkown";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* creates a new LiquidStack using type and vol
|
* creates a new LiquidStack using type and vol
|
||||||
*/
|
*/
|
||||||
|
@ -138,20 +140,19 @@ public class LiquidHandler
|
||||||
if (type == null) return null;
|
if (type == null) return null;
|
||||||
return new LiquidStack(type.getStack().itemID, vol, type.getStack().itemMeta);
|
return new LiquidStack(type.getStack().itemID, vol, type.getStack().itemMeta);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* creates a new LiquidStack using a liquidStack and vol
|
* creates a new LiquidStack using a liquidStack and vol
|
||||||
*/
|
*/
|
||||||
public static LiquidStack getStack(LiquidStack stack, int vol)
|
public static LiquidStack getStack(LiquidStack stack, int vol)
|
||||||
{
|
{
|
||||||
if(stack == null){return null;}
|
if (stack == null) { return null; }
|
||||||
return new LiquidStack(stack.itemID,vol,stack.itemMeta);
|
return new LiquidStack(stack.itemID, vol, stack.itemMeta);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMeta(LiquidData stack)
|
public static int getMeta(LiquidData stack)
|
||||||
{
|
{
|
||||||
if(stack != null && stack != unkown)
|
if (stack != null && stack != unkown) { return stack.getColor().ordinal(); }
|
||||||
{
|
|
||||||
return stack.getColor().ordinal();
|
|
||||||
}
|
|
||||||
return 15;
|
return 15;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue