Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 6 additions & 4 deletions src/main/java/dataloader/mixin/CreateWorldScreenMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
)});
}
}
4 changes: 3 additions & 1 deletion src/main/java/dataloader/mixin/MinecraftServerMixin.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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()
)
);
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/dataloader/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"pack.source.dataloader": "Data loader"
}
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down