diff options
Diffstat (limited to 'src/main/java/gregtech/api/enums')
| -rw-r--r-- | src/main/java/gregtech/api/enums/FluidState.java | 9 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/FluidState.java b/src/main/java/gregtech/api/enums/FluidState.java index ad27047a1c..a6e81ab43d 100644 --- a/src/main/java/gregtech/api/enums/FluidState.java +++ b/src/main/java/gregtech/api/enums/FluidState.java @@ -6,5 +6,12 @@ public enum FluidState { MOLTEN, PLASMA, SLURRY; - public static final FluidState[] VALUES = new FluidState[] {SLURRY, LIQUID, GAS, PLASMA, MOLTEN}; + + public static final FluidState[] VALID_STATES = new FluidState[] {SLURRY, LIQUID, GAS, PLASMA, MOLTEN}; + + public static FluidState fromValue(int stateValue) { + return stateValue >= 0 && stateValue < FluidState.VALID_STATES.length + ? FluidState.VALID_STATES[stateValue] + : FluidState.LIQUID; + } } diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index b94a57d360..418116297d 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1566,8 +1566,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { RockSalt.setOreMultiplier(2).setSmeltingMultiplier(2); Scheelite.setOreMultiplier(2).setSmeltingMultiplier(2); Tungstate.setOreMultiplier(2).setSmeltingMultiplier(2); - Cassiterite.setOreMultiplier(6).setSmeltingMultiplier(2); - CassiteriteSand.setOreMultiplier(6).setSmeltingMultiplier(2); + Cassiterite.setOreMultiplier(2).setSmeltingMultiplier(2); + CassiteriteSand.setOreMultiplier(2).setSmeltingMultiplier(2); NetherQuartz.setOreMultiplier(2).setSmeltingMultiplier(2); CertusQuartz.setOreMultiplier(2).setSmeltingMultiplier(2); TricalciumPhosphate.setOreMultiplier(3).setSmeltingMultiplier(3); |