Enchanting it all

gradle.properties

@@ -20,8 +20,8 @@ neo_version_range=[21.1.71,)
 parchment_minecraft_version = 1.21.1
 parchment_version = 2024.11.17
 
-# From maven.ithundxr.dev/snapshots
-registrate_version = MC1.21-1.3.0+61
+# From mvn.devos.one/snapshots
+registrate_version = MC1.21-1.3.0+62
 
 # Dependency Versions
 flywheel_minecraft_version = 1.21.1

src/generated/resources/.cache/7fbec16def6919d7023cd104d800477d6f3414bc

@@ -0,0 +1,3 @@
+// 1.21.1	2025-01-31T16:32:01.068935352	Tags for minecraft:enchantment mod id create
+7a2f1612bcbf260055ae80377f4e5761f8367a2e data/minecraft/tags/enchantment/in_enchanting_table.json
+7a2f1612bcbf260055ae80377f4e5761f8367a2e data/minecraft/tags/enchantment/non_treasure.json

src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034

@@ -1,4 +1,4 @@
-// 1.21.1	2025-01-26T10:17:25.944291844	Create's Processing Recipes
+// 1.21.1	2025-01-31T16:32:01.065278432	Create's Processing Recipes
 f3b53b8fd8eaccb466d28f0b801e4046758782d7 data/create/recipe/compacting/andesite_from_flint.json
 8addd735263ee2d36941da9655d6c305e2b7e5ee data/create/recipe/compacting/blaze_cake.json
 50229c8ccff8b3420456dfb007236dce812b8145 data/create/recipe/compacting/chocolate.json
@@ -277,7 +277,7 @@ d480b1b4c48440c6d6cb775321e95be7ea171aa5 data/create/recipe/milling/andesite.jso
 a3b4a9eb3970eea745dff83c2d5fbab403ed481f data/create/recipe/milling/blue_orchid.json
 720ff9753bb30e874483fc850c3cbc8bfa973224 data/create/recipe/milling/bone.json
 e84433fe6ec772c212d20109268fa74ceb8fa3ab data/create/recipe/milling/bone_meal.json
-577e847aebe4a9128448e2bd8ab936782f21044a data/create/recipe/milling/cactus.json
+77b571f6ee4e8775d87077accdce4a23fb6a0c56 data/create/recipe/milling/cactus.json
 d6073794b0be05fb52faf2d78d0daeb6ce3beab5 data/create/recipe/milling/calcite.json
 5b6ccdbc1bf1dcc3fc3fca94ff1fa46c17f46622 data/create/recipe/milling/charcoal.json
 6323f36ea7a1a46d0999dfe24e4fa86d677e319d data/create/recipe/milling/clay.json
@@ -517,7 +517,7 @@ fbfc0fa989e6d54be2fbf34d0c6ca8e42632ca1f data/create/recipe/pressing/compat/envi
 0e22e0b5f54d3a7b5d323e3a1633b8469b22fe4e data/create/recipe/pressing/cursed_earth_path_from_grass.json
 f4c635ae1551c4746f796ee81d0712686783cff8 data/create/recipe/pressing/gold_ingot.json
 fa57116624c35b1f56013cfcf44adda8af378800 data/create/recipe/pressing/iron_ingot.json
-daf5c0c9e3f13d2004d53c54f4c1c36ae098d1ae data/create/recipe/pressing/path.json
+747264a014a851af703660d4f189bfdb159466ff data/create/recipe/pressing/path.json
 8a1938a2a5127b732fe40e06f0a66174ea1e7b54 data/create/recipe/pressing/peat_dirt_path.json
 74fbfc827c1c3f158a6448c57642808301c2d1ca data/create/recipe/pressing/peat_dirt_path_from_grass.json
 3821a3058177d3247b0df35738f7144f73045e62 data/create/recipe/pressing/silt_dirt_path.json

src/generated/resources/data/minecraft/tags/enchantment/in_enchanting_table.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "create:capacity",
+    "create:potato_recovery"
+  ]
+}

src/generated/resources/data/minecraft/tags/enchantment/non_treasure.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "create:capacity",
+    "create:potato_recovery"
+  ]
+}

src/main/java/com/simibubi/create/foundation/data/TagGen.java

@@ -5,7 +5,6 @@ import java.util.function.Function;
 import java.util.stream.Stream;
 
 import com.simibubi.create.AllTags;
-import com.simibubi.create.Create;
 import com.simibubi.create.foundation.data.recipe.Mods;
 import com.tterrag.registrate.builders.BlockBuilder;
 import com.tterrag.registrate.builders.ItemBuilder;
@@ -61,9 +60,8 @@ public class TagGen {
 	}
 
 	public static class CreateTagsProvider<T> {
-
-		private RegistrateTagsProvider<T> provider;
-		private Function<T, ResourceKey<T>> keyExtractor;
+		private final RegistrateTagsProvider<T> provider;
+		private final Function<T, ResourceKey<T>> keyExtractor;
 
 		public CreateTagsProvider(RegistrateTagsProvider<T> provider, Function<T, Holder.Reference<T>> refExtractor) {
 			this.provider = provider;
@@ -72,21 +70,20 @@ public class TagGen {
 
 		public CreateTagAppender<T> tag(TagKey<T> tag) {
 			TagBuilder tagbuilder = getOrCreateRawBuilder(tag);
-			return new CreateTagAppender<>(tagbuilder, keyExtractor, Create.ID);
+			return new CreateTagAppender<>(tagbuilder, keyExtractor);
 		}
 
 		public TagBuilder getOrCreateRawBuilder(TagKey<T> tag) {
 			return provider.addTag(tag).getInternalBuilder();
 		}
-
 	}
 
 	public static class CreateTagAppender<T> extends TagsProvider.TagAppender<T> {
 
-		private Function<T, ResourceKey<T>> keyExtractor;
+		private final Function<T, ResourceKey<T>> keyExtractor;
 
-		public CreateTagAppender(TagBuilder pBuilder, Function<T, ResourceKey<T>> pKeyExtractor, String modId) {
-			super(pBuilder, modId);
+		public CreateTagAppender(TagBuilder pBuilder, Function<T, ResourceKey<T>> pKeyExtractor) {
+			super(pBuilder);
 			this.keyExtractor = pKeyExtractor;
 		}
 

src/main/java/com/simibubi/create/infrastructure/data/CreateDatagen.java

@@ -26,6 +26,7 @@ import net.createmod.ponder.foundation.PonderIndex;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.PackOutput;
+
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 
@@ -53,6 +54,7 @@ public class CreateDatagen {
 		generator.addProvider(event.includeServer(), new CreateDatamapProvider(output, lookupProvider));
 		generator.addProvider(event.includeServer(), new VanillaHatOffsetGenerator(output));
 		generator.addProvider(event.includeServer(), new CuriosDataGenerator(output, lookupProvider, existingFileHelper));
+		generator.addProvider(event.includeServer(), new CreateEnchantmentTagsProvider(output, lookupProvider, existingFileHelper));
 
 		if (event.includeServer()) {
 			ProcessingRecipeGen.registerAll(generator, output, lookupProvider);

src/main/java/com/simibubi/create/infrastructure/data/CreateEnchantmentTagsProvider.java

@@ -0,0 +1,29 @@
+package com.simibubi.create.infrastructure.data;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.simibubi.create.AllEnchantments;
+import com.simibubi.create.Create;
+
+import net.minecraft.core.HolderLookup.Provider;
+import net.minecraft.data.PackOutput;
+import net.minecraft.data.tags.EnchantmentTagsProvider;
+import net.minecraft.tags.EnchantmentTags;
+
+import net.neoforged.neoforge.common.data.ExistingFileHelper;
+
+public class CreateEnchantmentTagsProvider extends EnchantmentTagsProvider {
+	public CreateEnchantmentTagsProvider(PackOutput output, CompletableFuture<Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
+		super(output, lookupProvider, Create.ID, existingFileHelper);
+	}
+
+	@Override
+	protected void addTags(Provider prov) {
+		tag(EnchantmentTags.NON_TREASURE)
+			.add(AllEnchantments.CAPACITY, AllEnchantments.POTATO_RECOVERY);
+		tag(EnchantmentTags.IN_ENCHANTING_TABLE)
+			.add(AllEnchantments.CAPACITY, AllEnchantments.POTATO_RECOVERY);
+	}
+}

src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java

@@ -24,6 +24,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.Fluids;
+
 import net.neoforged.neoforge.common.Tags;
 
 public class CreateRegistrateTags {

src/main/java/com/simibubi/create/infrastructure/data/GeneratedEntriesProvider.java

@@ -15,6 +15,7 @@ import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.core.RegistrySetBuilder.RegistryBootstrap;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.PackOutput;
+
 import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider;
 import net.neoforged.neoforge.registries.NeoForgeRegistries;