diff --git a/gradle.properties b/gradle.properties index 7f061f5..a779d79 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/versions.html - minecraft_version=1.20-pre5 - yarn_mappings=1.20-pre5+build.2 - loader_version=0.14.20 + minecraft_version=1.20.4 + yarn_mappings=1.20.4+build.1 + loader_version=0.15.0 # Mod Properties - mod_version = 1.1.3+1.19.4-1.20-pre5 + mod_version = 1.1.4+1.20.2-1.20.4 maven_group = com.example archives_base_name = data-loader # Dependencies - fabric_version=0.81.3+1.20 + fabric_version=0.91.1+1.20.4 diff --git a/src/main/java/dataloader/mixin/CreateWorldScreenMixin.java b/src/main/java/dataloader/mixin/CreateWorldScreenMixin.java index 4e433e4..052ca83 100644 --- a/src/main/java/dataloader/mixin/CreateWorldScreenMixin.java +++ b/src/main/java/dataloader/mixin/CreateWorldScreenMixin.java @@ -3,6 +3,7 @@ import dataloader.DataLoader; import net.minecraft.client.gui.screen.world.CreateWorldScreen; import net.minecraft.resource.*; +import net.minecraft.util.path.SymlinkFinder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @@ -11,14 +12,15 @@ @Mixin(value = CreateWorldScreen.class, priority = 1001) public class CreateWorldScreenMixin { - @Redirect(method = "getScannedPack", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/VanillaDataPackProvider;createManager(Ljava/nio/file/Path;)Lnet/minecraft/resource/ResourcePackManager;")) + @Redirect(method = "getScannedPack", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/VanillaDataPackProvider;createManager(Ljava/nio/file/Path;Lnet/minecraft/util/path/SymlinkFinder;)Lnet/minecraft/resource/ResourcePackManager;")) private ResourcePackManager getScannedPacks( - Path dataPacksPath + Path dataPacksPath, SymlinkFinder symlinkFinder ) { - return new ResourcePackManager(new ResourcePackProvider[]{new VanillaDataPackProvider(), new FileResourcePackProvider(dataPacksPath, ResourceType.SERVER_DATA, ResourcePackSource.WORLD), new FileResourcePackProvider( + return new ResourcePackManager(new ResourcePackProvider[]{new VanillaDataPackProvider(symlinkFinder), new FileResourcePackProvider(dataPacksPath, ResourceType.SERVER_DATA, ResourcePackSource.WORLD, symlinkFinder), new FileResourcePackProvider( DataLoader.DATAPACKS_PATH, ResourceType.SERVER_DATA, - DataLoader.RESOURCE_PACK_SOURCE + DataLoader.RESOURCE_PACK_SOURCE, + symlinkFinder )}); } } diff --git a/src/main/java/dataloader/mixin/MinecraftServerMixin.java b/src/main/java/dataloader/mixin/MinecraftServerMixin.java index 24da5dd..f6fb0c7 100644 --- a/src/main/java/dataloader/mixin/MinecraftServerMixin.java +++ b/src/main/java/dataloader/mixin/MinecraftServerMixin.java @@ -1,6 +1,7 @@ package dataloader.mixin; import dataloader.DataLoader; +import net.minecraft.client.MinecraftClient; import net.minecraft.resource.*; import net.minecraft.resource.featuretoggle.FeatureSet; import net.minecraft.server.MinecraftServer; @@ -19,7 +20,8 @@ private static void loadDataPacks( new FileResourcePackProvider( DataLoader.DATAPACKS_PATH, ResourceType.SERVER_DATA, - DataLoader.RESOURCE_PACK_SOURCE + DataLoader.RESOURCE_PACK_SOURCE, + MinecraftClient.getInstance().getSymlinkFinder() ) ); } diff --git a/src/main/resources/assets/dataloader/lang/en_us.json b/src/main/resources/assets/dataloader/lang/en_us.json new file mode 100644 index 0000000..e1cfd80 --- /dev/null +++ b/src/main/resources/assets/dataloader/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "pack.source.dataloader": "Data loader" +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3822a8a..216f6ba 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,9 +24,9 @@ "dataloader.mixins.json" ], "depends": { - "fabricloader": ">=0.14.20", + "fabricloader": ">=0.15.0", "fabric": "*", - "minecraft": ">=1.19.4", + "minecraft": ">=1.20.2", "java": ">=17" }, "accessWidener" : "dataloader.accesswidener"