Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to datagen to use FabricDataOutput #3

Open
wants to merge 1 commit into
base: 1.20.1
Choose a base branch
from
Open

Fixes to datagen to use FabricDataOutput #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G

maven_group = plus.dragons.createdragonlib

mod_version = 1.4.0
mod_version = 1.5.0

# https://fabricmc.net/develop
minecraft_version = 1.20.1
Expand Down
Empty file modified gradlew
100644 → 100755
View file
Open in desktop
Empty file.
19 changes: 11 additions & 8 deletions src/main/java/plus/dragons/createdragonlib/advancement/AdvancementFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
package plus.dragons.createdragonlib.advancement;

import com.simibubi.create.foundation.advancement.AllAdvancements;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
import net.minecraft.data.PackOutput;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator.Pack;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import plus.dragons.createdragonlib.advancement.critereon.TriggerFactory;

public class AdvancementFactory {
private final String modid;
private final AdvancementGen advancementGen;
private final TriggerFactory triggerFactory = new TriggerFactory();
private final Runnable preTask;
private final String name;
private final AdvancementGen advancementGen;

private AdvancementFactory(String name, String modid, Runnable preTask) {
this.name = name;
this.modid = modid;
this.advancementGen = new AdvancementGen(name, modid);
this.preTask = preTask;
this.advancementGen = new AdvancementGen(name, modid);
}

public static AdvancementFactory create(String name, String modid, Runnable preTask) {
Expand All @@ -29,11 +31,12 @@ public TriggerFactory getTriggerFactory() {
return triggerFactory;
}

public void datagen(final FabricDataGenerator datagen) {
public void datagen(final Pack pack) {
preTask.run();
advancementGen.generator = datagen;
FabricDataGenerator.Pack pack = datagen.createPack();
pack.addProvider((PackOutput output) -> advancementGen);
pack.addProvider((FabricDataOutput output) -> {
advancementGen.output = output;
return advancementGen;
});
}

public void register() {
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/plus/dragons/createdragonlib/advancement/AdvancementGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
package plus.dragons.createdragonlib.advancement;

import com.google.common.collect.Sets;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.minecraft.advancements.Advancement;
import net.minecraft.data.CachedOutput;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import net.minecraft.data.PackOutput.PathProvider;
import net.minecraft.data.DataProvider;
import net.minecraft.resources.ResourceLocation;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.ApiStatus;
import plus.dragons.createdragonlib.mixin.DataGeneratorAccessor;

import java.nio.file.Path;
import java.util.Set;
Expand All @@ -21,7 +23,7 @@ class AdvancementGen implements DataProvider {
private static final Logger LOGGER = LogManager.getLogger();
private final String name;
private final String modid;
DataGenerator generator;
FabricDataOutput output;

AdvancementGen(String name, String modid) {
this.name = name;
Expand All @@ -30,17 +32,15 @@ class AdvancementGen implements DataProvider {

@Override
public CompletableFuture<?> run(CachedOutput cache) {
Path path = ((DataGeneratorAccessor) this.generator).getRootOutputFolder();
PathProvider pathProvider = output.createPathProvider(PackOutput.Target.DATA_PACK, "advancements");

return CompletableFuture.runAsync(() -> {
Set<ResourceLocation> set = Sets.newHashSet();
Consumer<Advancement> consumer = advancement -> {
if (!set.add(advancement.getId()))
var id = advancement.getId();
if (!set.add(id))
throw new IllegalStateException("Duplicate advancement " + advancement.getId());
Path advancementPath = path.resolve("data/"
+ advancement.getId().getNamespace() + "/advancements/"
+ advancement.getId().getPath() + ".json"
);
Path advancementPath = pathProvider.json(id);
DataProvider.saveStable(cache, advancement.deconstruct().serializeToJson(), advancementPath);
};
var advancements = AdvancementHolder.ENTRIES_MAP.get(modid);
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/plus/dragons/createdragonlib/lang/LangFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import com.google.gson.JsonObject;
import com.simibubi.create.foundation.ponder.PonderLocalization;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
import net.minecraft.data.PackOutput;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator.Pack;
import plus.dragons.createdragonlib.advancement.AdvancementHolder;

import java.util.Collections;
Expand All @@ -26,10 +26,11 @@ public static LangFactory create(String name, String modid) {
* Register the {@link LangMerger} instance to {@link FabricDataGenerator}. <br>
* Should be called in the mod's main class' constructor. <br>
*/
public void datagen(final FabricDataGenerator datagen) {
langMerger.dataGenerator = datagen;
FabricDataGenerator.Pack pack = datagen.createPack();
pack.addProvider((PackOutput output) -> langMerger);
public void datagen(final Pack pack) {
pack.addProvider((FabricDataOutput output) -> {
langMerger.output = output;
return langMerger;
});
}

/**
Expand Down
17 changes: 9 additions & 8 deletions src/main/java/plus/dragons/createdragonlib/lang/LangMerger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
import com.simibubi.create.foundation.ponder.PonderScene;
import com.simibubi.create.foundation.utility.FilesHelper;
import net.minecraft.data.CachedOutput;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import net.minecraft.data.PackOutput.PathProvider;
import net.minecraft.data.DataProvider;
import net.minecraft.util.GsonHelper;
import net.minecraft.resources.ResourceLocation;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import org.apache.commons.lang3.mutable.MutableBoolean;
import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.commons.lang3.mutable.MutableObject;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.ApiStatus;
import plus.dragons.createdragonlib.mixin.DataGeneratorAccessor;

import java.io.*;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -76,7 +78,7 @@ class LangMerger implements DataProvider {
private final Map<String, MutableInt> existingButActuallyMissingTranslationTally = new HashMap<>();

final List<LangPartial> partials = new ArrayList<>();
DataGenerator dataGenerator;
FabricDataOutput output;
List<String> ignore = new ArrayList<>();

LangMerger(String name, String modid) {
Expand All @@ -91,9 +93,8 @@ public String getName() {

@Override
public CompletableFuture<?> run(CachedOutput cache) {
Path path = ((DataGeneratorAccessor) this.dataGenerator).getRootOutputFolder()
.resolve("assets/" + modid + "/lang/" + "en_us.json");

Path path = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "lang")
.json(new ResourceLocation(modid, "en_us"));

return CompletableFuture.runAsync(() -> {
for(Pair<String, JsonElement> pair : getAllLocalizationFiles()) {
Expand Down Expand Up @@ -129,8 +130,8 @@ public CompletableFuture<?> run(CachedOutput cache) {
save(cache, mergedLangData, -1, path, "Merging en_us.json with hand-written lang entries...");
for(Entry<String, List<Object>> localization : populatedLangData.entrySet()) {
String key = localization.getKey();
Path populatedLangPath = ((DataGeneratorAccessor) this.dataGenerator).getRootOutputFolder()
.resolve("assets/" + modid + "/lang/unfinished/" + key);
Path populatedLangPath = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "lang/unfinished")
.json(new ResourceLocation(modid, key.substring(0, key.lastIndexOf("."))));
save(cache, localization.getValue(),
missingTranslationTally.get(key).intValue() + existingButActuallyMissingTranslationTally.get(key).intValue(),
populatedLangPath, "Populating " + key + " with missing entries...");
Expand Down