|
24 | 24 | import net.minecraft.entity.player.EntityPlayer; |
25 | 25 | import net.minecraft.util.ResourceLocation; |
26 | 26 | import net.minecraft.world.biome.*; |
| 27 | +import net.minecraftforge.common.BiomeDictionary; |
27 | 28 | import net.minecraftforge.fluids.FluidTank; |
28 | 29 | import net.minecraftforge.fluids.IFluidTank; |
29 | 30 |
|
30 | 31 | import javax.annotation.Nonnull; |
31 | 32 | import java.util.List; |
| 33 | +import java.util.Set; |
32 | 34 | import java.util.function.Predicate; |
33 | 35 |
|
34 | 36 | public class MetaTileEntityPrimitiveWaterPump extends MultiblockControllerBase { |
@@ -59,24 +61,23 @@ public void update() { |
59 | 61 | } |
60 | 62 |
|
61 | 63 | private static int getAmountForBiome(Biome biome) { |
62 | | - Class<? extends Biome> biomeClass = biome.getBiomeClass(); |
63 | | - if (biomeClass == BiomeOcean.class || biomeClass == BiomeRiver.class) { |
| 64 | + Set<BiomeDictionary.Type> biomeTypes = BiomeDictionary.getTypes(biome); |
| 65 | + if (biomeTypes.contains(BiomeDictionary.Type.WATER)) { |
64 | 66 | return 1000; |
65 | | - } else if (biomeClass == BiomeSwamp.class) { |
| 67 | + } else if (biomeTypes.contains(BiomeDictionary.Type.SWAMP) || biomeTypes.contains(BiomeDictionary.Type.WET)) { |
66 | 68 | return 800; |
67 | | - } else if (biomeClass == BiomeJungle.class) { |
| 69 | + } else if (biomeTypes.contains(BiomeDictionary.Type.JUNGLE)) { |
68 | 70 | return 350; |
69 | | - } else if (biomeClass == BiomeSnow.class) { |
| 71 | + } else if (biomeTypes.contains(BiomeDictionary.Type.SNOWY)) { |
70 | 72 | return 300; |
71 | | - } else if (biomeClass == BiomePlains.class || biomeClass == BiomeForest.class) { |
| 73 | + } else if (biomeTypes.contains(BiomeDictionary.Type.PLAINS) || biomeTypes.contains(BiomeDictionary.Type.FOREST)) { |
72 | 74 | return 250; |
73 | | - } else if (biomeClass == BiomeTaiga.class) { |
| 75 | + } else if (biomeTypes.contains(BiomeDictionary.Type.COLD)) { |
74 | 76 | return 175; |
75 | | - } else if (biomeClass == BiomeBeach.class) { |
| 77 | + } else if (biomeTypes.contains(BiomeDictionary.Type.BEACH)) { |
76 | 78 | return 170; |
77 | | - } else { |
78 | | - return 100; |
79 | 79 | } |
| 80 | + return 100; |
80 | 81 | } |
81 | 82 |
|
82 | 83 | @Override |
|
0 commit comments