update config library

- add Chinese translations (c&p from 1.8.9)

Author: moehreag

CHANGELOG.md

@@ -62,4 +62,5 @@
 - add turkish translation of the README
 - add Option to hide AutoTip tip messages
 - Add Option to toggle Freelook
+- update config library to 1.0.13
 

build.gradle

@@ -12,7 +12,7 @@ group = project.maven_group
 
 repositories {
 	maven {
-		url "https://moehreag.duckdns.org/maven/snapshots"
+		url "https://moehreag.duckdns.org/maven/releases"
 	}
 
 	maven {
@@ -39,7 +39,7 @@ dependencies {
 	modImplementation "org.quiltmc:quilt-loader:${project.loader_version}"
 	modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${quilted_fabric_api_version}"
 
-	include(modImplementation "io.github.axolotlclient:AxolotlClient-config:1.0.13-beta.1+1.19.2")
+	modImplementation include("io.github.axolotlclient:AxolotlClient-config:${project.config_version}+${project.minecraft_version}")
 
 	modImplementation "com.terraformersmc:modmenu:4.0.5"
 

gradle.properties

@@ -10,7 +10,10 @@ loader_version = 0.17.6
 # Quilted Fabric API
 quilted_fabric_api_version = 4.0.0-beta.19+0.64.0-1.19.2
 
+# AxolotlClientConfig
+config_version = 1.0.13
+
 # Mod Properties
-version = 2.2.4+1.19.2
+version = 2.2.5+1.19.2
 maven_group = io.github.axolotlclient
 archives_base_name = AxolotlClient

src/main/java/io/github/axolotlclient/NetworkHelper.java

@@ -77,24 +77,33 @@ public static void getUser(UUID uuid) {
     }
 
     public static void setOnline() {
-        try {
-            uuid = MinecraftClient.getInstance().player.getUuid();
-
-            CloseableHttpClient client = HttpClients.createDefault();
-            HttpPost post = new HttpPost("https://moehreag.duckdns.org/axolotlclient-api/");
-            post.setHeader("Accept", "application/json");
-            post.setHeader("Content-type", "application/json");
-            post.setEntity(new StringEntity("{\n\t\"uuid\": \"" + uuid.toString() + "\",\n\t\"online\": true\n}"));
-            HttpResponse response = client.execute(post);
-            String body = EntityUtils.toString(response.getEntity());
-            if (body.contains("Success!")) {
-                Logger.info("Sucessfully logged in at AxolotlClient!");
-                loggedIn = true;
+
+        if(uuid == null){
+            try {
+
+                uuid = MinecraftClient.getInstance().player.getUuid();
+            } catch (NullPointerException ignored){}
+        }
+
+        if(uuid != null) {
+            try {
+
+                CloseableHttpClient client = HttpClients.createDefault();
+                HttpPost post = new HttpPost("https://moehreag.duckdns.org/axolotlclient-api/");
+                post.setHeader("Accept", "application/json");
+                post.setHeader("Content-type", "application/json");
+                post.setEntity(new StringEntity("{\n\t\"uuid\": \"" + uuid.toString() + "\",\n\t\"online\": true\n}"));
+                HttpResponse response = client.execute(post);
+                String body = EntityUtils.toString(response.getEntity());
+                if (body.contains("Success!")) {
+                    Logger.info("Sucessfully logged in at AxolotlClient!");
+                    loggedIn = true;
+                }
+                client.close();
+            } catch (Exception e) {
+                //e.printStackTrace();
+                Logger.error("Error while logging in!");
             }
-            client.close();
-        } catch (Exception e) {
-            //e.printStackTrace();
-            Logger.error("Error while logging in!");
         }
     }
 

src/main/java/io/github/axolotlclient/mixin/ParticleManagerMixin.java

@@ -92,22 +92,11 @@ public boolean removeEmitterParticlesWhenRemoved(Queue<Particle> instance, Colle
     @Inject(method = "renderParticles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/Particle;buildGeometry(Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/client/render/Camera;F)V"), locals = LocalCapture.CAPTURE_FAILEXCEPTION)
     private void applyOptions(MatrixStack matrices, VertexConsumerProvider.Immediate immediate,
             LightmapTextureManager lightmapTextureManager, Camera camera, float f, CallbackInfo ci,
-            MatrixStack matrixStack, Iterator var7, ParticleTextureSheet particleTextureSheet,
+            MatrixStack matrixStack, Iterator<Particle> var7, ParticleTextureSheet particleTextureSheet,
             Iterable<Particle> iterable, Tessellator tessellator, BufferBuilder bufferBuilder, Iterator<Particle> var12,
             Particle particle) {
         if (Particles.getInstance().particleMap.containsKey(particle)) {
             Particles.getInstance().applyOptions(particle);
         }
     }
-
-    // @Redirect because we need a reference of the particle, which is a local var.
-    /*@Redirect(method = "renderParticles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/Particle;buildGeometry(Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/client/render/Camera;F)V"))
-    public void renderParticle(Particle instance, VertexConsumer vertexConsumer, Camera camera, float v){
-    
-        if(Particles.getInstance().particleMap.containsKey(instance)) {
-            Particles.getInstance().applyOptions(instance);
-        }
-    
-        instance.buildGeometry(vertexConsumer, camera, v);
-    }*/
 }

src/main/java/io/github/axolotlclient/mixin/PlayerListHudMixin.java

@@ -36,6 +36,7 @@
 import net.minecraft.text.StringVisitable;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
@@ -45,6 +46,8 @@
 @Mixin(PlayerListHud.class)
 public abstract class PlayerListHudMixin {
 
+    @Shadow protected abstract Text applyGameModeFormatting(PlayerListEntry entry, MutableText name);
+
     private GameProfile cachedPlayer;
 
     @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/PlayerListEntry;getProfile()Lcom/mojang/authlib/GameProfile;"))
@@ -57,13 +60,14 @@ public GameProfile getPlayerGameProfile(PlayerListEntry instance) {
     private PlayerListEntry playerListEntry;
 
     @Inject(method = "getPlayerName", at = @At("HEAD"), cancellable = true)
-    public void nickHider(PlayerListEntry playerEntry, CallbackInfoReturnable<String> cir) {
-        if (playerEntry.getProfile().getId() == MinecraftClient.getInstance().player.getUuid()
+    public void nickHider(PlayerListEntry playerEntry, CallbackInfoReturnable<Text> cir) {
+        assert MinecraftClient.getInstance().player != null;
+        if (playerEntry.getProfile().equals(MinecraftClient.getInstance().player.getGameProfile())
                 && NickHider.getInstance().hideOwnName.get()) {
-            cir.setReturnValue(NickHider.getInstance().hiddenNameSelf.get());
-        } else if (playerEntry.getProfile().getId() != MinecraftClient.getInstance().player.getUuid()
+            cir.setReturnValue(this.applyGameModeFormatting(playerEntry, Text.literal(NickHider.getInstance().hiddenNameSelf.get())));
+        } else if (!playerEntry.getProfile().equals(MinecraftClient.getInstance().player.getGameProfile())
                 && NickHider.getInstance().hideOtherNames.get()) {
-            cir.setReturnValue(NickHider.getInstance().hiddenNameOthers.get());
+            cir.setReturnValue(this.applyGameModeFormatting(playerEntry, Text.literal(NickHider.getInstance().hiddenNameOthers.get())));
         }
     }