Merge pull request #7 from SimpleClientDevelopment/1.8.9

1.8.9 for SimpleClient

Author: FabiPunktExe

settings.gradle

@@ -7,6 +7,7 @@ pluginManagement {
 }
 rootProject.name = 'simpleclient'
 include 'simpleclient-core'
+include 'simpleclient-1.8.9'
 include 'simpleclient-1.19.4'
 include 'simpleclient-1.20'
 include 'simpleclient-1.20.1'

simpleclient-1.19.4/src/main/java/simpleclient/SimpleClient.java

@@ -13,6 +13,7 @@
 import net.minecraft.world.entity.player.Player;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import simpleclient.adapter.LoggerAdapter;
 import simpleclient.adapter.TranslationAdapter;
 import simpleclient.adapter.TranslationAdapterImpl;
 import simpleclient.feature.FeatureManager;
@@ -22,8 +23,26 @@
 import java.time.Instant;
 
 public class SimpleClient implements ClientModInitializer {
-    public static final Logger LOGGER = LoggerFactory.getLogger("simpleclient");
+    public static final LoggerAdapter LOGGER = new LoggerAdapter() {
+        Logger logger = LoggerFactory.getLogger("SimpleClient");
+
+        @Override
+        public void info(String message, Object... args) {
+            logger.info(message, args);
+        }
+
+        @Override
+        public void error(String message, Object... args) {
+            logger.error(message, args);
+        }
+
+        @Override
+        public void debug(String message, Object... args) {
+            logger.debug(message, args);
+        }
+    };
     public static String VERSION = "unknown";
+    public static String MINECRAFT_VERSION = "1.19.4";
 
     @Override
     public void onInitializeClient() {

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

@@ -19,7 +19,7 @@ public Coordinates(FeatureType type, String parameter, String letter, Supplier<D
 
     @Override
     public String valueForParameter(String parameter) {
-        if (parameter.equals(this.parameter)) return "" + (float) (int) (coordinateSupplier.get() * 100) / 100;
+        if (parameter.equals(this.parameter)) return String.valueOf((float) (int) (coordinateSupplier.get() * 100) / 100);
         else return "";
     }
 

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

@@ -28,6 +28,7 @@ public void init() {
         addFeature(new PerformanceBoost());
         addFeature(new Perspective());
         addFeature(new Ping());
+        addFeature(new PvPImprovements());
         addFeature(new Zoom());
         super.init();
     }

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

@@ -1,13 +1,13 @@
 package simpleclient.feature;
 
 import com.google.gson.JsonObject;
-import net.minecraft.network.chat.Component;
 import simpleclient.feature.config.FloatConfigEntry;
+import simpleclient.text.Text;
 
 public class Lowfire extends EnableableFeature {
     public static boolean ENABLED = false;
     public static float HEIGHT = 0;
-    private final FloatConfigEntry height = new FloatConfigEntry("height", Component.translatable("simpleclient.lowfire.height"), 0.25F, value -> Component.literal(String.valueOf((float) (int) (value * 200 - 50) / 100)));
+    private final FloatConfigEntry height = new FloatConfigEntry("height", Text.translatable("simpleclient.lowfire.height"), 0.25F, value -> Text.literal(String.valueOf((float) (int) (value * 200 - 50) / 100)));
 
     public Lowfire() {
         super(FeatureType.LOWFIRE);

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

@@ -3,14 +3,13 @@
 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;
+import simpleclient.text.Text;
 
 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);
+    private final PercentConfigEntry strength = new PercentConfigEntry("strength", Text.translatable("simpleclient.motionblur.strength"), 0.25F, 0);
 
     public Motionblur() {
         super(FeatureType.MOTIONBLUR);

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

@@ -1,17 +1,17 @@
 package simpleclient.feature;
 
 import com.google.gson.JsonObject;
-import net.minecraft.network.chat.Component;
 import simpleclient.feature.config.EnableConfigEntry;
+import simpleclient.text.Text;
 
 public class PerformanceBoost extends EnableableFeature {
     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);
+    private final EnableConfigEntry fastBoot = new EnableConfigEntry("fastboot", Text.translatable("simpleclient.performance.fastboot"), true);
+    private final EnableConfigEntry dontRenderCouds = new EnableConfigEntry("dont_render_clouds", Text.translatable("simpleclient.performance.dont_render_clouds"), true);
+    private final EnableConfigEntry dontRenderSkyUnderWater = new EnableConfigEntry("dont_render_sky_under_water", Text.translatable("simpleclient.performance.dont_render_sky_under_water"), true);
 
     public PerformanceBoost() {
         super(FeatureType.PERFORMANCE_BOOST);

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

@@ -16,8 +16,7 @@ public String valueForParameter(String parameter) {
             Minecraft minecraft = Minecraft.getInstance();
             PlayerInfo entry = minecraft.getConnection().getPlayerInfo(minecraft.player.getUUID());
             return entry == null ? "-" : (entry.getLatency() + "ms");
-        }
-        else return "";
+        } else return "";
     }
 
     @Override

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

@@ -0,0 +1,28 @@
+package simpleclient.feature;
+
+import com.google.gson.JsonObject;
+import simpleclient.feature.config.EnableConfigEntry;
+import simpleclient.text.Text;
+
+public class PvPImprovements extends EnableableFeature {
+    public static boolean ENABLED = false;
+    public static boolean LEFTCLICK_DELAY_FIX = false;
+    private final EnableConfigEntry leftclickDelayFix = new EnableConfigEntry("leftclick_delay_fix", Text.translatable("simpleclient.pvp_improvements.leftclick_delay_fix"), true);
+
+    public PvPImprovements() {
+        super(FeatureType.PVP_IMPROVEMENTS);
+        addConfigEntry(leftclickDelayFix);
+        refresh();
+    }
+
+    public void refresh() {
+        ENABLED = isEnabled();
+        LEFTCLICK_DELAY_FIX = ENABLED && getConfigValue(leftclickDelayFix);
+    }
+
+    @Override
+    public void setData(JsonObject data) {
+        super.setData(data);
+        refresh();
+    }
+}

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

@@ -5,16 +5,16 @@
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.KeyMapping;
-import net.minecraft.network.chat.Component;
 import org.lwjgl.glfw.GLFW;
 import simpleclient.feature.config.EnableConfigEntry;
 import simpleclient.feature.config.FloatConfigEntry;
+import simpleclient.text.Text;
 
 public class Zoom extends Feature {
     public static boolean ACTIVE = false;
     public static float ZOOM_FACTOR = 0;
-    private FloatConfigEntry zoomFactor = new FloatConfigEntry("zoom_factor", Component.translatable("simpleclient.zoom.zoom_factor"), 0.8F, value -> Component.literal("x" + (float) (int) (10 / (1 - value)) / 10));
-    private EnableConfigEntry smoothCamera = new EnableConfigEntry("smooth_camera", Component.translatable("simpleclient.zoom.smooth_camera"), true);
+    private FloatConfigEntry zoomFactor = new FloatConfigEntry("zoom_factor", Text.translatable("simpleclient.zoom.zoom_factor"), 0.8F, value -> Text.literal("x" + (float) (int) (10 / (1 - value)) / 10));
+    private EnableConfigEntry smoothCamera = new EnableConfigEntry("smooth_camera", Text.translatable("simpleclient.zoom.smooth_camera"), true);
 
     public Zoom() {
         super(FeatureType.ZOOM);