feat: port to 1.21.6

Author: MichaelHillcox

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [21.6.0]
+
+### Changed
+
+- Updated to 1.21.6
+
 ## [21.5.0]
 
 ### Changed

common/src/main/java/pro/mikey/autoclicker/AutoClicker.java

@@ -125,21 +125,21 @@ public void renderGameOverlayEvent(GuiGraphics context, DeltaTracker delta) {
             Component text = Language.HUD_HOLDING.getText(I18n.get(leftHolding.getKey().getName()));
             int y = getHudY() + (15 * 0);
             int x = getHudX(text);
-            context.drawString(client.font, text.getVisualOrderText(), x, y, 0xffffff);
+            context.drawString(client.font, text.getVisualOrderText(), x, y, 0xFFffffff);
         }
 
         if (rightHolding.isActive()) {
             Component text = Language.HUD_HOLDING.getText(I18n.get(rightHolding.getKey().getName()));
             int y = getHudY() + (15 * 1);
             int x = getHudX(text);
-            context.drawString(client.font, text.getVisualOrderText(), x, y, 0xffffff);
+            context.drawString(client.font, text.getVisualOrderText(), x, y, 0xFFffffff);
         }
 
         if (jumpHolding.isActive()) {
             Component text = Language.HUD_HOLDING.getText(I18n.get(jumpHolding.getKey().getName()));
             int y = getHudY() + (15 * 2);
             int x = getHudX(text);
-            context.drawString(client.font, text.getVisualOrderText(), x, y, 0xffffff);
+            context.drawString(client.font, text.getVisualOrderText(), x, y, 0xFFffffff);
         }
     }
 

common/src/main/java/pro/mikey/autoclicker/OptionsScreen.java

@@ -5,6 +5,7 @@
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
 import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.FormattedText;
@@ -237,22 +238,21 @@ private String getNextLocation(String currentLocation){
 
     private void renderHelpingTip(GuiGraphics context, Component text, int mouseX, int mouseY) {
         context.renderTooltip(
-            this.font, this.font.split(FormattedText.of(text.getString()), 250), DefaultTooltipPositioner.INSTANCE, mouseX, mouseY);
+            this.font, this.font.split(FormattedText.of(text.getString()), 250).stream().map(ClientTooltipComponent::create).toList(), mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null);
     }
 
     @Override
     public void render(GuiGraphics context, int mouseX, int mouseY, float delta) {
-        this.renderBackground(context, mouseX, mouseY, delta);
         super.render(context, mouseX, mouseY, delta);
 
         context.drawString(
-            this.font,Language.GUI_ATTACK.getText().getVisualOrderText(), this.width / 2 - 200, this.height / 2 - 116, 0xFFFFFF);
+            this.font,Language.GUI_ATTACK.getText().getVisualOrderText(), this.width / 2 - 200, this.height / 2 - 116, 0xFFFFFFFF);
 
         context.drawString(
-            this.font, Language.GUI_USE.getText().getVisualOrderText(), this.width / 2 - 65, this.height / 2 - 116, 0xFFFFFF);
+            this.font, Language.GUI_USE.getText().getVisualOrderText(), this.width / 2 - 65, this.height / 2 - 116, 0xFFFFFFFF);
 
         context.drawString(
-            this.font, Language.GUI_JUMP.getText().getVisualOrderText(), this.width / 2 + 70, this.height / 2 - 116, 0xFFFFFF);
+            this.font, Language.GUI_JUMP.getText().getVisualOrderText(), this.width / 2 + 70, this.height / 2 - 116, 0xFFFFFFFF);
 
         for (Button button : buttonTooltips.keySet()) {
         	if (button.isHovered()) {

gradle.properties

@@ -3,20 +3,20 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version = 21.5.0
+mod_version = 21.6.0
 maven_group = pro.mikey.autoclicker
 archives_name = autoclicker
 enabled_platforms = fabric,neoforge
 
 # Minecraft properties
-minecraft_version = 1.21.5
+minecraft_version = 1.21.6
 
 # Dependencies
 fabric_loader_version=0.16.14
-fabric_api_version=0.124.0+1.21.5
-neoforge_version = 21.5.35-beta
+fabric_api_version=0.128.1+1.21.6
+neoforge_version = 21.6.20-beta
 
-modmenu = 14.0.0-rc.2
+modmenu = 15.0.0-beta.3
 
 curseforge_id=445095
 modrinth_id=r8axuw4u

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

neoforge/src/main/java/pro/mikey/autoclicker/neoforge/AutoClickerNeoForge.java

@@ -20,7 +20,7 @@
 import pro.mikey.autoclicker.AutoClicker;
 
 @Mod(AutoClicker.MOD_ID)
-@EventBusSubscriber(value = Dist.CLIENT, modid = AutoClicker.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
+@EventBusSubscriber(value = Dist.CLIENT, modid = AutoClicker.MOD_ID)
 public final class AutoClickerNeoForge {
     private static final AutoClicker autoClicker = new AutoClicker();
     public AutoClickerNeoForge() {