Merge branch 'main' into performance

Author: FabiPunktExe

simpleclient-1.19.4/build.gradle

@@ -4,6 +4,7 @@ plugins {
 }
 
 repositories {
+    maven { url = "https://ladysnake.jfrog.io/artifactory/mods" }
 }
 
 dependencies {
@@ -16,6 +17,12 @@ dependencies {
     include project(path: ':simpleclient-core')
     // Dependencies
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+    modImplementation "io.github.ladysnake:satin:${project.satin_version}"
+    include "io.github.ladysnake:satin:${project.satin_version}"
+}
+
+sourceSets {
+    main.resources.srcDirs += "${project(':simpleclient-core').projectDir}/src/main/resources"
 }
 
 processResources {

simpleclient-1.19.4/gradle.properties

@@ -3,4 +3,5 @@ minecraft_version=1.19.4
 fabric_loader_version=0.14.19
 
 # Dependencies
-fabric_api_version=0.77.0+1.19.4
+fabric_api_version=0.77.0+1.19.4
+satin_version=1.12.1

simpleclient-1.19.4/src/main/java/simpleclient/feature/FeatureManagerImpl.java

@@ -13,13 +13,14 @@ public class FeatureManagerImpl extends FeatureManager {
     public void init() {
         Minecraft mc = Minecraft.getInstance();
         KeyMapping editFeaturesKey = KeyBindingHelper.registerKeyBinding(new KeyMapping("simpleclient.edit_features", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_RIGHT_SHIFT, "key.categories.simpleclient"));
-        ClientTickEvents.END_CLIENT_TICK.register(c -> {
-            if (editFeaturesKey.consumeClick() && mc.screen == null && mc.level != null) {
-                mc.setScreen(new EditFeaturesScreen());
+        ClientTickEvents.END_CLIENT_TICK.register(minecraft -> {
+            if (editFeaturesKey.consumeClick() && minecraft.screen == null && minecraft.level != null) {
+                minecraft.setScreen(new EditFeaturesScreen());
             }
         });
         addFeature(new FPS());
         addFeature(new PerformanceBoost());
+        addFeature(new Motionblur());
         super.init();
     }
 }

simpleclient-1.19.4/src/main/java/simpleclient/feature/Motionblur.java

@@ -0,0 +1,30 @@
+package simpleclient.feature;
+
+import ladysnake.satin.api.event.ShaderEffectRenderCallback;
+import ladysnake.satin.api.managed.ManagedShaderEffect;
+import ladysnake.satin.api.managed.ShaderEffectManager;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.Mth;
+import simpleclient.feature.config.PercentConfigEntry;
+
+public class Motionblur extends EnableableFeature {
+    private final ManagedShaderEffect shader = ShaderEffectManager.getInstance().manage(new ResourceLocation("simpleclient", "shaders/post/motionblur.json"), shader -> {});
+    private final PercentConfigEntry strength = new PercentConfigEntry("strength", Component.translatable("simpleclient.motionblur.strength"), 0.25F, 0);
+
+    public Motionblur() {
+        super(FeatureType.MOTIONBLUR);
+        addConfigEntry(strength);
+        ShaderEffectRenderCallback.EVENT.register(tickDelta -> {
+            if (isEnabled()) {
+                float strengthValue = log(Math.pow(100.0F, 0.01F), getConfigValue(strength) * 100) / 100;
+                shader.setUniformValue("strength", Math.max(0, Math.min(strengthValue, 1)));
+                shader.render(tickDelta);
+            }
+        });
+    }
+
+    private float log(double base, double number) {
+        return (float) (Math.log(number) / Math.log(base));
+    }
+}

simpleclient-1.19.4/src/main/java/simpleclient/feature/config/EnableConfigEntry.java

@@ -0,0 +1,44 @@
+package simpleclient.feature.config;
+
+import com.google.gson.JsonObject;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import simpleclient.feature.Feature;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public class EnableConfigEntry implements ConfigEntry<Boolean> {
+    private String key;
+    private boolean defaultValue;
+    private Component displayText;
+
+    public EnableConfigEntry(String key, Component displayText, boolean defaultValue) {
+        this.key = key;
+        this.defaultValue = defaultValue;
+        this.displayText = displayText;
+    }
+
+    @Override
+    public Boolean load(JsonObject json) {
+        if (!json.has(key)) json.addProperty(key, defaultValue);
+        return json.get(key).getAsBoolean();
+    }
+
+    @Override
+    public void save(JsonObject json, Boolean value) {
+        json.addProperty(key, value);
+    }
+
+    @Override
+    public AbstractWidget createWidget(Feature feature) {
+        Function<Boolean, Component> text = value -> displayText.copy().append(": ").append(value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF);
+        return Button.builder(text.apply(feature.getConfigValue(this)), button -> {
+            boolean value = feature.getConfigValue(this);
+            feature.setConfigValue(this, !value);
+            button.setMessage(text.apply(!value));
+        }).size(200, 20).build();
+    }
+}

simpleclient-1.19.4/src/main/java/simpleclient/feature/config/FloatConfigEntry.java

@@ -0,0 +1,54 @@
+package simpleclient.feature.config;
+
+import com.google.gson.JsonObject;
+import net.minecraft.client.gui.components.AbstractOptionSliderButton;
+import net.minecraft.client.gui.components.AbstractSliderButton;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import simpleclient.feature.Feature;
+
+import java.util.function.Function;
+
+public class FloatConfigEntry implements ConfigEntry<Float> {
+    private String key;
+    private float defaultValue;
+    private Component displayText;
+    private Function<Float, Component> valueText;
+
+    public FloatConfigEntry(String key, Component displayText, float defaultValue, Function<Float, Component> valueText) {
+        this.key = key;
+        this.defaultValue = defaultValue;
+        this.displayText = displayText;
+        this.valueText = valueText;
+    }
+
+    @Override
+    public Float load(JsonObject json) {
+        if (!json.has(key)) json.addProperty(key, defaultValue);
+        return json.get(key).getAsFloat();
+    }
+
+    @Override
+    public void save(JsonObject json, Float value) {
+        json.addProperty(key, value);
+    }
+
+    @Override
+    public AbstractWidget createWidget(Feature feature) {
+        Function<Float, Component> text = value -> displayText.copy().append(": ").append(valueText.apply(value));
+        float value = feature.getConfigValue(this);
+        return new AbstractSliderButton(0, 0, 200, 20, text.apply(value), value) {
+            @Override
+            protected void updateMessage() {
+                setMessage(text.apply((float) value));
+            }
+
+            @Override
+            protected void applyValue() {
+                feature.setConfigValue(FloatConfigEntry.this, (float) value);
+            }
+        };
+    }
+}

simpleclient-1.19.4/src/main/java/simpleclient/feature/config/PercentConfigEntry.java

@@ -0,0 +1,11 @@
+package simpleclient.feature.config;
+
+import net.minecraft.network.chat.Component;
+
+import java.util.function.Function;
+
+public class PercentConfigEntry extends FloatConfigEntry {
+    public PercentConfigEntry(String key, Component displayText, float defaultValue, int digits) {
+        super(key, displayText, defaultValue, v -> Component.literal((float) (int) (v * Math.pow(10, digits + 2)) / Math.pow(10, digits) + "%"));
+    }
+}

simpleclient-1.19.4/src/main/java/simpleclient/gui/EditFeatureConfigScreen.java

@@ -0,0 +1,54 @@
+package simpleclient.gui;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.client.gui.components.AbstractSliderButton;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import simpleclient.feature.Feature;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EditFeatureConfigScreen extends Screen {
+    private final Feature feature;
+    private final Screen parent;
+
+    public EditFeatureConfigScreen(Feature feature, Screen parent) {
+        super(Component.translatable("simpleclient.edit_feature_config"));
+        this.feature = feature;
+        this.parent = parent;
+    }
+
+    @Override
+    protected void init() {
+        List<AbstractWidget> widgets = new ArrayList<>();
+        int y = 20 + font.lineHeight;
+        widgets.add(Button.builder(CommonComponents.GUI_DONE, button -> minecraft.setScreen(parent)).size(200, 20).build());
+        feature.getConfig().forEach(e -> widgets.add((AbstractWidget) e.createWidget(feature)));
+        for (int i = 0; i < widgets.size(); i++) {
+            AbstractWidget widget = widgets.get(i);
+            widget.setX((width - widget.getWidth()) / 2);
+            widget.setY(y);
+            y += widget.getHeight() + 2;
+            addRenderableWidget(widget);
+        }
+    }
+
+    @Override
+    public void render(PoseStack poseStack, int mouseX, int mouseY, float delta) {
+        renderBackground(poseStack);
+        Component text = Component.translatable("simpleclient.edit_config_of", feature.getName());
+        GuiComponent.drawCenteredString(poseStack, font, text, width / 2, 10, 0xFFFFFFFF);
+        super.render(poseStack, mouseX, mouseY, delta);
+    }
+
+    @Override
+    public void onClose() {
+        minecraft.setScreen(parent);
+    }
+}