From 8decd9a01488a6613c7aaece1f35296b1a5607f4 Mon Sep 17 00:00:00 2001 From: Liam Feehery Date: Tue, 2 Dec 2025 01:57:42 -0500 Subject: [PATCH 1/3] Fix equals method `super.equals(objDeposit)` in this case is the same as `this == objDeposit`. That must be wrong because: a) how it's used in other code b) this method would be redundant --- .../api/worldgen/config/BedrockFluidDepositDefinition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java b/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java index 7b6378aba7b..6c9a4102126 100644 --- a/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java +++ b/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java @@ -183,6 +183,6 @@ public boolean equals(Object obj) { !this.dimensionFilter.equals(objDeposit.getDimensionFilter()))) return false; - return super.equals(obj); + return true; } } From 9b854c1bf9b632514e49d5163e5229ce64c2b46d Mon Sep 17 00:00:00 2001 From: Liam Feehery Date: Tue, 2 Dec 2025 02:02:58 -0500 Subject: [PATCH 2/3] Refactor equality checks in BedrockFluidDepositDefinition Refactored to `Object.equals()` because it's more readable --- .../config/BedrockFluidDepositDefinition.java | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java b/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java index 6c9a4102126..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 true; } } From 88129a3a8f00b064a85ff9fd66760fbb5e1688a4 Mon Sep 17 00:00:00 2001 From: Liam Feehery Date: Tue, 2 Dec 2025 02:12:38 -0500 Subject: [PATCH 3/3] Fix OreDepositDefinition equals() The call to `super.equals()` is wrong (see 8decd9a). The `Objects.equals()` refactoring shouldn't have any side effects. --- .../worldgen/config/OreDepositDefinition.java | 35 +++++-------------- 1 file changed, 9 insertions(+), 26 deletions(-) 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; } }