aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/dev/mayaqq/ygasi/registry
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/dev/mayaqq/ygasi/registry')
-rw-r--r--src/main/java/dev/mayaqq/ygasi/registry/dataGen/DataGenRegistry.java (renamed from src/main/java/dev/mayaqq/ygasi/registry/advancements/dataGen/DataGenRegistry.java)5
-rw-r--r--src/main/java/dev/mayaqq/ygasi/registry/dataGen/advancements/AdvancementProvider.java (renamed from src/main/java/dev/mayaqq/ygasi/registry/advancements/dataGen/AdvancementProvider.java)6
-rw-r--r--src/main/java/dev/mayaqq/ygasi/registry/dataGen/advancements/Advancements.java (renamed from src/main/java/dev/mayaqq/ygasi/registry/advancements/Advancements.java)7
-rw-r--r--src/main/java/dev/mayaqq/ygasi/registry/dataGen/recipes/YgasiRecipes.java28
4 files changed, 41 insertions, 5 deletions
diff --git a/src/main/java/dev/mayaqq/ygasi/registry/advancements/dataGen/DataGenRegistry.java b/src/main/java/dev/mayaqq/ygasi/registry/dataGen/DataGenRegistry.java
index 9bba67d..8cd9b6e 100644
--- a/src/main/java/dev/mayaqq/ygasi/registry/advancements/dataGen/DataGenRegistry.java
+++ b/src/main/java/dev/mayaqq/ygasi/registry/dataGen/DataGenRegistry.java
@@ -1,5 +1,7 @@
-package dev.mayaqq.ygasi.registry.advancements.dataGen;
+package dev.mayaqq.ygasi.registry.dataGen;
+import dev.mayaqq.ygasi.registry.dataGen.advancements.AdvancementProvider;
+import dev.mayaqq.ygasi.registry.dataGen.recipes.YgasiRecipes;
import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
@@ -7,5 +9,6 @@ public class DataGenRegistry implements DataGeneratorEntrypoint {
@Override
public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) {
dataGenerator.addProvider(AdvancementProvider::new);
+ dataGenerator.addProvider(YgasiRecipes::new);
}
}
diff --git a/src/main/java/dev/mayaqq/ygasi/registry/advancements/dataGen/AdvancementProvider.java b/src/main/java/dev/mayaqq/ygasi/registry/dataGen/advancements/AdvancementProvider.java
index a9b1a64..6a91296 100644
--- a/src/main/java/dev/mayaqq/ygasi/registry/advancements/dataGen/AdvancementProvider.java
+++ b/src/main/java/dev/mayaqq/ygasi/registry/dataGen/advancements/AdvancementProvider.java
@@ -1,6 +1,6 @@
-package dev.mayaqq.ygasi.registry.advancements.dataGen;
+package dev.mayaqq.ygasi.registry.dataGen.advancements;
-import dev.mayaqq.ygasi.registry.advancements.Advancements;
+import dev.mayaqq.ygasi.registry.dataGen.advancements.Advancements;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricAdvancementProvider;
import net.minecraft.advancement.Advancement;
@@ -8,7 +8,7 @@ import net.minecraft.advancement.Advancement;
import java.util.function.Consumer;
public class AdvancementProvider extends FabricAdvancementProvider {
- protected AdvancementProvider(FabricDataGenerator dataGenerator) {
+ public AdvancementProvider(FabricDataGenerator dataGenerator) {
super(dataGenerator);
}
@Override
diff --git a/src/main/java/dev/mayaqq/ygasi/registry/advancements/Advancements.java b/src/main/java/dev/mayaqq/ygasi/registry/dataGen/advancements/Advancements.java
index ac33abe..6cd5665 100644
--- a/src/main/java/dev/mayaqq/ygasi/registry/advancements/Advancements.java
+++ b/src/main/java/dev/mayaqq/ygasi/registry/dataGen/advancements/Advancements.java
@@ -1,8 +1,9 @@
-package dev.mayaqq.ygasi.registry.advancements;
+package dev.mayaqq.ygasi.registry.dataGen.advancements;
import de.dafuqs.revelationary.advancement_criteria.AdvancementGottenCriterion;
import net.minecraft.advancement.Advancement;
import net.minecraft.advancement.AdvancementFrame;
+import net.minecraft.advancement.AdvancementRewards;
import net.minecraft.advancement.criterion.ImpossibleCriterion;
import net.minecraft.item.Items;
import net.minecraft.predicate.entity.EntityPredicate;
@@ -28,6 +29,7 @@ public class Advancements implements Consumer<Consumer<Advancement>> {
)
// The first string used in criterion is the name referenced by other advancements when they want to have 'requirements'
.criterion("opened_skill_menu", new ImpossibleCriterion.Conditions())
+ .rewards(AdvancementRewards.Builder.experience(1))
.build(consumer, "ygasi" + "/root");
Advancement mercenary = Advancement.Builder.create().parent(rootAdvancement)
@@ -43,6 +45,7 @@ public class Advancements implements Consumer<Consumer<Advancement>> {
)
.criterion("unlocked_mercenary", new ImpossibleCriterion.Conditions())
.criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, rootAdvancement.getId()))
+ .rewards(AdvancementRewards.Builder.experience(1))
.build(consumer, "ygasi" + "/mercenary");
Advancement wizardry = Advancement.Builder.create().parent(rootAdvancement)
.display(
@@ -57,6 +60,7 @@ public class Advancements implements Consumer<Consumer<Advancement>> {
)
.criterion("unlocked_wizardry", new ImpossibleCriterion.Conditions())
.criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, rootAdvancement.getId()))
+ .rewards(AdvancementRewards.Builder.experience(1))
.build(consumer, "ygasi" + "/wizardry");
Advancement druidry = Advancement.Builder.create().parent(rootAdvancement)
.display(
@@ -71,6 +75,7 @@ public class Advancements implements Consumer<Consumer<Advancement>> {
)
.criterion("unlocked_druidry", new ImpossibleCriterion.Conditions())
.criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, rootAdvancement.getId()))
+ .rewards(AdvancementRewards.Builder.experience(1))
.build(consumer, "ygasi" + "/druidry");
}
} \ No newline at end of file
diff --git a/src/main/java/dev/mayaqq/ygasi/registry/dataGen/recipes/YgasiRecipes.java b/src/main/java/dev/mayaqq/ygasi/registry/dataGen/recipes/YgasiRecipes.java
new file mode 100644
index 0000000..75afdfe
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/registry/dataGen/recipes/YgasiRecipes.java
@@ -0,0 +1,28 @@
+package dev.mayaqq.ygasi.registry.dataGen.recipes;
+
+import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.advancement.criterion.ImpossibleCriterion;
+import net.minecraft.data.server.recipe.RecipeJsonProvider;
+import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
+import net.minecraft.item.Items;
+import net.minecraft.tag.ItemTags;
+
+import java.util.function.Consumer;
+
+import static dev.mayaqq.ygasi.Ygasi.SKILL_BOOK;
+
+public class YgasiRecipes extends FabricRecipeProvider {
+ public YgasiRecipes(FabricDataGenerator dataGenerator) {
+ super(dataGenerator);
+ }
+
+ @Override
+ public void generateRecipes(Consumer<RecipeJsonProvider> exporter) {
+ ShapelessRecipeJsonBuilder.create(SKILL_BOOK)
+ .criterion("has_book", new ImpossibleCriterion.Conditions())
+ .input(Items.BOOK)
+ .input(ItemTags.SAPLINGS)
+ .offerTo(exporter);
+ }
+} \ No newline at end of file