fixed merge conflicts

Author: FabiPunktExe

build.gradle

@@ -22,7 +22,8 @@ githubRelease {
     draft false
     prerelease version.startsWith('0') || version.endsWith('-snapshot') || version.endsWith('-alpha') || version.endsWith('-beta') || version.endsWith('-dev')
     var assets = []
-    [project('simpleclient-1.19.4'),
+    [project('simpleclient-1.8.9'),
+     project('simpleclient-1.19.4'),
      project('simpleclient-1.20'),
      project('simpleclient-1.20.1')].forEach {
         assets.add it.file("build/libs/${it.name}-${version}.jar")
@@ -35,8 +36,9 @@ githubRelease {
     client
 }
 
-tasks.named('githubRelease') {
+/*tasks.named('githubRelease') {
+    dependsOn ':simpleclient-1.8.9:build'
     dependsOn ':simpleclient-1.19.4:build'
     dependsOn ':simpleclient-1.20:build'
     dependsOn ':simpleclient-1.20.1:build'
-}
+}*/

changelog.md

@@ -1,2 +1,2 @@
 ## SimpleClient %version%
-- Better GUI
+- Fixed server IP in Discord integration

gradle.properties

@@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # SimpleClient
-simpleclient_version=0.2.6
+simpleclient_version=0.3.3
 discord_game_sdk_version=v0.5.5

settings.gradle

@@ -5,8 +5,9 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
-rootProject.name = 'simpleclient'
+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() {
@@ -35,8 +54,7 @@ public void onInitializeClient() {
             if (mc.player != null && mc.level != null) {
                 if (DiscordRPC.INSTANCE.getIngameTimestamp() == null) DiscordRPC.INSTANCE.setIngameTimestamp(Instant.now());
                 if (mc.getSingleplayerServer() == null) {
-                    InetSocketAddress address = (InetSocketAddress) mc.getConnection().getConnection().getRemoteAddress();
-                    return DiscordRPC.activity("Multiplayer", address.getHostName(), DiscordRPC.INSTANCE.getIngameTimestamp());
+                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServer().ip, DiscordRPC.INSTANCE.getIngameTimestamp());
                 } else {
                     String gamemode = mc.player.isCreative() ? "Creative Mode" : mc.player.isSpectator() ? "Spectator Mode" : "Survival Mode";
                     return DiscordRPC.activity("Singleplayer", gamemode, DiscordRPC.INSTANCE.getIngameTimestamp());

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,8 @@ public void init() {
         addFeature(new PerformanceBoost());
         addFeature(new Perspective());
         addFeature(new Ping());
+        addFeature(new PvPImprovements());
+        addFeature(new TNTTimer());
         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);