Port to 1.20.1

Author: zOnlyKroks

build.gradle

@@ -29,7 +29,7 @@ dependencies {
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    include modImplementation("dev.isxander:yet-another-config-lib:3.4.2+1.20.5-fabric")
+    include modImplementation("dev.isxander:yet-another-config-lib:3.5.0+1.21-fabric")
 
     modRuntimeOnly modCompileOnly("com.terraformersmc:modmenu:${project.modmenu_version}")
 }

gradle.properties

@@ -2,15 +2,15 @@
 org.gradle.jvmargs=-Xmx4G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.20.5
-yarn_mappings=1.20.5+build.1
+minecraft_version=1.21
+yarn_mappings=1.21+build.7
 loader_version=0.15.11
 # Mod Properties
-mod_version=0.0.14-1.20.5-alpha
+mod_version=0.0.14-1.21-alpha
 maven_group=de.zonlykroks
 archives_base_name=P2P
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.97.8+1.20.5
+fabric_version=0.100.4+1.21
 
-modmenu_version=10.0.0-beta.1
+modmenu_version=11.0.1

src/main/java/de/zonlykroks/p2p/client/YACLImageReloadListenerFabric.java

@@ -15,7 +15,7 @@
 public class YACLImageReloadListenerFabric implements IdentifiableResourceReloadListener {
     @Override
     public Identifier getFabricId() {
-        return new Identifier("sounds", "image_reload_listener");
+        return Identifier.of("sounds", "image_reload_listener");
     }
 
     @Override

src/main/java/de/zonlykroks/p2p/client/screen/CreateScreen.java

@@ -212,7 +212,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
         if(worldIcon == null || worldIcon.isEmpty()) {
-            context.drawTexture(new Identifier("textures/misc/unknown_server.png"), 10, 10 + textRenderer.fontHeight + 10, 0, 0, startX - 15, startX - 15);
+            context.drawTexture(Identifier.ofVanilla("textures/misc/unknown_server.png"), 10, 10 + textRenderer.fontHeight + 10, 0, 0, startX - 15, startX - 15);
         } else if(worldIcon != null){
             context.drawTexture(worldIcon.get().getTextureId(), 15, textRenderer.fontHeight + 25, 0, 0, startX - 25, startX - 25);
         }

src/main/java/de/zonlykroks/p2p/client/screen/P2PScreen.java

@@ -73,8 +73,8 @@ private DynamicGridWidget getDynamicGridWidget(int fontHeight) {
         assert this.client != null;
         DynamicGridWidget grid = new DynamicGridWidget(15, 10 + fontHeight + 10, width - 20, height - 20 - fontHeight - 10 - 20);
 
-        ImageButtonWidget joinScreenButton = new ImageButtonWidget(0, 0, 0, 0, Text.translatable("p2p.screen.btn.join"), new Identifier("p2p", "textures/gui/join.webp"));
-        ImageButtonWidget createScreenButton = new ImageButtonWidget(0, 0, 0, 0, Text.translatable("p2p.screen.btn.create"), new Identifier("p2p", "textures/gui/create.webp"));
+        ImageButtonWidget joinScreenButton = new ImageButtonWidget(0, 0, 0, 0, Text.translatable("p2p.screen.btn.join"), Identifier.of("p2p", "textures/gui/join.webp"));
+        ImageButtonWidget createScreenButton = new ImageButtonWidget(0, 0, 0, 0, Text.translatable("p2p.screen.btn.create"), Identifier.of("p2p", "textures/gui/create.webp"));
 
         createScreenButton.setClickEvent( (btn) -> this.client.setScreen(new CreateScreen(this, false)));
 

src/main/java/de/zonlykroks/p2p/config/P2PYACLConfig.java

@@ -55,7 +55,7 @@ public class P2PYACLConfig {
     public CustomGameModeEnum lanGameMode = CustomGameModeEnum.SURVIVAL;
 
     public static final ConfigClassHandler<P2PYACLConfig> HANDLER = ConfigClassHandler.createBuilder(P2PYACLConfig.class)
-            .id(new Identifier("p2p", "config"))
+            .id(Identifier.of("p2p", "config"))
             .serializer(config -> GsonConfigSerializerBuilder.create(config)
                     .setPath(CONFIG_PATH)
                     .build())

src/main/java/de/zonlykroks/p2p/util/ConnectionProgress.java

@@ -40,24 +40,24 @@ public void tryIncrementIndex() {
     }
 
     public static Identifier getCheckmark() {
-        return new Identifier("icon/checkmark");
+        return Identifier.ofVanilla("icon/checkmark");
     }
 
 
     public static Identifier getPingUnknown() {
-        return new Identifier("icon/ping_unknown");
+        return Identifier.ofVanilla("icon/ping_unknown");
     }
 
     public static Identifier getFirstPing() {
-        return new Identifier("icon/ping_1");
+        return Identifier.ofVanilla("icon/ping_1");
     }
 
     public static List<Identifier> getPings() {
-        final Identifier PING_1_ICON_TEXTURE = new Identifier("icon/ping_1");
-        final Identifier PING_2_ICON_TEXTURE = new Identifier("icon/ping_2");
-        final Identifier PING_3_ICON_TEXTURE = new Identifier("icon/ping_3");
-        final Identifier PING_4_ICON_TEXTURE = new Identifier("icon/ping_4");
-        final Identifier PING_5_ICON_TEXTURE = new Identifier("icon/ping_5");
+        final Identifier PING_1_ICON_TEXTURE = Identifier.ofVanilla("icon/ping_1");
+        final Identifier PING_2_ICON_TEXTURE = Identifier.ofVanilla("icon/ping_2");
+        final Identifier PING_3_ICON_TEXTURE = Identifier.ofVanilla("icon/ping_3");
+        final Identifier PING_4_ICON_TEXTURE = Identifier.ofVanilla("icon/ping_4");
+        final Identifier PING_5_ICON_TEXTURE = Identifier.ofVanilla("icon/ping_5");
         return List.of(PING_1_ICON_TEXTURE, PING_2_ICON_TEXTURE, PING_3_ICON_TEXTURE, PING_4_ICON_TEXTURE, PING_5_ICON_TEXTURE);
     }