From 7a968b622987448378d66c54e5898ec42228fdc8 Mon Sep 17 00:00:00 2001 From: ZtereoHYPE <57519662+ZtereoHYPE@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:20:14 +0100 Subject: [PATCH] change: name consisntency + better fallback seed --- .../codes/ztereohype/nicerskies/core/NebulaSeedManager.java | 6 ++---- .../codes/ztereohype/nicerskies/mixin/ClientLevelMixin.java | 1 - .../{MixinLightTexutre.java => LightTextureMixin.java} | 2 +- .../codes/ztereohype/nicerskies/mixin/MinecraftMixin.java | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) rename src/main/java/codes/ztereohype/nicerskies/mixin/{MixinLightTexutre.java => LightTextureMixin.java} (97%) diff --git a/src/main/java/codes/ztereohype/nicerskies/core/NebulaSeedManager.java b/src/main/java/codes/ztereohype/nicerskies/core/NebulaSeedManager.java index 22ccfbe..898d6f3 100644 --- a/src/main/java/codes/ztereohype/nicerskies/core/NebulaSeedManager.java +++ b/src/main/java/codes/ztereohype/nicerskies/core/NebulaSeedManager.java @@ -5,15 +5,13 @@ import net.minecraft.client.Minecraft; public class NebulaSeedManager { public static long getSeed() { - - // Use hashed seed. This is available in if (Minecraft.getInstance().level != null) { return ((IClientLevelAccessor) Minecraft.getInstance().level).nicerSkies_getHashedSeed(); } - return 0; + return 321L; // handpicked decent default ;) } - public static boolean canGetSeed() { + public static boolean canGenerateSky() { return Minecraft.getInstance().hasSingleplayerServer() || Minecraft.getInstance().getCurrentServer() != null; } } diff --git a/src/main/java/codes/ztereohype/nicerskies/mixin/ClientLevelMixin.java b/src/main/java/codes/ztereohype/nicerskies/mixin/ClientLevelMixin.java index 669563d..0d411e8 100644 --- a/src/main/java/codes/ztereohype/nicerskies/mixin/ClientLevelMixin.java +++ b/src/main/java/codes/ztereohype/nicerskies/mixin/ClientLevelMixin.java @@ -16,7 +16,6 @@ import java.util.function.Supplier; @Mixin(ClientLevel.class) public class ClientLevelMixin implements IClientLevelAccessor { - @Unique private long hashedSeed; diff --git a/src/main/java/codes/ztereohype/nicerskies/mixin/MixinLightTexutre.java b/src/main/java/codes/ztereohype/nicerskies/mixin/LightTextureMixin.java similarity index 97% rename from src/main/java/codes/ztereohype/nicerskies/mixin/MixinLightTexutre.java rename to src/main/java/codes/ztereohype/nicerskies/mixin/LightTextureMixin.java index a6b2da9..312f70f 100644 --- a/src/main/java/codes/ztereohype/nicerskies/mixin/MixinLightTexutre.java +++ b/src/main/java/codes/ztereohype/nicerskies/mixin/LightTextureMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; @Mixin(LightTexture.class) -public abstract class MixinLightTexutre { +public abstract class LightTextureMixin { @Inject( method = "updateLightTexture", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LightTexture;clampColor(Lorg/joml/Vector3f;)V", shift = At.Shift.BEFORE, ordinal = 2), diff --git a/src/main/java/codes/ztereohype/nicerskies/mixin/MinecraftMixin.java b/src/main/java/codes/ztereohype/nicerskies/mixin/MinecraftMixin.java index b40137b..2e66a47 100644 --- a/src/main/java/codes/ztereohype/nicerskies/mixin/MinecraftMixin.java +++ b/src/main/java/codes/ztereohype/nicerskies/mixin/MinecraftMixin.java @@ -12,6 +12,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class MinecraftMixin { @Inject(at = @At("TAIL"), method = "setLevel") private void onWorldLoad(CallbackInfo ci) { - NicerSkies.skyManager.generateSky(NebulaSeedManager.getSeed()); + NicerSkies.skyManager.generateSky(NebulaSeedManager.getSeed(), NicerSkies.config.getTwinklingStars(), NicerSkies.config.getNebulas()); } }