keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix up some liquid logic

This commit is contained in:
Christian 2013-03-28 08:04:56 -04:00
parent 41ed59f424
commit a7108bc2ff
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/net/minecraftforge/liquids/LiquidDictionary.java
View File

@ -34,6 +34,10 @@ public abstract class LiquidDictionary
*/
public static LiquidStack getOrCreateLiquid(String name, LiquidStack liquid)
{
if (liquid == null)
{
throw new NullPointerException("You cannot register a null LiquidStack");
}
LiquidStack existing = liquids.get(name);
if(existing != null) {
return existing.copy();

13
common/net/minecraftforge/liquids/LiquidStack.java
View File

@ -38,8 +38,8 @@ public class LiquidStack
public NBTTagCompound writeToNBT(NBTTagCompound nbt)
{
nbt.setShort("Id", (short)itemID);
nbt.setInteger("Amount", amount);
nbt.setShort("Id", (short)itemID);
nbt.setShort("Meta", (short)itemMeta);
nbt.setString("LiquidName", LiquidDictionary.findLiquidName(this));
return nbt;
@ -50,13 +50,10 @@ public class LiquidStack
String liquidName = nbt.getString("LiquidName");
itemID = nbt.getShort("Id");
itemMeta = nbt.getShort("Meta");
if (liquidName != null)
{
LiquidStack liquid = LiquidDictionary.getCanonicalLiquid(liquidName);
if(liquid != null) {
itemID = liquid.itemID;
itemMeta = liquid.itemMeta;
}
LiquidStack liquid = LiquidDictionary.getCanonicalLiquid(liquidName);
if(liquid != null) {
itemID = liquid.itemID;
itemMeta = liquid.itemMeta;
}
amount = nbt.getInteger("Amount");
}