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

Add a translation map for looking up legacy liquid names to convert

Browse source 
to new fluid names.
This commit is contained in:
cpw 2013-07-28 01:06:16 +02:00
parent 31bd8d438d
commit b317d10ade
2 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
common/net/minecraftforge/fluids/Fluid.java
View file

@ -2,6 +2,9 @@
package net.minecraftforge.fluids;
import java.util.Locale;
import java.util.Map;
import com.google.common.collect.Maps;
import net.minecraft.block.Block;
import net.minecraft.util.Icon;
@ -15,21 +18,21 @@ import cpw.mods.fml.relauncher.SideOnly;
/**
* Minecraft Forge Fluid Implementation
*
*
* This class is a fluid (liquid or gas) equivalent to "Item." It describes the nature of a fluid
* and contains its general properties.
*
*
* These properties do not have inherent gameplay mechanics - they are provided so that mods may
* choose to take advantage of them.
*
*
* Fluid implementations are not required to actively use these properties, nor are objects
* interfacing with fluids required to make use of them, but it is encouraged.
*
*
* The default values can be used as a reference point for mods adding fluids such as oil or heavy
* water.
*
*
* @author King Lemming
*
*
*/
public class Fluid
{
@ -45,7 +48,7 @@ public class Fluid
/**
* The light level emitted by this fluid.
*
*
* Default value is 0, as most fluids do not actively emit light.
*/
protected int luminosity = 0;
@ -53,7 +56,7 @@ public class Fluid
/**
* Density of the fluid - completely arbitrary; negative density indicates that the fluid is
* lighter than air.
*
*
* Default value is approximately the real-life density of water in kg/m^3.
*/
protected int density = 1000;
@ -61,23 +64,23 @@ public class Fluid
/**
* Viscosity ("thickness") of the fluid - completely arbitrary; negative values are not
* permissible.
*
*
* Default value is approximately the real-life density of water in m/s^2 (x10^-3).
*/
protected int viscosity = 1000;
/**
* This indicates if the fluid is gaseous.
*
*
* Useful for rendering the fluid in containers and the world.
*
*
* Generally this is associated with negative density fluids.
*/
protected boolean isGaseous;
/**
* If there is a Block implementation of the Fluid, the BlockID is linked here.
*
*
* The default value of -1 should remain for any Fluid without a Block implementation.
*/
protected int blockID = -1;
@ -263,4 +266,20 @@ public class Fluid
public boolean isGaseous(World world, int x, int y, int z){ return isGaseous(); }
public int getColor(World world, int x, int y, int z){ return getColor(); }
public Icon getIcon(World world, int x, int y, int z){ return getIcon(); }
private static Map<String, String> legacyNames = Maps.newHashMap();
static String convertLegacyName(String fluidName)
{
return fluidName != null && legacyNames.containsKey(fluidName) ? legacyNames.get(fluidName) : fluidName;
}
/**
* Register a legacy liquid name with the Fluids system
* @param legacyName The legacy name to recognize
* @param canonicalName The canonical fluid name it will become
*/
public static void registerLegacyName(String legacyName, String canonicalName)
{
legacyNames.put(legacyName.toLowerCase(Locale.ENGLISH), canonicalName);
}
}

2
common/net/minecraftforge/fluids/FluidStack.java
View file

@ -63,7 +63,9 @@ public class FluidStack
if (fluidName == null)
{
fluidName = nbt.hasKey("LiquidName") ? nbt.getString("LiquidName").toLowerCase(Locale.ENGLISH) : null;
fluidName = Fluid.convertLegacyName(fluidName);
}
if (fluidName ==null || FluidRegistry.getFluid(fluidName) == null)
{
return null;