From 58a5449c2f5222557ea5057badac69251b0bba63 Mon Sep 17 00:00:00 2001 From: Joseph B Date: Tue, 28 Jun 2022 00:01:01 -0400 Subject: [PATCH] Add getter for correct BiomeSpecialEffectsBuilder to BiomeInfo$Builder (#8781) --- .../common/world/ModifiableBiomeInfo.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/world/ModifiableBiomeInfo.java b/src/main/java/net/minecraftforge/common/world/ModifiableBiomeInfo.java index 2a2f9ea5c3..701598400e 100644 --- a/src/main/java/net/minecraftforge/common/world/ModifiableBiomeInfo.java +++ b/src/main/java/net/minecraftforge/common/world/ModifiableBiomeInfo.java @@ -106,7 +106,7 @@ public class ModifiableBiomeInfo public static class Builder { private ClimateSettingsBuilder climateSettings; - private BiomeSpecialEffects.Builder effects; + private BiomeSpecialEffectsBuilder effects; private BiomeGenerationSettingsBuilder generationSettings; private MobSpawnSettingsBuilder mobSpawnSettings; @@ -117,7 +117,7 @@ public class ModifiableBiomeInfo public static Builder copyOf(final BiomeInfo original) { final ClimateSettingsBuilder climateBuilder = ClimateSettingsBuilder.copyOf(original.climateSettings()); - final BiomeSpecialEffects.Builder effectsBuilder = BiomeSpecialEffectsBuilder.copyOf(original.effects()); + final BiomeSpecialEffectsBuilder effectsBuilder = BiomeSpecialEffectsBuilder.copyOf(original.effects()); final BiomeGenerationSettingsBuilder generationBuilder = new BiomeGenerationSettingsBuilder(original.generationSettings()); final MobSpawnSettingsBuilder mobSpawnBuilder = new MobSpawnSettingsBuilder(original.mobSpawnSettings()); @@ -129,7 +129,7 @@ public class ModifiableBiomeInfo ); } - private Builder(final ClimateSettingsBuilder climateSettings, final BiomeSpecialEffects.Builder effects, final BiomeGenerationSettingsBuilder generationSettings, final MobSpawnSettingsBuilder mobSpawnSettings) + private Builder(final ClimateSettingsBuilder climateSettings, final BiomeSpecialEffectsBuilder effects, final BiomeGenerationSettingsBuilder generationSettings, final MobSpawnSettingsBuilder mobSpawnSettings) { this.climateSettings = climateSettings; this.effects = effects; @@ -147,11 +147,22 @@ public class ModifiableBiomeInfo return climateSettings; } + /** + * {@return Builder for client special effects} + * + * @deprecated Use {@link #getSpecialEffects()} as it provides read access. TODO remove this by 1.20 + */ + @Deprecated(forRemoval=true, since="1.19") public BiomeSpecialEffects.Builder getEffects() { return effects; } + public BiomeSpecialEffectsBuilder getSpecialEffects() + { + return effects; + } + public BiomeGenerationSettingsBuilder getGenerationSettings() { return generationSettings;