From 523627d76f2390ea0d23a70418c87077e40c3288 Mon Sep 17 00:00:00 2001
From: Rongmario <rongmario@gmail.com>
Date: Sun, 15 Aug 2021 16:33:16 +0100
Subject: [PATCH] No longer hardcode biomes for primitive water pump (#81)

- Now utilizes Forge's BiomeDictionary types

- Ocean/River => `Type.WATER` (1000)
- Swamp => `Type.SWAMP` and `Type.WET` (800)
- Jungle => `Type.JUNGLE` (350)
- Snow => `Type.SNOWY` (300)
- Plains/Forest => `Type.PLAINS` and `Type.FOREST` (250)
- Taiga => `Type.COLD` (175)
- Beach => `Type.BEACH` (170)
---
 .../MetaTileEntityPrimitiveWaterPump.java     | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveWaterPump.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveWaterPump.java
index 37b536dfa28..70e572ea29b 100644
--- a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveWaterPump.java
+++ b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPrimitiveWaterPump.java
@@ -24,11 +24,13 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.biome.*;
+import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.IFluidTank;
 
 import javax.annotation.Nonnull;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Predicate;
 
 public class MetaTileEntityPrimitiveWaterPump extends MultiblockControllerBase {
@@ -59,24 +61,23 @@ public void update() {
     }
 
     private static int getAmountForBiome(Biome biome) {
-        Class<? extends Biome> biomeClass = biome.getBiomeClass();
-        if (biomeClass == BiomeOcean.class || biomeClass == BiomeRiver.class) {
+        Set<BiomeDictionary.Type> biomeTypes = BiomeDictionary.getTypes(biome);
+        if (biomeTypes.contains(BiomeDictionary.Type.WATER)) {
             return 1000;
-        } else if (biomeClass == BiomeSwamp.class) {
+        } else if (biomeTypes.contains(BiomeDictionary.Type.SWAMP) || biomeTypes.contains(BiomeDictionary.Type.WET)) {
             return 800;
-        } else if (biomeClass == BiomeJungle.class) {
+        } else if (biomeTypes.contains(BiomeDictionary.Type.JUNGLE)) {
             return 350;
-        } else if (biomeClass == BiomeSnow.class) {
+        } else if (biomeTypes.contains(BiomeDictionary.Type.SNOWY)) {
             return 300;
-        } else if (biomeClass == BiomePlains.class || biomeClass == BiomeForest.class) {
+        } else if (biomeTypes.contains(BiomeDictionary.Type.PLAINS) || biomeTypes.contains(BiomeDictionary.Type.FOREST)) {
             return 250;
-        } else if (biomeClass == BiomeTaiga.class) {
+        } else if (biomeTypes.contains(BiomeDictionary.Type.COLD)) {
             return 175;
-        } else if (biomeClass == BiomeBeach.class) {
+        } else if (biomeTypes.contains(BiomeDictionary.Type.BEACH)) {
             return 170;
-        } else {
-            return 100;
         }
+        return 100;
     }
 
     @Override