3.1.6

1.16_combat-6/build.gradle.kts

@@ -73,6 +73,7 @@ tasks.processResources {
 
 tasks.runClient {
 	classpath(sourceSets.getByName("test").runtimeClasspath)
+	jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+IgnoreUnrecognizedVMOptions")
 }
 
 tasks.withType(JavaCompile::class).configureEach {

1.16_combat-6/src/main/java/io/github/axolotlclient/api/ChatsSidebar.java

@@ -35,6 +35,7 @@
 import io.github.axolotlclient.api.types.Channel;
 import io.github.axolotlclient.api.types.User;
 import io.github.axolotlclient.api.util.AlphabeticalComparator;
+import lombok.Getter;
 import net.minecraft.client.gui.AbstractParentElement;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.Element;
@@ -50,6 +51,7 @@
 import net.minecraft.util.math.MathHelper;
 import org.lwjgl.glfw.GLFW;
 
+@SuppressWarnings("deprecation")
 public class ChatsSidebar extends Screen implements ContextMenuScreen {
 
 	private static final int ANIM_STEP = 8;
@@ -182,6 +184,7 @@ public List<AbstractButtonWidget> getButtons() {
 	}
 
 	private void close() {
+		//noinspection DataFlowIssue
 		client.openScreen(parent);
 		if (chatWidget != null) {
 			chatWidget.remove();
@@ -219,9 +222,11 @@ private void addChat(Channel channel) {
 		int w;
 		if (channel.isDM()) {
 			User chatUser = ((Channel.DM) channel).getReceiver();
+			//noinspection DataFlowIssue
 			w = Math.max(client.textRenderer.getWidth(chatUser.getStatus().getTitle() + ": " + chatUser.getStatus().getDescription()) + 5,
 				client.textRenderer.getWidth(channel.getName()));
 		} else {
+			//noinspection DataFlowIssue
 			w = client.textRenderer.getWidth(channel.getName());
 		}
 		sidebarWidth = Math.min(Math.max(width * 5 / 12, w + 5), width / 2);
@@ -271,6 +276,7 @@ private class ListWidget extends AbstractParentElement implements Drawable, Elem
 		private final int height;
 		private final int entryHeight = 25;
 		protected boolean hovered;
+		@Getter
 		private int x;
 		private int scrollAmount;
 		private boolean visible;
@@ -330,10 +336,6 @@ public boolean isMouseOver(double mouseX, double mouseY) {
 			return hovered = visible && mouseX >= (double) this.x && mouseY >= (double) this.y && mouseX < (double) (this.x + this.width) && mouseY < (double) (this.y + this.height);
 		}
 
-		public int getX() {
-			return x;
-		}
-
 		public void setX(int x) {
 			this.x = x;
 			elements.forEach(e -> e.x = x);

1.16_combat-6/src/main/java/io/github/axolotlclient/api/SimpleTextInputScreen.java

@@ -51,13 +51,17 @@ public void init() {
 
 		addButton(new ButtonWidget(width / 2 - 155, height - 50, 150, 20,
 			ScreenTexts.CANCEL, button -> client.openScreen(parent)));
-		addButton(new ButtonWidget(width / 2 + 5, height - 50, 150, 20,
+		var done = addButton(new ButtonWidget(width / 2 + 5, height - 50, 150, 20,
 			ScreenTexts.DONE, button -> {
-			if (!input.getText().isEmpty()) {
+			if (!input.getText().isBlank()) {
 				consumer.accept(input.getText());
-				client.openScreen(parent);
 			}
+			client.openScreen(parent);
 		}));
+		input.setChangedListener(s -> {
+			done.active = !s.isBlank();
+		});
+		done.active = false;
 	}
 
 	@Override

1.16_combat-6/src/main/java/io/github/axolotlclient/api/chat/ChatScreen.java

@@ -33,6 +33,7 @@
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
 import net.minecraft.text.TranslatableText;
 import org.lwjgl.glfw.GLFW;
 
@@ -47,7 +48,7 @@ public class ChatScreen extends Screen implements ContextMenuScreen {
 	private TextFieldWidget input;
 
 	public ChatScreen(Screen parent, Channel channel) {
-		super(new TranslatableText("api.screen.chat"));
+		super(new LiteralText(channel.getName()));
 		this.channel = channel;
 		this.parent = parent;
 	}
@@ -82,6 +83,7 @@ protected void init() {
 		users.setUsers(channel.getAllUsers(), channel);
 		addChild(users);
 
+		//noinspection DataFlowIssue
 		addButton(input = new TextFieldWidget(client.textRenderer, width / 2 - 150, height - 50,
 			300, 20, new TranslatableText("api.chat.enterMessage")) {
 

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java

@@ -51,7 +51,7 @@ public Identifier getFabricId() {
 				return new Identifier("axolotlclient", "bridge/resource_listener");
 			}
 		});
-		ClientPlayConnectionEvents.INIT.register((clientPlayNetworkHandler, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());
+		ClientPlayConnectionEvents.JOIN.register((clientPlayNetworkHandler, sender, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());
 		ClientPlayConnectionEvents.DISCONNECT.register((clientPlayNetworkHandler, minecraftClient) -> Events.DISCONNECT.invoker().run());
 	}
 

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java

@@ -156,4 +156,9 @@ public MinecraftClientMixin(String string) {
 	public AxoResourceManager br$getResourceManager() {
 		return getResourceManager();
 	}
+
+	@Override
+	public Object br$getScreen() {
+		return currentScreen;
+	}
 }

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/PlatformDispatchMixin.java

@@ -57,7 +57,7 @@
 import org.spongepowered.asm.mixin.Unique;
 
 @Mixin(value = PlatformDispatch.class, remap = false)
-public class PlatformDispatchMixin {
+public abstract class PlatformDispatchMixin {
 	@Unique
 	private static void getRealTimeServerPing(ServerInfo server, MutableInt currentServerPing) {
 		ThreadExecuter.scheduleTask(() -> {
@@ -124,7 +124,7 @@ public ClientConnection getConnection() {
 		final var minecraft = MinecraftClient.getInstance();
 		final var serverEntry = minecraft.getCurrentServerEntry();
 
-		final var img = NativeImage.read(Objects.requireNonNull(serverEntry == null ? minecraft.getServer().getServerMetadata().getFavicon() : serverEntry.getIcon()));
+		final var img = NativeImage.read(Objects.requireNonNull(serverEntry == null ? minecraft.getServer().getServerMetadata().getFavicon().substring("data:image/png;base64,".length()) : serverEntry.getIcon()));
 		final var icon = new NativeImageBackedTexture(img);
 		final var iconId = new Identifier("axolotlclient",
 			serverEntry == null ? "worlds/" + Hashing.sha1().hashUnencodedChars(((MinecraftServerAccessor) minecraft.getServer()).getStorageSource().getDirectoryName()) + "/icon" :
@@ -137,7 +137,7 @@ class Impl implements AxoSprite.Dynamic, AxoSpriteImpl {
 			@Override
 			public void draw(MinecraftClient client, MatrixStack stack, int sX, int sY, int sW, int sH) {
 				client.getTextureManager().bindTexture(iconId);
-				DrawUtil.drawTexture(stack, sX, sY, 0, 0, sW, sH,  sW, sH);
+				DrawUtil.drawTexture(stack, sX, sY, 0, 0, sW, sH, sW, sH);
 			}
 
 			@Override

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/PlayerListEntryMixin.java

@@ -32,7 +32,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(PlayerListEntry.class)
-public class PlayerListEntryMixin implements AxoPlayerListEntry {
+public abstract class PlayerListEntryMixin implements AxoPlayerListEntry {
 	@Shadow
 	@Final
 	private GameProfile profile;

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/entity/LivingEntityMixin.java

@@ -35,7 +35,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(LivingEntity.class)
-public class LivingEntityMixin implements AxoLivingEntity {
+public abstract class LivingEntityMixin implements AxoLivingEntity {
 	@Shadow
 	@Final
 	private Map<StatusEffect, StatusEffectInstance> activeStatusEffects;

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/entity/effect/AxoStatusEffectsMixin.java

@@ -34,7 +34,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = AxoStatusEffects.class, remap = false)
-public class AxoStatusEffectsMixin {
+public abstract class AxoStatusEffectsMixin {
 	@Mutable
 	@Shadow
 	@Final

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/internal/PlatformImplInternalMixin.java

@@ -69,7 +69,7 @@
 
 @SuppressWarnings("OverwriteModifiers")
 @Mixin(value = PlatformImplInternal.class, remap = false)
-public class PlatformImplInternalMixin {
+public abstract class PlatformImplInternalMixin {
 	/**
 	 * @author Flowey
 	 * @reason Implement bridge platform.
@@ -147,9 +147,9 @@ public static int getCurrentFps() {
 	 * @reason Implement bridge platform.
 	 */
 	@Overwrite
-	public static AxoKeybinding createKeyBinding(AxoKey defaultKey, String name, String category) {
+	public static AxoKeybinding createKeyBinding(AxoKey defaultKey, String name) {
 		int code = ((InputUtil.Key) Objects.requireNonNullElse(defaultKey, AxoKeys.KEY_UNKNOWN)).getCode();
-		final var binding = new KeyBinding(name, code, category);
+		final var binding = new KeyBinding(name, code, "category.axolotlclient");
 		KeyBindingHelper.registerKeyBinding(binding);
 		return binding;
 	}

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/item/AxoEnchantsMixin.java

@@ -34,7 +34,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = AxoEnchants.class, remap = false)
-public class AxoEnchantsMixin {
+public abstract class AxoEnchantsMixin {
 	@Mutable
 	@Shadow
 	@Final

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/item/AxoItemsMixin.java

@@ -34,7 +34,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = AxoItems.class, remap = false)
-public class AxoItemsMixin {
+public abstract class AxoItemsMixin {
 	@Mutable
 	@Shadow
 	@Final

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/item/EnchantmentMixin.java

@@ -27,5 +27,5 @@
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(Enchantment.class)
-public class EnchantmentMixin implements AxoEnchant {
+public abstract class EnchantmentMixin implements AxoEnchant {
 }

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/item/ItemMixin.java

@@ -29,7 +29,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(Item.class)
-public class ItemMixin implements AxoItem {
+public abstract class ItemMixin implements AxoItem {
 	@Override
 	public boolean br$is(AxoItemClass itemClass) {
 		return switch (itemClass) {

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/key/AxoKeysMixin.java

@@ -35,7 +35,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = AxoKeys.class, remap = false)
-public class AxoKeysMixin {
+public abstract class AxoKeysMixin {
 
 	@Mutable
 	@Shadow

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/key/GameOptionsMixin.java

@@ -31,7 +31,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(GameOptions.class)
-public class GameOptionsMixin implements AxoClientKeybinds{
+public abstract class GameOptionsMixin implements AxoClientKeybinds {
 	@Shadow
 	@Final
 	public KeyBinding keyAttack;

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/key/KeyMixin.java

@@ -27,5 +27,5 @@
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(InputUtil.Key.class)
-public class KeyMixin implements AxoKey {
+public abstract class KeyMixin implements AxoKey {
 }

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/render/AxoSpritesMixin.java

@@ -36,7 +36,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = AxoSprites.class, remap = false)
-public class AxoSpritesMixin {
+public abstract class AxoSpritesMixin {
 	@Mutable
 	@Shadow
 	@Final

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/util/IdentifierMixin.java

@@ -28,7 +28,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(Identifier.class)
-public abstract class IdentifierMixin implements AxoIdentifier{
+public abstract class IdentifierMixin implements AxoIdentifier {
 	@Shadow
 	public abstract String getPath();
 

1.16_combat-6/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java

@@ -33,6 +33,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.api.ui.ConfigUI;
 import io.github.axolotlclient.AxolotlClientConfig.api.util.Color;
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.*;
+import io.github.axolotlclient.AxolotlClientConfig.impl.ui.RecreatableScreen;
 import io.github.axolotlclient.AxolotlClientConfigCommon;
 import io.github.axolotlclient.config.screen.CreditsScreen;
 import io.github.axolotlclient.config.screen.ProfilesScreen;
@@ -43,6 +44,7 @@
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.options.KeyBinding;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.texture.NativeImageBackedTexture;
@@ -155,7 +157,9 @@ public AxolotlClientConfig() {
 				general.add(configStyle = new StringArrayOption("configStyle", themes,
 					"configStyle." + ConfigUI.getInstance().getCurrentStyle().getName(), s -> {
 					ConfigUI.getInstance().setStyle(s.split("\\.")[1]);
-					MinecraftClient.getInstance().openScreen(null);
+
+					Screen newScreen = RecreatableScreen.tryRecreate(MinecraftClient.getInstance().currentScreen);
+					MinecraftClient.getInstance().openScreen(newScreen);
 				}));
 				AxolotlClient.getInstance().getConfigManager().load();
 				ConfigUI.getInstance().setStyle(configStyle.get().split("\\.")[1]);

1.16_combat-6/src/main/java/io/github/axolotlclient/config/screen/CreditsScreen.java

@@ -82,7 +82,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
 		renderBackground(matrices);
 		creditsList.render(matrices, mouseX, mouseY, delta);
 		super.render(matrices, mouseX, mouseY, delta);
-		drawCenteredText(matrices, textRenderer, getTitle(), width / 2, 33/2 - textRenderer.fontHeight / 2, -1);
+		drawCenteredText(matrices, textRenderer, getTitle(), width / 2, 33 / 2 - textRenderer.fontHeight / 2, -1);
 	}
 
 	@Override