Port to Minecraft 1.19.3

Common/src/main/java/net/darkhax/openloader/packs/OpenLoaderRepositorySource.java

@@ -2,9 +2,10 @@
 
 import net.darkhax.openloader.Constants;
 import net.darkhax.openloader.config.ConfigSchema;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
 import net.minecraft.server.packs.FilePackResources;
-import net.minecraft.server.packs.FolderPackResources;
-import net.minecraft.server.packs.PackResources;
+import net.minecraft.server.packs.PathPackResources;
 import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.repository.PackSource;
 import net.minecraft.server.packs.repository.RepositorySource;
@@ -15,10 +16,10 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
-import java.util.function.Supplier;
 
 public class OpenLoaderRepositorySource implements RepositorySource {
 
+    private static final PackSource SOURCE = PackSource.create((name) -> Component.translatable("pack.nameAndSource", name, Component.translatable("pack.source.openloader")).withStyle(ChatFormatting.GREEN), true);
     private final RepoType type;
     private final List<File> directories;
     private final ConfigSchema.PackConfig config;
@@ -53,7 +54,7 @@ public OpenLoaderRepositorySource(RepoType type, ConfigSchema.PackConfig config,
     }
 
     @Override
-    public void loadPacks(Consumer<Pack> consumer, Pack.PackConstructor packConstructor) {
+    public void loadPacks(Consumer<Pack> consumer) {
 
         if (this.config.enabled) {
 
@@ -73,7 +74,9 @@ public void loadPacks(Consumer<Pack> consumer, Pack.PackConstructor packConstruc
                     if (isArchivePack || isFolderPack) {
 
                         final String packName = this.type.getPath() + "/" + packCandidate.getName();
-                        final Pack pack = Pack.create(packName, true, createPackSupplier(packCandidate), packConstructor, Pack.Position.TOP, PackSource.BUILT_IN);
+                        final Component displayName = Component.literal(packName);
+
+                        final Pack pack = Pack.readMetaAndCreate(packName, displayName, true, createPackSupplier(packCandidate), this.type.getPackType(), Pack.Position.TOP, SOURCE);
 
                         if (pack != null) {
 
@@ -102,9 +105,9 @@ public void loadPacks(Consumer<Pack> consumer, Pack.PackConstructor packConstruc
         }
     }
 
-    private Supplier<PackResources> createPackSupplier (File packFile) {
+    private Pack.ResourcesSupplier createPackSupplier (File packFile) {
 
-        return () -> packFile.isDirectory() ? new FolderPackResources(packFile) : new FilePackResources(packFile);
+        return name -> packFile.isDirectory() ? new PathPackResources(name, packFile.toPath(), false) : new FilePackResources(name, packFile, false);
     }
 
     private boolean isArchivePack(File candidate, boolean logIssues) {

Common/src/main/java/net/darkhax/openloader/packs/RepoType.java

@@ -1,22 +1,32 @@
 package net.darkhax.openloader.packs;
 
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.repository.PackSource;
+
 import java.io.File;
 import java.nio.file.Path;
 
 public enum RepoType {
 
-    DATA("Data Pack", "data"),
-    RESOURCES("Resource Pack", "resources");
+    DATA(PackType.SERVER_DATA, "Data Pack", "data"),
+    RESOURCES(PackType.CLIENT_RESOURCES, "Resource Pack", "resources");
 
+    final PackType type;
     final String displayName;
     final String path;
 
-    RepoType(String name, String path) {
+    RepoType(PackType type, String name, String path) {
 
+        this.type = type;
         this.displayName = name;
         this.path = path;
     }
 
+    public PackType getPackType() {
+
+        return this.type;
+    }
+
     public String getName() {
 
         return this.displayName;

Common/src/main/resources/assets/openloader/lang/en_us.json

@@ -0,0 +1,3 @@
+{
+  "pack.source.openloader": "OpenLoader"
+}

Common/src/main/resources/pack.mcmeta

@@ -1,6 +1,8 @@
 {
   "pack": {
     "description": "${mod_description}",
-    "pack_format": 8
+    "pack_format": 10,
+    "forge:resource_pack_format": 12,
+    "forge:data_pack_format": 10
   }
 }

Fabric/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'fabric-loom' version '0.12-SNAPSHOT'
-    id 'net.darkhax.curseforgegradle' version '1.0.7'
+    id 'fabric-loom' version '1.0-SNAPSHOT'
+    id 'net.darkhax.curseforgegradle' version '1.0.11'
     id 'net.darkhax.tweedle' version '1.0.5'
     id 'idea'
 }

Fabric/src/main/java/net/darkhax/openloader/mixin/MixinModResourcePackCreator.java

@@ -40,12 +40,12 @@ else if (type == PackType.CLIENT_RESOURCES) {
         }
     }
 
-    @Inject(method = "loadPacks(Ljava/util/function/Consumer;Lnet/minecraft/server/packs/repository/Pack$PackConstructor;)V", at = @At("RETURN"))
-    private void loadPacks(Consumer<Pack> consumer, Pack.PackConstructor factory, CallbackInfo callback) {
+    @Inject(method = "loadPacks(Ljava/util/function/Consumer;)V", at = @At("RETURN"))
+    private void loadPacks(Consumer<Pack> consumer, CallbackInfo callback) {
 
         if (this.newSource != null) {
 
-            this.newSource.loadPacks(consumer, factory);
+            this.newSource.loadPacks(consumer);
         }
     }
 }

Fabric/src/main/resources/fabric.mod.json

@@ -28,9 +28,9 @@
     "${mod_id}.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.9",
+    "fabricloader": ">=0.14.12",
     "fabric": "*",
-    "minecraft": "1.19.x",
+    "minecraft": "1.19.3",
     "java": ">=17"
   },
   "custom": {

Forge/build.gradle

@@ -1,19 +1,19 @@
 buildscript {
     repositories {
-        maven { url 'https://maven.minecraftforge.net' }
-        maven { url 'https://plugins.gradle.org/m2/' }
-        maven { url 'https://repo.spongepowered.org/repository/maven-public' }
+        maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-        classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
-        classpath group: 'net.darkhax.curseforgegradle', name: 'CurseForgeGradle', version: '1.0.7'
-        classpath group: 'net.darkhax.tweedle', name: 'Tweedle', version: '1.0.5'
+        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
     }
 }
 
-apply plugin: 'net.minecraftforge.gradle'
+plugins {
+    id 'net.minecraftforge.gradle' version '5.1.+'
+    id 'net.darkhax.curseforgegradle' version '1.0.11'
+    id 'net.darkhax.tweedle' version '1.0.5'
+}
+
 apply from: '../gradle/patreon.gradle'
 
 archivesBaseName = "${mod_name}-Forge-${minecraft_version}"

Forge/src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[43,)"
+loaderVersion = "[44,)"
 license = "${mod_license}"
 issueTrackerURL = "${mod_issues}"
 

gradle.properties

@@ -1,16 +1,16 @@
 # Project
-version=15.0
+version=16.0
 group=net.darkhax.openloader
 
 # Common
-minecraft_version=1.19.2
+minecraft_version=1.19.3
 
 # Forge
-forge_version=43.1.1
+forge_version=44.1.2
 
 # Fabric
-fabric_version=0.60.0+1.19.2
-fabric_loader_version=0.14.9
+fabric_version=0.72.0+1.19.3
+fabric_loader_version=0.14.12
 
 # Mod options
 mod_name=OpenLoader

settings.gradle

@@ -1,6 +1,10 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
+        maven {
+            name = 'Forge'
+            url = 'https://maven.minecraftforge.net/'
+        }
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'