Update to latest biny

build.gradle

@@ -1,18 +1,16 @@
 plugins {
-	id 'fabric-loom' version '1.7.2'
-	id 'babric-loom-extension' version '1.7.3'
+	id 'fabric-loom' version '1.7.3'
+	id 'babric-loom-extension' version '1.7.4'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
 repositories {
-
 	// Add repositories to retrieve artifacts from in here.
 	// You should only use this when depending on other mods because
 	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.

gradle.properties

@@ -7,5 +7,5 @@ maven_group=net.glasslauncher.mods
 archives_base_name=modmenu
 
 minecraft_version=b1.7.3
-yarn_mappings=b1.7.3+cbcfb39
+yarn_mappings=b1.7.3+d90abe9
 loader_version=0.14.24-babric.1

src/main/java/io/github/prospector/modmenu/ModMenu.java

@@ -13,11 +13,10 @@
 import net.fabricmc.loader.api.ModContainer;
 import net.fabricmc.loader.api.metadata.CustomValue;
 import net.fabricmc.loader.api.metadata.ModMetadata;
-import net.minecraft.class_285;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
-
+import net.minecraft.client.resource.pack.TexturePack;
 import java.text.NumberFormat;
 import java.util.*;
 import java.util.function.Function;
@@ -33,7 +32,7 @@ public class ModMenu implements ClientModInitializer {
 	public static final LinkedListMultimap<ModContainer, ModContainer> PARENT_MAP = LinkedListMultimap.create();
 	private static ImmutableMap<String, Function<Screen, ? extends Screen>> configScreenFactories = ImmutableMap.of();
 	private static int libraryCount = 0;
-	public static class_285 currentTexturePack;
+	public static TexturePack currentTexturePack;
 
 	public static boolean hasConfigScreenFactory(String modid) {
 		return configScreenFactories.containsKey(modid);

src/main/java/io/github/prospector/modmenu/gui/ModListEntry.java

@@ -120,15 +120,19 @@ public ModMetadata getMetadata() {
 	}
 
 	public void bindIconTexture() {
-		if (this.iconLocation == null) {
-			BufferedImage icon = this.createIcon();
-			if (icon != null) {
-				this.iconLocation = this.client.textureManager.method_1088(icon);
-			} else {
-				this.iconLocation = this.client.textureManager.getTextureId(UNKNOWN_ICON);
+		try {
+			if (this.iconLocation == null) {
+				BufferedImage icon = this.createIcon();
+				if (icon != null) {
+					this.iconLocation = this.client.textureManager.load(icon);
+				} else {
+					this.iconLocation = this.client.textureManager.getTextureId(UNKNOWN_ICON);
+				}
 			}
+			this.client.textureManager.bindTexture(this.iconLocation);
+		} catch (Exception e) {
+			System.out.println(e.getMessage());
 		}
-		this.client.textureManager.bindTexture(this.iconLocation);
 	}
 
 	public void deleteTexture() {

src/main/java/io/github/prospector/modmenu/gui/ModMenuTexturedButtonWidget.java

@@ -63,7 +63,7 @@ public void render(Minecraft mc, int mouseX, int mouseY) {
 			tess.vertex(x, y, this.zOffset, (float) u * uScale, (float) adjustedV * vScale);
 			tess.draw();
 
-			this.method_1188(mc, mouseX, mouseY);
+			this.renderBackground(mc, mouseX, mouseY);
 			if (!this.active) {
 				this.drawCenteredTextWithShadow(font, this.text, this.x + this.width / 2, this.y + (this.height - 8) / 2, 0xffa0a0a0);
 			} else if (hovered) {

src/main/java/io/github/prospector/modmenu/mixin/MixinGameMenuScreen.java

@@ -31,16 +31,16 @@ public void drawMenuButton(CallbackInfo info) {
 			this.buttons.add(new ModMenuButtonWidget(101, this.width / 2 + 2, this.height / 4 + 72 - 16, 98, 20, "Mods (" + ModMenu.getFormattedModCount() + " loaded)"));
 		}
 
-		if (ModMenu.currentTexturePack != this.minecraft.field_2768.field_1175) {
-			ModMenu.currentTexturePack = this.minecraft.field_2768.field_1175;
-			this.minecraft.worldRenderer.method_1537();
+		if (ModMenu.currentTexturePack != this.minecraft.texturePacks.selected) {
+			ModMenu.currentTexturePack = this.minecraft.texturePacks.selected;
+			this.minecraft.worldRenderer.reload();
 		}
 	}
 
 	@Inject(method = "buttonClicked", at = @At("HEAD"))
 	private void onActionPerformed(ButtonWidget button, CallbackInfo ci) {
 		if (button.id == 100) {
-			ModMenu.currentTexturePack = this.minecraft.field_2768.field_1175;
+			ModMenu.currentTexturePack = this.minecraft.texturePacks.selected;
 			minecraft.setScreen(new PackScreen(this));
 		}
 		if (button.id == 101) {

src/main/java/io/github/prospector/modmenu/mixin/MixinTexturePacks.java

@@ -1,19 +1,19 @@
 package io.github.prospector.modmenu.mixin;
 
 import io.github.prospector.modmenu.ModMenu;
+import net.minecraft.client.resource.pack.TexturePack;
+import net.minecraft.client.resource.pack.ZippedTexturePack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.io.InputStream;
-import net.minecraft.class_285;
-import net.minecraft.class_592;
 
-@Mixin({class_285.class, class_592.class})
+@Mixin({TexturePack.class, ZippedTexturePack.class})
 public class MixinTexturePacks {
 
-	@Inject(method = "method_976", at = @At(value = "INVOKE", target = "Ljava/lang/Class;getResourceAsStream(Ljava/lang/String;)Ljava/io/InputStream;", remap = false), cancellable = true)
+	@Inject(method = "getResource", at = @At(value = "INVOKE", target = "Ljava/lang/Class;getResourceAsStream(Ljava/lang/String;)Ljava/io/InputStream;", remap = false), cancellable = true)
 	private void onGetResource(String resource, CallbackInfoReturnable<InputStream> ci) {
 		InputStream in = ModMenu.class.getClassLoader().getResourceAsStream(resource);
 		if (in != null)

src/main/java/io/github/prospector/modmenu/mixin/MixinTitleScreen.java

@@ -39,7 +39,7 @@ public void drawMenuButton(CallbackInfo info) {
 	@Inject(method = "buttonClicked", at = @At("HEAD"))
 	private void onActionPerformed(ButtonWidget button, CallbackInfo ci) {
 		if (button.id == 1 || button.id == 2) {
-			ModMenu.currentTexturePack = this.minecraft.field_2768.field_1175;
+			ModMenu.currentTexturePack = this.minecraft.texturePacks.selected;
 		}
 		if (button.id == 100) {
 			minecraft.setScreen(new ModListScreen(this));