diff --git a/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java b/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java
index 7b6378aba7b..b8c310ef798 100644
--- a/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java
+++ b/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java
@@ -14,6 +14,7 @@
 
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.Objects;
 
 public class BedrockFluidDepositDefinition implements IWorldgenDefinition {
 
@@ -160,29 +161,17 @@ public boolean equals(Object obj) {
             return false;
         if (!this.storedFluid.equals(objDeposit.getStoredFluid()))
             return false;
-        if ((this.assignedName == null && objDeposit.getAssignedName() != null) ||
-                (this.assignedName != null && objDeposit.getAssignedName() == null) ||
-                (this.assignedName != null && objDeposit.getAssignedName() != null &&
-                        !this.assignedName.equals(objDeposit.getAssignedName())))
+        if (!Objects.equals(this.assignedName, objDeposit.getAssignedName()))
             return false;
-        if ((this.description == null && objDeposit.getDescription() != null) ||
-                (this.description != null && objDeposit.getDescription() == null) ||
-                (this.description != null && objDeposit.getDescription() != null &&
-                        !this.description.equals(objDeposit.getDescription())))
+        if (!Objects.equals(this.description, objDeposit.getDescription())
             return false;
         if (this.depletedYield != objDeposit.getDepletedYield())
             return false;
-        if ((this.biomeWeightModifier == null && objDeposit.getBiomeWeightModifier() != null) ||
-                (this.biomeWeightModifier != null && objDeposit.getBiomeWeightModifier() == null) ||
-                (this.biomeWeightModifier != null && objDeposit.getBiomeWeightModifier() != null &&
-                        !this.biomeWeightModifier.equals(objDeposit.getBiomeWeightModifier())))
+        if (!Objects.equals(this.biomeWeightModifier, objDeposit.getBiomeWeightModifier())
             return false;
-        if ((this.dimensionFilter == null && objDeposit.getDimensionFilter() != null) ||
-                (this.dimensionFilter != null && objDeposit.getDimensionFilter() == null) ||
-                (this.dimensionFilter != null && objDeposit.getDimensionFilter() != null &&
-                        !this.dimensionFilter.equals(objDeposit.getDimensionFilter())))
+        if (!Objects.equals(this.dimensionFilter, objDeposit.getDimensionFilter())
             return false;
-
-        return super.equals(obj);
+        
+        return true;
     }
 }
diff --git a/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java b/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java
index 1792557ecd8..d51eea9bad6 100644
--- a/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java
+++ b/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java
@@ -15,6 +15,7 @@
 
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.Objects;
 
 public class OreDepositDefinition implements IWorldgenDefinition {
 
@@ -182,37 +183,19 @@ public boolean equals(Object obj) {
             return false;
         if (this.getMaximumHeight() != objDeposit.getMaximumHeight())
             return false;
-        if ((this.assignedName == null && objDeposit.getAssignedName() != null) ||
-                (this.assignedName != null && objDeposit.getAssignedName() == null) ||
-                (this.assignedName != null && objDeposit.getAssignedName() != null &&
-                        !this.assignedName.equals(objDeposit.getAssignedName())))
+        if (!Objects.equals(this.assignedName, objDeposit.getAssignedName()))
             return false;
-        if ((this.description == null && objDeposit.getDescription() != null) ||
-                (this.description != null && objDeposit.getDescription() == null) ||
-                (this.description != null && objDeposit.getDescription() != null &&
-                        !this.description.equals(objDeposit.getDescription())))
+        if (!Objects.equals(this.description, objDeposit.getDescription()))
             return false;
-        if ((this.biomeWeightModifier == null && objDeposit.getBiomeWeightModifier() != null) ||
-                (this.biomeWeightModifier != null && objDeposit.getBiomeWeightModifier() == null) ||
-                (this.biomeWeightModifier != null && objDeposit.getBiomeWeightModifier() != null &&
-                        !this.biomeWeightModifier.equals(objDeposit.getBiomeWeightModifier())))
+        if (!Objects.equals(this.biomeWeightModifier, objDeposit.getBiomeWeightModifier()))
             return false;
-        if ((this.dimensionFilter == null && objDeposit.getDimensionFilter() != null) ||
-                (this.dimensionFilter != null && objDeposit.getDimensionFilter() == null) ||
-                (this.dimensionFilter != null && objDeposit.getDimensionFilter() != null &&
-                        !this.dimensionFilter.equals(objDeposit.getDimensionFilter())))
+        if (!Objects.equals(this.dimensionFilter, objDeposit.getDimensionFilter()))
             return false;
-        if ((this.generationPredicate == null && objDeposit.getGenerationPredicate() != null) ||
-                (this.generationPredicate != null && objDeposit.getGenerationPredicate() == null) ||
-                (this.generationPredicate != null && objDeposit.getGenerationPredicate() != null &&
-                        !this.generationPredicate.equals(objDeposit.getGenerationPredicate())))
+        if (!Objects.equals(this.generationPredicate, objDeposit.getGenerationPredicate()))
             return false;
-        if ((this.veinPopulator == null && objDeposit.getVeinPopulator() != null) ||
-                (this.veinPopulator != null && objDeposit.getVeinPopulator() == null) ||
-                (this.veinPopulator != null && objDeposit.getVeinPopulator() != null &&
-                        !this.veinPopulator.equals(objDeposit.getVeinPopulator())))
+        if (!Objects.equals(this.veinPopulator, objDeposit.getVeinPopulator()))
             return false;
-
-        return super.equals(obj);
+        
+        return true;
     }
 }