Merge pull request #2 from SimpeClient/feature-config-1.19.4

Added Feature Configs

Author: FabiPunktExe

simpleclient-1.19.4/build.gradle

@@ -21,6 +21,10 @@ dependencies {
     include "io.github.ladysnake:satin:${project.satin_version}"
 }
 
+sourceSets {
+    main.resources.srcDirs += "${project(':simpleclient-core').projectDir}/src/main/resources"
+}
+
 processResources {
     filesMatching('fabric.mod.json') {
         expand 'version': version, 'minecraft_version': project.minecraft_version, 'fabric_loader_version': project.fabric_loader_version, 'fabric_api_version': project.fabric_api_version

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

@@ -16,11 +16,10 @@
 public class FeatureManagerImpl extends FeatureManager {
     @Override
     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());

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

@@ -1,22 +1,24 @@
 package simpleclient.feature;
 
-import com.google.gson.JsonObject;
 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()) {
-                JsonObject data = getData();
-                if (!data.has("strength")) data.addProperty("strength", 0.2F);
-                float strength = log(Math.pow(100.0F, 0.01F), data.get("strength").getAsFloat() * 100) / 100;
-                shader.setUniformValue("strength", strength);
+                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);
             }
         });

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);
+    }
+}

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

@@ -1,15 +1,25 @@
 package simpleclient.gui;
 
+import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Axis;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import org.joml.AxisAngle4d;
+import org.joml.AxisAngle4f;
+import org.joml.Quaternionf;
 import simpleclient.adapter.ItemRendererAdapter;
 import simpleclient.adapter.ItemRendererAdapterImpl;
 import simpleclient.adapter.TextRendererAdapter;
 import simpleclient.adapter.TextRendererAdapterImpl;
 import simpleclient.feature.*;
 import simpleclient.text.Text;
 
+import java.io.IOException;
 import java.util.List;
 
 public class EditFeaturesScreen extends Screen {
@@ -26,7 +36,7 @@ public EditFeaturesScreen() {
     public void render(PoseStack poseStack, int mouseX, int mouseY, float delta) {
         TextRendererAdapter textRenderer = new TextRendererAdapterImpl(poseStack, font);
         ItemRendererAdapter itemRenderer = new ItemRendererAdapterImpl(poseStack);
-        // Render Features
+        // Render Renderable Features
         for (Feature feature : FeatureManager.INSTANCE.getFeatures()) {
             if (feature instanceof RenderableFeature rf && rf.isEnabled()) {
                 rf.renderDummy(textRenderer, itemRenderer, width, height);
@@ -35,32 +45,54 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float delta) {
                     int y1 = df.getYPos(height) - 1;
                     int x2 = df.getXPos(width) + df.getWidth(textRenderer, itemRenderer, width, height) + 1;
                     int y2 = df.getYPos(height) + df.getHeight(textRenderer, itemRenderer, width, height) + 1;
-                    fill(poseStack, x1 - 1, y1 - 1, x2 + 1, y1, 0xFFAAAAAA);
-                    fill(poseStack, x1 - 1, y2, x2 + 1, y2 + 1, 0xFFAAAAAA);
-                    fill(poseStack, x1 - 1, y1 - 1, x1, y2 + 1, 0xFFAAAAAA);
-                    fill(poseStack, x2, y1 - 1, x2 + 1, y2 + 1, 0xFFAAAAAA);
+                    GuiComponent.fill(poseStack, x1 - 1, y1 - 1, x2 + 1, y1, 0xFFAAAAAA);
+                    GuiComponent.fill(poseStack, x1 - 1, y2, x2 + 1, y2 + 1, 0xFFAAAAAA);
+                    GuiComponent.fill(poseStack, x1 - 1, y1 - 1, x1, y2 + 1, 0xFFAAAAAA);
+                    GuiComponent.fill(poseStack, x2, y1 - 1, x2 + 1, y2 + 1, 0xFFAAAAAA);
                 }
             }
         }
-        // Render Buttons
-        fill(poseStack, 0, 0, width / 4, height, 0x77000000);
-        List<EnableableFeature> enableableFeatures = FeatureManager.INSTANCE.getEnableableFeatures();
-        for (int i = 0; i < enableableFeatures.size(); i++) {
-            EnableableFeature feature = enableableFeatures.get(i);
-            int x = i % 3;
-            int y = i / 3;
-            int wSize = (width / 4 - 8) / 3;
+        // Render Enableable Features
+        GuiComponent.fill(poseStack, 0, 0, width / 4, height, 0x77000000);
+        List<Feature> features = FeatureManager.INSTANCE.getFeatures();
+        for (int i = 0; i < features.size(); i++) {
+            Feature feature = features.get(i);
+            int count = (int) Math.ceil((double) width / 4 / 100);
+            int x = i % count;
+            int y = i / count;
+            int wSize = (width / 4 - 2 - count * 2) / count;
             int wX1 = 2 + (2 + wSize) * x;
             int wY1 = 2 + 2 + (2 + wSize) * y;
             int wX2 = (2 + wSize) * x + wSize;
             int wY2 = 2 + (2 + wSize) * y + wSize;
-            fill(poseStack, wX1, scroll + wY1, wX2, scroll + wY2, 0xff555555);
-            fill(poseStack, wX1 + wSize / 10, scroll + wY2 - wSize / 10 - wSize / 3 / 2, wX1 + wSize / 10 + wSize / 3, scroll + wY2 - wSize / 10, feature.isEnabled() ? 0xff00ff00 : 0xffff0000);
-            if (feature.isEnabled()) {
-                fill(poseStack, wX1 + wSize / 10 + wSize / 3 / 2 + wSize / 20, scroll + wY2 - wSize / 10 - wSize / 3 / 2 + wSize / 20, wX1 + wSize / 10 + wSize / 3 - wSize / 20, scroll + wY2 - wSize / 10 - wSize / 20, 0xff000000);
-            } else {
-                fill(poseStack, wX1 + wSize / 10 + wSize / 20, scroll + wY2 - wSize / 10 - wSize / 3 / 2 + wSize / 20, wX1 + wSize / 10 + wSize / 3 / 2 - wSize / 20, scroll + wY2 - wSize / 10 - wSize / 20, 0xff000000);
+            // Background
+            GuiComponent.fill(poseStack, wX1, scroll + wY1, wX2, scroll + wY2, 0xff555555);
+            // Enable Button
+            if (feature instanceof EnableableFeature ef) {
+                GuiComponent.fill(poseStack, wX1 + wSize / 10, scroll + wY2 - wSize / 10 - wSize / 3 / 2, wX1 + wSize / 10 + wSize / 3, scroll + wY2 - wSize / 10, ef.isEnabled() ? 0xff00ff00 : 0xffff0000);
+                if (ef.isEnabled()) {
+                    GuiComponent.fill(poseStack, wX1 + wSize / 10 + wSize / 3 / 2 + wSize / 20, scroll + wY2 - wSize / 10 - wSize / 3 / 2 + wSize / 20, wX1 + wSize / 10 + wSize / 3 - wSize / 20, scroll + wY2 - wSize / 10 - wSize / 20, 0xff000000);
+                } else {
+                    GuiComponent.fill(poseStack, wX1 + wSize / 10 + wSize / 20, scroll + wY2 - wSize / 10 - wSize / 3 / 2 + wSize / 20, wX1 + wSize / 10 + wSize / 3 / 2 - wSize / 20, scroll + wY2 - wSize / 10 - wSize / 20, 0xff000000);
+                }
+            }
+            // Config Button
+            if (feature.hasConfig()) {
+                poseStack.pushPose();
+                int h = wSize / 3 / 2;
+                int cogwheelX = wX1 + wSize / 10 * 4 + wSize / 3;
+                int cogwheelY = scroll + wY2 - wSize / 10 - wSize / 3 / 2;
+                if (cogwheelX <= mouseX && mouseX <= cogwheelX + h &&
+                        cogwheelY <= mouseY && mouseY <= cogwheelY + h) {
+                    poseStack.rotateAround(Axis.ZP.rotation((float) (System.currentTimeMillis() % 4000) / 400), cogwheelX + h / 2, cogwheelY + h / 2, 0.0F);
+                }
+                RenderSystem.setShader(GameRenderer::getPositionTexShader);
+                RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+                RenderSystem.setShaderTexture(0, new ResourceLocation("simpleclient", "textures/settings.png"));
+                GuiComponent.blit(poseStack, cogwheelX, cogwheelY, 0, 0, h, h, h, h);
+                poseStack.popPose();
             }
+            // Name
             poseStack.pushPose();
             float scaleX = (((float) wSize) * 0.8F) / textRenderer.getWidth(feature.getName().split(" - ")[0]);
             float scaleY = (((float) wSize) * 0.3F) / textRenderer.getHeight();
@@ -98,19 +130,28 @@ public void mouseMoved(double mouseX, double mouseY) {
     @Override
     public boolean mouseReleased(double mouseX, double mouseY, int button) {
         if (active == null) {
-            List<EnableableFeature> enableableFeatures = FeatureManager.INSTANCE.getEnableableFeatures();
-            for (int i = 0; i < enableableFeatures.size(); i++) {
-                EnableableFeature feature = enableableFeatures.get(i);
-                int x = i % 3;
-                int y = i / 3;
-                int wSize = (width / 4 - 8) / 3;
+            List<Feature> features = FeatureManager.INSTANCE.getFeatures();
+            for (int i = 0; i < features.size(); i++) {
+                Feature feature = features.get(i);
+                int count = (int) Math.ceil((double) width / 4 / 100);
+                int x = i % count;
+                int y = i / count;
+                int wSize = (width / 4 - 2 - count * 2) / count;
                 int wX1 = 2 + (2 + wSize) * x;
                 int wY1 = 2 + 2 + (2 + wSize) * y;
                 int wX2 = (2 + wSize) * x + wSize;
                 int wY2 = 2 + (2 + wSize) * y + wSize;
-                if (wX1 <= mouseX && mouseX <= wX2 &&
+                int h = wSize / 3 / 2;
+                int cogwheelX = wX1 + wSize / 10 * 4 + wSize / 3;
+                int cogwheelY = scroll + wY2 - wSize / 10 - wSize / 3 / 2;
+                if (feature.hasConfig() &&
+                    cogwheelX <= mouseX && mouseX <= cogwheelX + h &&
+                    cogwheelY <= mouseY && mouseY <= cogwheelY + h) {
+                    minecraft.setScreen(new EditFeatureConfigScreen(feature, this));
+                } else if (feature instanceof EnableableFeature ef &&
+                             wX1 <= mouseX && mouseX <= wX2 &&
                     wY1 + scroll <= mouseY && mouseY <= wY2 + scroll) {
-                    feature.setEnabled(!feature.isEnabled());
+                    ef.setEnabled(!ef.isEnabled());
                 }
             }
         } else active = null;
@@ -138,7 +179,7 @@ public void removed() {
 
     @Override
     public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        scroll += amount * height / 50;
+        scroll += amount * height / 30;
         return super.mouseScrolled(mouseX, mouseY, amount);
     }
 

simpleclient-1.19.4/src/main/resources/fabric.mod.json

@@ -13,7 +13,7 @@
     "sources": "https://github.com/SimpeClient"
   },
   "license": "MIT",
-  "icon": "assets/simpleclient/icon.png",
+  "icon": "icon.png",
   "environment": "*",
   "entrypoints": {
     "client": [