Port to 25w45a

Author: IMS212

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.11-SNAPSHOT'
+	id 'fabric-loom' version '1.13-SNAPSHOT'
 }
 
 apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.7/ferry.gradle'

gradle.properties

@@ -4,10 +4,10 @@ org.gradle.parallel=true
 maven_group=com.terraformersmc
 archive_name=modmenu
 
-minecraft_version=1.21.9
-yarn_mappings=1.21.9+build.1
-loader_version=0.17.2
-fabric_version=0.133.14+1.21.9
+minecraft_version=25w45a
+yarn_mappings=25w45a+build.1
+loader_version=0.18.0
+fabric_version=0.138.2+1.21.11
 text_placeholder_api_version=2.8.0+1.21.9
 quilt_loader_version=0.29.0-beta.3
 

src/main/java/com/terraformersmc/modmenu/gui/widget/LegacyTexturedButtonWidget.java

@@ -30,7 +30,7 @@ public LegacyTexturedButtonWidget(
 		int textureWidth,
 		int textureHeight,
 		ButtonWidget.PressAction pressAction,
-		Text message
+		net.minecraft.text.Text message
 	) {
 		super(x, y, width, height, null, pressAction, message);
 
@@ -45,7 +45,7 @@ public LegacyTexturedButtonWidget(
 	}
 
 	@Override
-	public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+    public void drawIcon(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
 		int v = this.v;
 		if (!this.isInteractable()) {
 			v += this.hoveredVOffset * 2;
@@ -65,17 +65,14 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
 			this.textureWidth,
 			this.textureHeight
 		);
-		if (this.isHovered()) {
-			context.setCursor(this.isInteractable() ? StandardCursors.POINTING_HAND : StandardCursors.NOT_ALLOWED);
-		}
 	}
 
-	public static Builder legacyTexturedBuilder(Text message, ButtonWidget.PressAction onPress) {
+    public static Builder legacyTexturedBuilder(net.minecraft.text.Text message, ButtonWidget.PressAction onPress) {
 		return new Builder(message, onPress);
 	}
 
 	public static class Builder {
-		private final Text message;
+		private final net.minecraft.text.Text message;
 		private final ButtonWidget.PressAction onPress;
 
 		private int x;
@@ -93,7 +90,7 @@ public static class Builder {
 		private int textureWidth;
 		private int textureHeight;
 
-		public Builder(Text message, PressAction onPress) {
+		public Builder(net.minecraft.text.Text message, PressAction onPress) {
 			this.message = message;
 			this.onPress = onPress;
 		}

src/main/java/com/terraformersmc/modmenu/gui/widget/ModMenuButtonWidget.java

@@ -9,8 +9,8 @@
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.text.Text;
 
-public class ModMenuButtonWidget extends ButtonWidget {
-	public ModMenuButtonWidget(int x, int y, int width, int height, Text text, Screen screen) {
+public class ModMenuButtonWidget extends ButtonWidget.Text {
+	public ModMenuButtonWidget(int x, int y, int width, int height, net.minecraft.text.Text text, Screen screen) {
 		super(
 			x,
 			y,
@@ -23,8 +23,8 @@ public ModMenuButtonWidget(int x, int y, int width, int height, Text text, Scree
 	}
 
 	@Override
-	public void renderWidget(DrawContext drawContext, int mouseX, int mouseY, float delta) {
-		super.renderWidget(drawContext, mouseX, mouseY, delta);
+    public void drawIcon(DrawContext drawContext, int mouseX, int mouseY, float delta) {
+		super.drawIcon(drawContext, mouseX, mouseY, delta);
 		if (ModMenuConfig.BUTTON_UPDATE_BADGE.getValue() && ModMenu.areModUpdatesAvailable()) {
 			UpdateAvailableBadge.renderBadge(
 				drawContext,

src/main/java/com/terraformersmc/modmenu/gui/widget/UpdateCheckerTexturedButtonWidget.java

@@ -21,14 +21,14 @@ public UpdateCheckerTexturedButtonWidget(
 		int textureWidth,
 		int textureHeight,
 		ButtonWidget.PressAction pressAction,
-		Text message
+        net.minecraft.text.Text message
 	) {
 		super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, message);
 	}
 
 	@Override
-	public void renderWidget(DrawContext drawContext, int mouseX, int mouseY, float delta) {
-		super.renderWidget(drawContext, mouseX, mouseY, delta);
+	public void drawIcon(DrawContext drawContext, int mouseX, int mouseY, float delta) {
+		super.drawIcon(drawContext, mouseX, mouseY, delta);
 		if (ModMenuConfig.BUTTON_UPDATE_BADGE.getValue() && ModMenu.areModUpdatesAvailable()) {
 			UpdateAvailableBadge.renderBadge(drawContext, this.getX() + this.width - 5, this.getY() - 3);
 		}

src/main/java/com/terraformersmc/modmenu/gui/widget/entries/ModListEntry.java

@@ -205,7 +205,6 @@ public Identifier getIconTexture() {
 		if (this.iconLocation == null) {
 			this.iconLocation = Identifier.of(ModMenu.MOD_ID, mod.getId() + "_icon");
 			NativeImageBackedTexture icon = mod.getIcon(list.getFabricIconHandler(), 64 * this.client.options.getGuiScale().getValue());
-			icon.setFilter(false, false);
 			this.client.getTextureManager().registerTexture(this.iconLocation, icon);
 		}
 

src/main/java/com/terraformersmc/modmenu/mixin/MixinTitleScreen.java

@@ -10,7 +10,7 @@
 
 @Mixin(TitleScreen.class)
 public class MixinTitleScreen {
-	@ModifyArg(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/realms/gui/screen/RealmsNotificationsScreen;init(Lnet/minecraft/client/MinecraftClient;II)V"), method = "init", index = 2)
+	@ModifyArg(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/realms/gui/screen/RealmsNotificationsScreen;init(II)V"), method = "init", index = 1)
 	private int adjustRealmsHeight(int height) {
 		if (ModMenuConfig.MODIFY_TITLE_SCREEN.getValue() && ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.TitleMenuButtonStyle.CLASSIC) {
 			return height - 51;