Skip to content

Commit a04caa7

Browse files
committed
Implement #2
- Mod now works for 1.19.3 and 1.19.4 - `datapacks` folder is now in game dir
1 parent 5ad2e47 commit a04caa7

9 files changed

Lines changed: 33 additions & 26 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '0.10-SNAPSHOT'
2+
id 'fabric-loom' version '1.1-SNAPSHOT'
33
id 'maven-publish'
44
}
55

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/versions.html
6-
minecraft_version=1.18.1
7-
yarn_mappings=1.18.1+build.1
8-
loader_version=0.12.12
6+
minecraft_version=1.19.4
7+
yarn_mappings=1.19.4+build.2
8+
loader_version=0.14.19
99

1010
# Mod Properties
11-
mod_version = 1.0.0
11+
mod_version = 1.1.0
1212
maven_group = com.example
1313
archives_base_name = data-loader
1414

1515
# Dependencies
16-
fabric_version=0.44.0+1.18
16+
fabric_version=0.80.0+1.19.4

gradle/wrapper/gradle-wrapper.jar

-6.56 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
4-
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
5+
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 6 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/dataloader/DataLoader.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,26 @@
33
import net.fabricmc.api.ModInitializer;
44
import net.fabricmc.loader.api.FabricLoader;
55
import net.minecraft.resource.ResourcePackSource;
6+
import net.minecraft.text.Text;
7+
import net.minecraft.util.Formatting;
68
import org.apache.logging.log4j.LogManager;
79
import org.apache.logging.log4j.Logger;
810

911
import java.io.IOException;
1012
import java.nio.file.Files;
1113
import java.nio.file.Path;
14+
import java.util.function.UnaryOperator;
1215

1316
public class DataLoader implements ModInitializer {
14-
public static final ResourcePackSource RESOURCE_PACK_SOURCE = ResourcePackSource.nameAndSource("pack.source.dataloader");
15-
public static final Path DATAPACKS_PATH = FabricLoader.getInstance().getConfigDir().resolve("datapacks");
17+
public static UnaryOperator<Text> getSourceTextSupplier(String translationKey) {
18+
Text text = Text.translatable(translationKey);
19+
return (name) -> {
20+
return Text.translatable("pack.nameAndSource", new Object[]{name, text}).formatted(Formatting.GRAY);
21+
};
22+
}
23+
24+
public static final ResourcePackSource RESOURCE_PACK_SOURCE = ResourcePackSource.create(getSourceTextSupplier("pack.source.dataloader"), true);
25+
public static final Path DATAPACKS_PATH = FabricLoader.getInstance().getGameDir().resolve("datapacks");
1626
public static final Logger LOGGER = LogManager.getLogger("dataloader");
1727

1828
@Override

src/main/java/dataloader/mixin/MinecraftServerMixin.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import dataloader.DataLoader;
44
import net.minecraft.resource.*;
5+
import net.minecraft.resource.featuretoggle.FeatureSet;
56
import net.minecraft.server.MinecraftServer;
67
import org.spongepowered.asm.mixin.Mixin;
78
import org.spongepowered.asm.mixin.injection.At;
@@ -12,14 +13,12 @@
1213
public class MinecraftServerMixin {
1314
@Inject(method = "loadDataPacks", at = @At("HEAD"))
1415
private static void loadDataPacks(
15-
ResourcePackManager resourcePackManager,
16-
DataPackSettings dataPackSettings,
17-
boolean safeMod,
18-
CallbackInfoReturnable<DataPackSettings> info
16+
ResourcePackManager resourcePackManager, DataPackSettings dataPackSettings, boolean safeMode, FeatureSet enabledFeatures, CallbackInfoReturnable<DataConfiguration> cir
1917
) {
2018
resourcePackManager.providers.add(
2119
new FileResourcePackProvider(
22-
DataLoader.DATAPACKS_PATH.toFile(),
20+
DataLoader.DATAPACKS_PATH,
21+
ResourceType.SERVER_DATA,
2322
DataLoader.RESOURCE_PACK_SOURCE
2423
)
2524
);

src/main/resources/fabric.mod.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"dataloader.mixins.json"
2525
],
2626
"depends": {
27-
"fabricloader": ">=0.11.3",
27+
"fabricloader": ">=0.14.19",
2828
"fabric": "*",
29-
"minecraft": "1.18.x",
29+
"minecraft": "~1.19.3",
3030
"java": ">=17"
3131
},
3232
"accessWidener" : "dataloader.accesswidener"

0 commit comments

Comments
 (0)