Added option for disabling cloud rendering

FabiPunktExe · FabiPunktExe · commit d11cc9272d22 · 2023-06-10T08:32:27.000+02:00
diff --git a/simpleclient-1.19.4/src/main/java/simpleclient/feature/PerformanceBoost.java b/simpleclient-1.19.4/src/main/java/simpleclient/feature/PerformanceBoost.java
@@ -1,15 +1,37 @@
 package simpleclient.feature;
 
+import com.google.gson.JsonObject;
+import net.minecraft.network.chat.Component;
+import simpleclient.feature.config.EnableConfigEntry;
+
 public class PerformanceBoost extends EnableableFeature {
-    public static PerformanceBoost INSTANCE = new PerformanceBoost();
-    public static boolean ENABLED = INSTANCE.isEnabled();
+    public static boolean ENABLED = false;
+    public static boolean FASTBOOT = false;
+    public static boolean DONT_RENDER_CLOUDS = false;
+    public static boolean DONT_RENDER_SKY_UNDER_WATER = false;
+    private final EnableConfigEntry fastBoot = new EnableConfigEntry("fastboot", Component.translatable("simpleclient.performance.fastboot"), true);
+    private final EnableConfigEntry dontRenderCouds = new EnableConfigEntry("dont_render_clouds", Component.translatable("simpleclient.performance.dont_render_clouds"), true);
+    private final EnableConfigEntry dontRenderSkyUnderWater = new EnableConfigEntry("dont_render_sky_under_water", Component.translatable("simpleclient.performance.dont_render_sky_under_water"), true);
+
     public PerformanceBoost() {
         super(FeatureType.PERFORMANCE_BOOST);
+        addConfigEntry(fastBoot);
+        addConfigEntry(dontRenderCouds);
+        addConfigEntry(dontRenderSkyUnderWater);
+        refresh();
+    }
+
+    public void refresh() {
+        ENABLED = isEnabled();
+        JsonObject data = getData();
+        FASTBOOT = ENABLED && fastBoot.load(data);
+        DONT_RENDER_CLOUDS = ENABLED && dontRenderCouds.load(data);
+        DONT_RENDER_SKY_UNDER_WATER = ENABLED && dontRenderSkyUnderWater.load(data);
     }
 
     @Override
-    public void setEnabled(boolean enabled) {
-        super.setEnabled(enabled);
-        ENABLED = enabled;
+    public void setData(JsonObject data) {
+        super.setData(data);
+        refresh();
     }
 }
diff --git a/simpleclient-1.19.4/src/main/java/simpleclient/mixin/performance/LevelRendererMixin.java b/simpleclient-1.19.4/src/main/java/simpleclient/mixin/performance/LevelRendererMixin.java
@@ -16,6 +16,6 @@ public class LevelRendererMixin {
     // +10% FPS under water
     @Inject(at = @At("HEAD"), method = "renderSky", cancellable = true)
     private void renderSky(PoseStack poseStack, Matrix4f matrix4f, float tickDelta, Camera camera, boolean bl, Runnable runnable, CallbackInfo ci) {
-        if (PerformanceBoost.ENABLED && camera.getFluidInCamera() != FogType.WATER) ci.cancel();
+        if (PerformanceBoost.DONT_RENDER_SKY_UNDER_WATER && camera.getFluidInCamera() != FogType.NONE) ci.cancel();
     }
 }
diff --git a/simpleclient-1.19.4/src/main/java/simpleclient/mixin/performance/OptionsMixin.java b/simpleclient-1.19.4/src/main/java/simpleclient/mixin/performance/OptionsMixin.java
@@ -0,0 +1,18 @@
+package simpleclient.mixin.performance;
+
+import net.minecraft.client.CloudStatus;
+import net.minecraft.client.Options;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import simpleclient.feature.PerformanceBoost;
+
+@Mixin(Options.class)
+public class OptionsMixin {
+    // +20% FPS
+    @Inject(at = @At("HEAD"), method = "getCloudsType", cancellable = true)
+    private void getCloudsType(CallbackInfoReturnable<CloudStatus> cir) {
+        if (PerformanceBoost.DONT_RENDER_CLOUDS) cir.setReturnValue(CloudStatus.OFF);
+    }
+}
diff --git a/simpleclient-1.19.4/src/main/java/simpleclient/mixin/performance/SharedConstantsMixin.java b/simpleclient-1.19.4/src/main/java/simpleclient/mixin/performance/SharedConstantsMixin.java
@@ -12,6 +12,6 @@ public class SharedConstantsMixin {
     // Faster starting
     @Inject(at = @At("HEAD"), method = "enableDataFixerOptimizations", cancellable = true)
     private static void enableDataFixerOptimizations(CallbackInfo ci) {
-        if (PerformanceBoost.ENABLED) ci.cancel();
+        if (PerformanceBoost.FASTBOOT) ci.cancel();
     }
 }
diff --git a/simpleclient-1.19.4/src/main/resources/simpleclient.mixins.json b/simpleclient-1.19.4/src/main/resources/simpleclient.mixins.json
@@ -8,6 +8,7 @@
   "client": [
     "GuiMixin",
     "performance.LevelRendererMixin",
+    "performance.OptionsMixin",
     "performance.SharedConstantsMixin"
   ],
   "injectors": {
diff --git a/simpleclient-1.20/src/main/java/simpleclient/feature/PerformanceBoost.java b/simpleclient-1.20/src/main/java/simpleclient/feature/PerformanceBoost.java
@@ -1,15 +1,37 @@
 package simpleclient.feature;
 
+import com.google.gson.JsonObject;
+import net.minecraft.network.chat.Component;
+import simpleclient.feature.config.EnableConfigEntry;
+
 public class PerformanceBoost extends EnableableFeature {
-    public static PerformanceBoost INSTANCE = new PerformanceBoost();
-    public static boolean ENABLED = INSTANCE.isEnabled();
+    public static boolean ENABLED = false;
+    public static boolean FASTBOOT = false;
+    public static boolean DONT_RENDER_CLOUDS = false;
+    public static boolean DONT_RENDER_SKY_UNDER_WATER = false;
+    private final EnableConfigEntry fastBoot = new EnableConfigEntry("fastboot", Component.translatable("simpleclient.performance.fastboot"), true);
+    private final EnableConfigEntry dontRenderCouds = new EnableConfigEntry("dont_render_clouds", Component.translatable("simpleclient.performance.dont_render_clouds"), true);
+    private final EnableConfigEntry dontRenderSkyUnderWater = new EnableConfigEntry("dont_render_sky_under_water", Component.translatable("simpleclient.performance.dont_render_sky_under_water"), true);
+
     public PerformanceBoost() {
         super(FeatureType.PERFORMANCE_BOOST);
+        addConfigEntry(fastBoot);
+        addConfigEntry(dontRenderCouds);
+        addConfigEntry(dontRenderSkyUnderWater);
+        refresh();
+    }
+
+    public void refresh() {
+        ENABLED = isEnabled();
+        JsonObject data = getData();
+        FASTBOOT = ENABLED && fastBoot.load(data);
+        DONT_RENDER_CLOUDS = ENABLED && dontRenderCouds.load(data);
+        DONT_RENDER_SKY_UNDER_WATER = ENABLED && dontRenderSkyUnderWater.load(data);
     }
 
     @Override
-    public void setEnabled(boolean enabled) {
-        super.setEnabled(enabled);
-        ENABLED = enabled;
+    public void setData(JsonObject data) {
+        super.setData(data);
+        refresh();
     }
 }
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/performance/LevelRendererMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/performance/LevelRendererMixin.java
@@ -16,6 +16,6 @@ public class LevelRendererMixin {
     // +10% FPS under water
     @Inject(at = @At("HEAD"), method = "renderSky", cancellable = true)
     private void renderSky(PoseStack poseStack, Matrix4f matrix4f, float tickDelta, Camera camera, boolean bl, Runnable runnable, CallbackInfo ci) {
-        if (PerformanceBoost.ENABLED && camera.getFluidInCamera() != FogType.NONE) ci.cancel();
+        if (PerformanceBoost.DONT_RENDER_SKY_UNDER_WATER && camera.getFluidInCamera() != FogType.NONE) ci.cancel();
     }
 }
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/performance/OptionsMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/performance/OptionsMixin.java
@@ -0,0 +1,18 @@
+package simpleclient.mixin.performance;
+
+import net.minecraft.client.CloudStatus;
+import net.minecraft.client.Options;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import simpleclient.feature.PerformanceBoost;
+
+@Mixin(Options.class)
+public class OptionsMixin {
+    // +20% FPS
+    @Inject(at = @At("HEAD"), method = "getCloudsType", cancellable = true)
+    private void getCloudsType(CallbackInfoReturnable<CloudStatus> cir) {
+        if (PerformanceBoost.DONT_RENDER_CLOUDS) cir.setReturnValue(CloudStatus.OFF);
+    }
+}
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/performance/SharedConstantsMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/performance/SharedConstantsMixin.java
@@ -12,6 +12,6 @@ public class SharedConstantsMixin {
     // Faster starting
     @Inject(at = @At("HEAD"), method = "enableDataFixerOptimizations", cancellable = true)
     private static void enableDataFixerOptimizations(CallbackInfo ci) {
-        if (PerformanceBoost.INSTANCE.isEnabled()) ci.cancel();
+        if (PerformanceBoost.FASTBOOT) ci.cancel();
     }
 }
diff --git a/simpleclient-1.20/src/main/resources/simpleclient.mixins.json b/simpleclient-1.20/src/main/resources/simpleclient.mixins.json
@@ -8,6 +8,7 @@
   "client": [
     "GuiMixin",
     "performance.LevelRendererMixin",
+    "performance.OptionsMixin",
     "performance.SharedConstantsMixin"
   ],
   "injectors": {
diff --git a/simpleclient-core/src/main/resources/assets/simpleclient/lang/de_de.json b/simpleclient-core/src/main/resources/assets/simpleclient/lang/de_de.json
@@ -3,5 +3,8 @@
   "simpleclient.edit_features": "Features bearbeiten",
   "simpleclient.edit_feature_config": "Featurekonfiguration bearbeiten",
   "simpleclient.edit_config_of": "Konfiguration von %s bearbeiten",
-  "simpleclient.motionblur.strength": "Motionblur Stärke"
+  "simpleclient.motionblur.strength": "Motionblur Stärke",
+  "simpleclient.performance.fastboot": "Schnelles Starten",
+  "simpleclient.performance.dont_render_clouds": "Wolken nicht rendern (+20% FPS)",
+  "simpleclient.performance.dont_render_sky_under_water": "Himmel unter Wasser nicht rendern (+10% FPS unter Wasser)"
 }
diff --git a/simpleclient-core/src/main/resources/assets/simpleclient/lang/en_us.json b/simpleclient-core/src/main/resources/assets/simpleclient/lang/en_us.json
@@ -3,5 +3,8 @@
   "simpleclient.edit_features": "Edit Features",
   "simpleclient.edit_feature_config": "Edit Feature Config",
   "simpleclient.edit_config_of": "Edit Config of %s",
-  "simpleclient.motionblur.strength": "Motionblur Strength"
+  "simpleclient.motionblur.strength": "Motionblur Strength",
+  "simpleclient.performance.fastboot": "Fast starting",
+  "simpleclient.performance.dont_render_clouds": "Don't render clouds (+20% FPS)",
+  "simpleclient.performance.dont_render_sky_under_water": "Don't render sky under water (+10% FPS under water)"
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ public class LevelRendererMixin {`
`16`	`16`	`// +10% FPS under water`
`17`	`17`	`@Inject(at = @At("HEAD"), method = "renderSky", cancellable = true)`
`18`	`18`	`private void renderSky(PoseStack poseStack, Matrix4f matrix4f, float tickDelta, Camera camera, boolean bl, Runnable runnable, CallbackInfo ci) {`
`19`		`- if (PerformanceBoost.ENABLED && camera.getFluidInCamera() != FogType.WATER) ci.cancel();`
	`19`	`+ if (PerformanceBoost.DONT_RENDER_SKY_UNDER_WATER && camera.getFluidInCamera() != FogType.NONE) ci.cancel();`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ public class SharedConstantsMixin {`
`12`	`12`	`// Faster starting`
`13`	`13`	`@Inject(at = @At("HEAD"), method = "enableDataFixerOptimizations", cancellable = true)`
`14`	`14`	`private static void enableDataFixerOptimizations(CallbackInfo ci) {`
`15`		`- if (PerformanceBoost.ENABLED) ci.cancel();`
	`15`	`+ if (PerformanceBoost.FASTBOOT) ci.cancel();`
`16`	`16`	`}`
`17`	`17`	`}`