From 8bfe699f1aaa4090b8ab2bf70104a91b2d7c859f Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 9 Dec 2022 17:36:17 +0100 Subject: [PATCH] [Changes] Numeric Providers have their own setup class now --- .../java/org/betterx/betterend/BetterEnd.java | 1 + .../registry/EndNumericProviders.java | 38 +++++++++++++++++++ .../world/surface/SplitNoiseCondition.java | 6 +-- .../SulphuricSurfaceNoiseCondition.java | 15 -------- .../surface/UmbraSurfaceNoiseCondition.java | 10 ----- 5 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 src/main/java/org/betterx/betterend/registry/EndNumericProviders.java diff --git a/src/main/java/org/betterx/betterend/BetterEnd.java b/src/main/java/org/betterx/betterend/BetterEnd.java index 62da2d78..9c352f28 100644 --- a/src/main/java/org/betterx/betterend/BetterEnd.java +++ b/src/main/java/org/betterx/betterend/BetterEnd.java @@ -33,6 +33,7 @@ public class BetterEnd implements ModInitializer { @Override public void onInitialize() { WorldConfig.registerModCache(MOD_ID); + EndNumericProviders.register(); EndPortals.loadPortals(); EndSounds.register(); EndMenuTypes.ensureStaticallyLoaded(); diff --git a/src/main/java/org/betterx/betterend/registry/EndNumericProviders.java b/src/main/java/org/betterx/betterend/registry/EndNumericProviders.java new file mode 100644 index 00000000..c11a1dec --- /dev/null +++ b/src/main/java/org/betterx/betterend/registry/EndNumericProviders.java @@ -0,0 +1,38 @@ +package org.betterx.betterend.registry; + +import org.betterx.bclib.interfaces.NumericProvider; +import org.betterx.betterend.BetterEnd; +import org.betterx.betterend.world.surface.SplitNoiseCondition; +import org.betterx.betterend.world.surface.SulphuricSurfaceNoiseCondition; +import org.betterx.betterend.world.surface.UmbraSurfaceNoiseCondition; +import org.betterx.betterend.world.surface.VerticalBandNoiseCondition; + +import net.minecraft.core.Registry; + +public class EndNumericProviders { + public static void register() { + Registry.register( + NumericProvider.NUMERIC_PROVIDER, + BetterEnd.makeID("sulphuric_surf"), + SulphuricSurfaceNoiseCondition.CODEC + ); + + Registry.register( + NumericProvider.NUMERIC_PROVIDER, + BetterEnd.makeID("vertical_band"), + VerticalBandNoiseCondition.CODEC + ); + + Registry.register( + NumericProvider.NUMERIC_PROVIDER, + BetterEnd.makeID("split_noise"), + SplitNoiseCondition.CODEC + ); + + Registry.register( + NumericProvider.NUMERIC_PROVIDER, + BetterEnd.makeID("umbra_srf"), + UmbraSurfaceNoiseCondition.CODEC + ); + } +} diff --git a/src/main/java/org/betterx/betterend/world/surface/SplitNoiseCondition.java b/src/main/java/org/betterx/betterend/world/surface/SplitNoiseCondition.java index c70f935f..c14c2b93 100644 --- a/src/main/java/org/betterx/betterend/world/surface/SplitNoiseCondition.java +++ b/src/main/java/org/betterx/betterend/world/surface/SplitNoiseCondition.java @@ -3,11 +3,9 @@ package org.betterx.betterend.world.surface; import org.betterx.bclib.interfaces.NumericProvider; import org.betterx.bclib.mixin.common.SurfaceRulesContextAccessor; import org.betterx.bclib.util.MHelper; -import org.betterx.betterend.BetterEnd; import org.betterx.betterend.noise.OpenSimplexNoise; import com.mojang.serialization.Codec; -import net.minecraft.core.Registry; /** * Noise source that returns a value in [0, 1] @@ -43,7 +41,5 @@ public class SplitNoiseCondition implements NumericProvider { return CODEC; } - static { - Registry.register(NumericProvider.NUMERIC_PROVIDER, BetterEnd.makeID("split_noise"), SplitNoiseCondition.CODEC); - } + } diff --git a/src/main/java/org/betterx/betterend/world/surface/SulphuricSurfaceNoiseCondition.java b/src/main/java/org/betterx/betterend/world/surface/SulphuricSurfaceNoiseCondition.java index 9e2df76e..7c44cccc 100644 --- a/src/main/java/org/betterx/betterend/world/surface/SulphuricSurfaceNoiseCondition.java +++ b/src/main/java/org/betterx/betterend/world/surface/SulphuricSurfaceNoiseCondition.java @@ -3,11 +3,9 @@ package org.betterx.betterend.world.surface; import org.betterx.bclib.interfaces.NumericProvider; import org.betterx.bclib.mixin.common.SurfaceRulesContextAccessor; import org.betterx.bclib.util.MHelper; -import org.betterx.betterend.BetterEnd; import org.betterx.betterend.noise.OpenSimplexNoise; import com.mojang.serialization.Codec; -import net.minecraft.core.Registry; /** * Noise source that returns a value in [0, 3] @@ -43,17 +41,4 @@ public class SulphuricSurfaceNoiseCondition implements NumericProvider { return CODEC; } - static { - Registry.register( - NumericProvider.NUMERIC_PROVIDER, - BetterEnd.makeID("sulphuric_surf"), - SulphuricSurfaceNoiseCondition.CODEC - ); - - Registry.register( - NumericProvider.NUMERIC_PROVIDER, - BetterEnd.makeID("vertical_band"), - VerticalBandNoiseCondition.CODEC - ); - } } diff --git a/src/main/java/org/betterx/betterend/world/surface/UmbraSurfaceNoiseCondition.java b/src/main/java/org/betterx/betterend/world/surface/UmbraSurfaceNoiseCondition.java index bfcadd86..8eff78dd 100644 --- a/src/main/java/org/betterx/betterend/world/surface/UmbraSurfaceNoiseCondition.java +++ b/src/main/java/org/betterx/betterend/world/surface/UmbraSurfaceNoiseCondition.java @@ -3,11 +3,9 @@ package org.betterx.betterend.world.surface; import org.betterx.bclib.interfaces.NumericProvider; import org.betterx.bclib.mixin.common.SurfaceRulesContextAccessor; import org.betterx.bclib.util.MHelper; -import org.betterx.betterend.BetterEnd; import org.betterx.betterend.noise.OpenSimplexNoise; import com.mojang.serialization.Codec; -import net.minecraft.core.Registry; /** * Noise source that returns a value in [0, 4] @@ -47,12 +45,4 @@ public class UmbraSurfaceNoiseCondition implements NumericProvider { public Codec pcodec() { return CODEC; } - - static { - Registry.register( - NumericProvider.NUMERIC_PROVIDER, - BetterEnd.makeID("umbra_srf"), - UmbraSurfaceNoiseCondition.CODEC - ); - } }