Its a frog, frog in a blender! And also other stuff I guess

7 files changed, 36 insertions, 235 deletions

diff --git a/src/main/java/dev/mayaqq/ygasi/registry/CommandRegistry.java b/src/main/java/dev/mayaqq/ygasi/registry/CommandRegistry.java
index 44ba603..781ef4d 100644
--- a/src/main/java/dev/mayaqq/ygasi/registry/CommandRegistry.java
+++ b/src/main/java/dev/mayaqq/ygasi/registry/CommandRegistry.java
@@ -58,7 +58,7 @@ public class CommandRegistry {
                                         ServerPlayerEntity player = EntityArgumentType.getPlayer(context, "target");
                                         player.resetStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS));
                                         player.resetStat(Stats.CUSTOM.getOrCreateStat(StatRegistry.SKILL_POINTS_TOTAL));
-                                        context.getSource().sendMessage(Text.translatable("commands.ygasi.skillpoints.reset", player.getEntityName()).formatted(Formatting.GREEN));
+                                        player.sendMessage(Text.translatable("commands.ygasi.skillpoints.reset", player.getEntityName()).formatted(Formatting.GREEN));
                                         return 1;
                                     })))
                     .then(literal("add")
@@ -76,7 +76,7 @@ public class CommandRegistry {
                             .then(CommandManager.argument("target", EntityArgumentType.player())
                                     .executes(context -> {
                                         ServerPlayerEntity player = EntityArgumentType.getPlayer(context, "target");
-                                        context.getSource().sendMessage(Text.translatable("commands.ygasi.skillpoints.get", player.getEntityName(), player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS)), player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS_TOTAL))).formatted(Formatting.GREEN));
+                                        player.sendMessage(Text.translatable("commands.ygasi.skillpoints.get", player.getEntityName(), player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS)), player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS_TOTAL))).formatted(Formatting.GREEN));
                                         return 1;
                                     }))))
                 .then(literal("config")
diff --git a/src/main/java/dev/mayaqq/ygasi/registry/EventRegistry.java b/src/main/java/dev/mayaqq/ygasi/registry/EventRegistry.java
new file mode 100644
index 0000000..ee13faf
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/registry/EventRegistry.java
@@ -0,0 +1,9 @@
+package dev.mayaqq.ygasi.registry;
+
+import dev.mayaqq.ygasi.events.PlayerConnectEvent;
+
+public class EventRegistry {
+    public static void register() {
+        PlayerConnectEvent.onPlayerConnect();
+    }
+}
diff --git a/src/main/java/dev/mayaqq/ygasi/registry/ItemRegistry.java b/src/main/java/dev/mayaqq/ygasi/registry/ItemRegistry.java
new file mode 100644
index 0000000..61cb93d
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/registry/ItemRegistry.java
@@ -0,0 +1,25 @@
+package dev.mayaqq.ygasi.registry;
+
+import dev.mayaqq.ygasi.items.SkillBookItem;
+import eu.pb4.polymer.api.item.PolymerItemGroup;
+import eu.pb4.polymer.api.resourcepack.PolymerModelData;
+import eu.pb4.polymer.api.resourcepack.PolymerRPUtils;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class ItemRegistry {
+    public static final PolymerItemGroup YGASI_GROUP = PolymerItemGroup.create(new Identifier("ygasi"), Text.translatable("creative.ygasi.group"), () -> new ItemStack(Items.BOOK));
+
+    public static final SkillBookItem SKILL_BOOK = new SkillBookItem(new Item.Settings().group(YGASI_GROUP).maxCount(1), Items.BOOK);
+    public static void register() {
+        PolymerRPUtils.addAssetSource("ygasi");
+
+        PolymerModelData skillBookModelData = PolymerRPUtils.requestModel(Items.BOOK, new Identifier("ygasi", "item/skill_book"));
+
+        Registry.register(Registry.ITEM, "ygasi:skill_book", SKILL_BOOK);
+    }
+}
diff --git a/src/main/java/dev/mayaqq/ygasi/registry/dataGen/DataGenRegistry.java b/src/main/java/dev/mayaqq/ygasi/registry/dataGen/DataGenRegistry.java
deleted file mode 100644
index 8cd9b6e..0000000
--- a/src/main/java/dev/mayaqq/ygasi/registry/dataGen/DataGenRegistry.java
+++ /dev/null
@@ -1,14 +0,0 @@
-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;
-
-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/dataGen/advancements/AdvancementProvider.java b/src/main/java/dev/mayaqq/ygasi/registry/dataGen/advancements/AdvancementProvider.java
deleted file mode 100644
index 5748316..0000000
--- a/src/main/java/dev/mayaqq/ygasi/registry/dataGen/advancements/AdvancementProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package dev.mayaqq.ygasi.registry.dataGen.advancements;
-
-import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricAdvancementProvider;
-import net.minecraft.advancement.Advancement;
-
-import java.util.function.Consumer;
-
-public class AdvancementProvider extends FabricAdvancementProvider {
-    public AdvancementProvider(FabricDataGenerator dataGenerator) {
-        super(dataGenerator);
-    }
-    @Override
-    public void generateAdvancement(Consumer<Advancement> consumer) {
-        new Advancements().accept(consumer);
-    }
-}
diff --git a/src/main/java/dev/mayaqq/ygasi/registry/dataGen/advancements/Advancements.java b/src/main/java/dev/mayaqq/ygasi/registry/dataGen/advancements/Advancements.java
deleted file mode 100644
index 130a885..0000000
--- a/src/main/java/dev/mayaqq/ygasi/registry/dataGen/advancements/Advancements.java
+++ /dev/null
@@ -1,174 +0,0 @@
-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;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-
-import java.util.function.Consumer;
-
-public class Advancements implements Consumer<Consumer<Advancement>> {
-
-    @Override
-    public void accept(Consumer<Advancement> consumer) {
-        //main root advancement
-        Advancement rootAdvancement = Advancement.Builder.create().display(Items.DIAMOND, // The display icon
-                Text.translatable("advancements.ygasi.root.title"), // The title
-                Text.translatable("advancements.ygasi.root.description"), // The description
-                new Identifier("textures/block/sculk_catalyst_top.png"), // Background image used
-                AdvancementFrame.CHALLENGE, // Options: TASK, CHALLENGE, GOAL
-                true, // Show toast top right
-                false, // Announce to chat
-                false // Hidden in the advancement tab
-        ).criterion("opened_skill_menu", new ImpossibleCriterion.Conditions()).rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/root");
-
-        //branch advancements
-        Advancement mercenary = Advancement.Builder.create().parent(rootAdvancement)
-                .display(Items.DIAMOND_SWORD, Text.translatable("advancements.ygasi.mercenary.title"), Text.translatable("advancements.ygasi.mercenary.description"), null, AdvancementFrame.GOAL, false, false, false)
-                .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(Items.BLAZE_ROD, Text.translatable("advancements.ygasi.wizardry.title"), Text.translatable("advancements.ygasi.wizardry.description"), null, AdvancementFrame.GOAL, false, false, false)
-                .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(Items.OAK_SAPLING, Text.translatable("advancements.ygasi.druidry.title"), Text.translatable("advancements.ygasi.druidry.description"), null, AdvancementFrame.GOAL, false, false, false)
-                .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");
-        Advancement extra = Advancement.Builder.create().parent(rootAdvancement)
-                .display(Items.EMERALD, Text.translatable("advancements.ygasi.extra.title"), Text.translatable("advancements.ygasi.extra.description"), null, AdvancementFrame.GOAL, false, false, false)
-                .criterion("unlocked_extra", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, rootAdvancement.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/extra");
-
-        //mercenary skills
-
-        Advancement offence1 = Advancement.Builder.create().parent(mercenary)
-                .display(Items.IRON_SWORD, Text.translatable("advancements.ygasi.mercenary.offence1.title"), Text.translatable("advancements.ygasi.mercenary.offence1.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_offence1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, mercenary.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/offence1");
-        Advancement offence2 = Advancement.Builder.create().parent(offence1)
-                .display(Items.IRON_SWORD, Text.translatable("advancements.ygasi.mercenary.offence2.title"), Text.translatable("advancements.ygasi.mercenary.offence2.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_offence2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, offence1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/offence2");
-        Advancement offence3 = Advancement.Builder.create().parent(offence2)
-                .display(Items.IRON_SWORD, Text.translatable("advancements.ygasi.mercenary.offence3.title"), Text.translatable("advancements.ygasi.mercenary.offence3.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_offence3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, offence2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/offence3");
-
-        Advancement ninja1 = Advancement.Builder.create().parent(mercenary)
-                .display(Items.BAMBOO, Text.translatable("advancements.ygasi.mercenary.ninja1.title"), Text.translatable("advancements.ygasi.mercenary.ninja1.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_ninja1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, mercenary.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/ninja1");
-        Advancement ninja2 = Advancement.Builder.create().parent(ninja1)
-                .display(Items.BAMBOO, Text.translatable("advancements.ygasi.mercenary.ninja2.title"), Text.translatable("advancements.ygasi.mercenary.ninja2.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_ninja2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, ninja1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/ninja2");
-        Advancement ninja3 = Advancement.Builder.create().parent(ninja2)
-                .display(Items.BAMBOO, Text.translatable("advancements.ygasi.mercenary.ninja3.title"), Text.translatable("advancements.ygasi.mercenary.ninja3.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_ninja3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, ninja2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/ninja3");
-
-        Advancement defence1 = Advancement.Builder.create().parent(mercenary)
-                .display(Items.IRON_CHESTPLATE, Text.translatable("advancements.ygasi.mercenary.defence1.title"), Text.translatable("advancements.ygasi.mercenary.defence1.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_defence1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, mercenary.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/defence1");
-        Advancement defence2 = Advancement.Builder.create().parent(defence1)
-                .display(Items.IRON_CHESTPLATE, Text.translatable("advancements.ygasi.mercenary.defence2.title"), Text.translatable("advancements.ygasi.mercenary.defence2.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_defence2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, defence1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/defence2");
-        Advancement defence3 = Advancement.Builder.create().parent(defence2)
-                .display(Items.IRON_CHESTPLATE, Text.translatable("advancements.ygasi.mercenary.defence3.title"), Text.translatable("advancements.ygasi.mercenary.defence3.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_defence3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, defence2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/defence3");
-
-        //wizardry skills
-
-        Advancement fight1 = Advancement.Builder.create().parent(wizardry)
-                .display(Items.BLAZE_POWDER, Text.translatable("advancements.ygasi.wizardry.fight1.title"), Text.translatable("advancements.ygasi.wizardry.fight1.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_fight1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, wizardry.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/fight1");
-        Advancement fight2 = Advancement.Builder.create().parent(fight1)
-                .display(Items.BLAZE_POWDER, Text.translatable("advancements.ygasi.wizardry.fight2.title"), Text.translatable("advancements.ygasi.wizardry.fight2.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_fight2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, fight1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/fight2");
-        Advancement fight3 = Advancement.Builder.create().parent(fight2)
-                .display(Items.BLAZE_POWDER, Text.translatable("advancements.ygasi.wizardry.fight3.title"), Text.translatable("advancements.ygasi.wizardry.fight3.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_fight3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, fight2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/fight3");
-
-        Advancement element1 = Advancement.Builder.create().parent(wizardry)
-                .display(Items.FIRE_CHARGE, Text.translatable("advancements.ygasi.wizardry.element1.title"), Text.translatable("advancements.ygasi.wizardry.element1.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_element1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, wizardry.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/element1");
-        Advancement element2 = Advancement.Builder.create().parent(element1)
-                .display(Items.FIRE_CHARGE, Text.translatable("advancements.ygasi.wizardry.element2.title"), Text.translatable("advancements.ygasi.wizardry.element2.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_element2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, element1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/element2");
-        Advancement element3 = Advancement.Builder.create().parent(element2)
-                .display(Items.FIRE_CHARGE, Text.translatable("advancements.ygasi.wizardry.element3.title"), Text.translatable("advancements.ygasi.wizardry.element3.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_element3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, element2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/element3");
-
-        Advancement force1 = Advancement.Builder.create().parent(wizardry)
-                .display(Items.ENDER_PEARL, Text.translatable("advancements.ygasi.wizardry.force1.title"), Text.translatable("advancements.ygasi.wizardry.force1.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_force1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, wizardry.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/force1");
-        Advancement force2 = Advancement.Builder.create().parent(force1)
-                .display(Items.ENDER_PEARL, Text.translatable("advancements.ygasi.wizardry.force2.title"), Text.translatable("advancements.ygasi.wizardry.force2.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_force2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, force1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/force2");
-        Advancement force3 = Advancement.Builder.create().parent(force2)
-                .display(Items.ENDER_PEARL, Text.translatable("advancements.ygasi.wizardry.force3.title"), Text.translatable("advancements.ygasi.wizardry.force3.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_force3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, force2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/force3");
-
-        //druidry skills
-
-        Advancement necromancy1 = Advancement.Builder.create().parent(druidry)
-                .display(Items.BONE, Text.translatable("advancements.ygasi.druidry.necromancy1.title"), Text.translatable("advancements.ygasi.druidry.necromancy1.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_necromancy1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, druidry.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/necromancy1");
-        Advancement necromancy2 = Advancement.Builder.create().parent(necromancy1)
-                .display(Items.BONE, Text.translatable("advancements.ygasi.druidry.necromancy2.title"), Text.translatable("advancements.ygasi.druidry.necromancy2.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_necromancy2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, necromancy1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/necromancy2");
-        Advancement necromancy3 = Advancement.Builder.create().parent(necromancy2)
-                .display(Items.BONE, Text.translatable("advancements.ygasi.druidry.necromancy3.title"), Text.translatable("advancements.ygasi.druidry.necromancy3.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_necromancy3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, necromancy2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/necromancy3");
-
-        Advancement nature1 = Advancement.Builder.create().parent(druidry)
-                .display(Items.GRASS_BLOCK, Text.translatable("advancements.ygasi.druidry.nature1.title"), Text.translatable("advancements.ygasi.druidry.nature1.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_nature1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, druidry.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/nature1");
-        Advancement nature2 = Advancement.Builder.create().parent(nature1)
-                .display(Items.GRASS_BLOCK, Text.translatable("advancements.ygasi.druidry.nature2.title"), Text.translatable("advancements.ygasi.druidry.nature2.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_nature2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, nature1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/nature2");
-        Advancement nature3 = Advancement.Builder.create().parent(nature2)
-                .display(Items.GRASS_BLOCK, Text.translatable("advancements.ygasi.druidry.nature3.title"), Text.translatable("advancements.ygasi.druidry.nature3.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_nature3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, nature2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/nature3");
-
-        Advancement protean1 = Advancement.Builder.create().parent(druidry)
-                .display(Items.SLIME_BALL, Text.translatable("advancements.ygasi.druidry.protean1.title"), Text.translatable("advancements.ygasi.druidry.protean1.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_protean1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, druidry.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/protean1");
-        Advancement protean2 = Advancement.Builder.create().parent(protean1)
-                .display(Items.SLIME_BALL, Text.translatable("advancements.ygasi.druidry.protean2.title"), Text.translatable("advancements.ygasi.druidry.protean2.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_protean2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, protean1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/protean2");
-        Advancement protean3 = Advancement.Builder.create().parent(protean2)
-                .display(Items.SLIME_BALL, Text.translatable("advancements.ygasi.druidry.protean3.title"), Text.translatable("advancements.ygasi.druidry.protean3.description"), null, AdvancementFrame.TASK, false, false, true)
-                .criterion("unlocked_protean3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, protean2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/protean3");
-
-        //extra
-
-    }
-}
\ 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
deleted file mode 100644
index 75afdfe..0000000
--- a/src/main/java/dev/mayaqq/ygasi/registry/dataGen/recipes/YgasiRecipes.java
+++ /dev/null
@@ -1,28 +0,0 @@
-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