diff --git a/build.gradle b/build.gradle index 24c6d8c..13d01ba 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 52b7178..3397f1a 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.21 - yarn_mappings=1.21+build.9 - loader_version=0.16.2 + minecraft_version=25w14craftmine + yarn_mappings=25w14craftmine+build.5 + loader_version=0.16.14 # Mod Properties - mod_version = 1.1.6+1.21 + mod_version = 1.1.7+25w14craftmine maven_group = com.example archives_base_name = data-loader # Dependencies - fabric_version=0.102.0+1.21 + fabric_version=0.119.10+25w14craftmine diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d18421..d6e308a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/dataloader/mixin/MinecraftServerMixin.java b/src/main/java/dataloader/mixin/MinecraftServerMixin.java index 267ba29..a8ec5fd 100644 --- a/src/main/java/dataloader/mixin/MinecraftServerMixin.java +++ b/src/main/java/dataloader/mixin/MinecraftServerMixin.java @@ -4,6 +4,7 @@ import dataloader.DataLoader; import net.fabricmc.fabric.impl.resource.loader.ModResourcePackCreator; import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.class_10958; import net.minecraft.resource.*; import net.minecraft.resource.featuretoggle.FeatureSet; import net.minecraft.server.MinecraftServer; @@ -16,9 +17,9 @@ import java.util.ArrayList; import java.util.Collection; -@Mixin(value = MinecraftServer.class, priority = 1001) +@Mixin(value = class_10958.class, priority = 1001) public class MinecraftServerMixin { - @Inject(method = "loadDataPacks(Lnet/minecraft/resource/ResourcePackManager;Ljava/util/Collection;Lnet/minecraft/resource/featuretoggle/FeatureSet;Z)Lnet/minecraft/resource/DataConfiguration;", at = @At("HEAD")) + @Inject(method = "method_68919(Lnet/minecraft/resource/ResourcePackManager;Ljava/util/Collection;Lnet/minecraft/resource/featuretoggle/FeatureSet;Z)Lnet/minecraft/resource/DataConfiguration;", at = @At("HEAD")) private static void loadDataPacks( ResourcePackManager resourcePackManager, Collection enabledProfiles, FeatureSet enabledFeatures, boolean allowEnabling, CallbackInfoReturnable cir ) { @@ -35,7 +36,7 @@ private static void loadDataPacks( resourcePackManager.scanPacks(); } - @Inject(method = "createDataPackSettings", at = @At("HEAD")) + @Inject(method = "method_68920", at = @At("HEAD")) private static void createDataPackSettings(ResourcePackManager dataPackManager, boolean allowEnabling, CallbackInfoReturnable cir) { ArrayList enabledPacks = new ArrayList<>(); if (!DataLoader.CONFIG.onlyLoadSpecified) { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 04d4543..110affe 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.15.0", + "fabricloader": ">=0.16.11", "fabric": "*", - "minecraft": ">=1.21", + "minecraft": "1.21.6-alpha.25.14.craftmine", "java": ">=17" }, "accessWidener" : "dataloader.accesswidener"