* Adjusted FabricRegister to work correctly, fixes attribute errors on Fabric; might overhaul the registry with it.

SuperKnux · SuperKnux · commit b58bec638295 · 2025-12-17T10:59:30.000-06:00
* Registered ItemApiLookups (ParticleSprays function on Fabric!!!)
* Readded BrainsweepeeIngredient.getSomeKindOfReasonableIDForEmi(), EMI recipes work for the most part
* Fixed Fabric Creative Tabs (mostly)
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexCreativeTabs.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexCreativeTabs.java
@@ -1,6 +1,8 @@
 package at.petrak.hexcasting.common.lib;
 
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
@@ -10,6 +12,7 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 
+import static at.petrak.hexcasting.api.HexAPI.MOD_ID;
 import static at.petrak.hexcasting.api.HexAPI.modLoc;
 
 public class HexCreativeTabs {
@@ -24,9 +27,13 @@ public static void registerCreativeTabs(BiConsumer<CreativeModeTab, ResourceLoca
     public static final CreativeModeTab HEX = register("hexcasting", CreativeModeTab.builder(CreativeModeTab.Row.TOP, 0)
             .icon(() -> new ItemStack(HexItems.SPELLBOOK)));
 
+    public static final ResourceKey<CreativeModeTab> HEX_KEY = ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), modLoc("hexcasting"));
+
     public static final CreativeModeTab SCROLLS = register("scrolls", CreativeModeTab.builder(CreativeModeTab.Row.TOP, 0)
             .icon(() -> new ItemStack(HexItems.SCROLL_LARGE)));
 
+    public static final ResourceKey<CreativeModeTab> SCROLLS_KEY = ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), modLoc("scrolls"));
+
     private static CreativeModeTab register(String name, CreativeModeTab.Builder tabBuilder) {
         var tab = tabBuilder.title(Component.translatable("itemGroup.hexcasting." + name)).build();
         var old = TABS.put(modLoc(name), tab);
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/BrainsweepeeIngredient.java b/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/BrainsweepeeIngredient.java
@@ -30,6 +30,8 @@ public abstract class BrainsweepeeIngredient {
 
     public abstract List<Component> getTooltip(boolean advanced);
 
+    public abstract String getSomeKindOfReasonableIDForEmi();
+
     /**
      * For the benefit of showing to the client, return an example of the entity.
      * <p>
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/BrainsweepeeIngredients.java b/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/BrainsweepeeIngredients.java
@@ -69,6 +69,11 @@ public List<Component> getTooltip(boolean advanced) {
             return List.of();
         }
 
+        @Override
+        public String getSomeKindOfReasonableIDForEmi() {
+            return "none";
+        }
+
         @Override
         public @Nullable Entity exampleEntity(Level level) {
             return null;
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/EntityTagIngredient.java b/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/EntityTagIngredient.java
@@ -77,6 +77,14 @@ public List<Component> getTooltip(boolean advanced) {
         return out;
     }
 
+    @Override
+    public String getSomeKindOfReasonableIDForEmi() {
+        var resloc = this.entityTypeTag.location();
+        return resloc.getNamespace()
+                + "//"
+                + resloc.getPath();
+    }
+
     @Override
     public Entity exampleEntity(Level level) {
         var someEntityTys = BuiltInRegistries.ENTITY_TYPE.getTagOrEmpty(this.entityTypeTag).iterator();
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/EntityTypeIngredient.java b/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/EntityTypeIngredient.java
@@ -55,6 +55,14 @@ public List<Component> getTooltip(boolean advanced) {
         );
     }
 
+    @Override
+    public String getSomeKindOfReasonableIDForEmi() {
+        var resloc = BuiltInRegistries.ENTITY_TYPE.getKey(this.entityType);
+        return resloc.getNamespace()
+                + "//"
+                + resloc.getPath();
+    }
+
     @Override
     public Entity exampleEntity(Level level) {
         return this.entityType.create(level);
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/VillagerIngredient.java b/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/brainsweep/VillagerIngredient.java
@@ -130,6 +130,31 @@ public List<Component> getTooltip(boolean advanced) {
         return tooltip;
     }
 
+    @Override
+    public String getSomeKindOfReasonableIDForEmi() {
+        var bob = new StringBuilder();
+        if (this.profession != null) {
+            var profLoc = BuiltInRegistries.VILLAGER_PROFESSION.getKey(this.profession);
+            bob.append(profLoc.getNamespace())
+                    .append("//")
+                    .append(profLoc.getPath());
+        } else {
+            bob.append("null");
+        }
+        bob.append("_");
+        if (this.biome != null) {
+            var biomeLoc = BuiltInRegistries.VILLAGER_TYPE.getKey(this.biome);
+            bob.append(biomeLoc.getNamespace())
+                    .append("//")
+                    .append(biomeLoc.getPath());
+        } else {
+            bob.append("null");
+        }
+
+        bob.append(this.minLevel);
+        return bob.toString();
+    }
+
     @Override
     public Component getName() {
         MutableComponent component = Component.literal("");
diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -49,7 +49,7 @@ loom {
         }
 
         configureEach {
-            runDir "run"
+            runDir "Fabric/run"
             ideConfigGenerated(true)
         }
     }
@@ -121,7 +121,7 @@ dependencies {
     shadowBundle project(path: ':Common', configuration: 'transformProductionFabric')
 
     // === MANDATORY DEPS ===
-    modCompileOnly("at.petra-k:paucal:$paucalVersion+$minecraftVersion-common")
+    modCompileOnly("at.petra-k:paucal:$paucalVersion+$minecraftVersion-fabric")
     // dear mod devs, don't put the platform in the middle of your version code
     modImplementation "vazkii.patchouli:Patchouli:1.21-$patchouliVersion-FABRIC-SNAPSHOT"
     modImplementation "com.samsthenerd.inline:inline-fabric:$minecraftVersion-$inlineVersion"
diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt b/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
@@ -1,13 +1,19 @@
 package at.petrak.hexcasting.fabric
 
-import at.petrak.hexcasting.api.HexAPI
 import at.petrak.hexcasting.api.HexAPI.modLoc
 import at.petrak.hexcasting.api.addldata.ADMediaHolder
 import at.petrak.hexcasting.api.advancements.HexAdvancementTriggers
+import at.petrak.hexcasting.api.casting.ActionRegistryEntry
 import at.petrak.hexcasting.api.casting.iota.DoubleIota
+import at.petrak.hexcasting.api.item.HexHolderItem
+import at.petrak.hexcasting.api.item.IotaHolderItem
+import at.petrak.hexcasting.api.item.PigmentItem
+import at.petrak.hexcasting.api.item.VariantItem
 import at.petrak.hexcasting.api.misc.MediaConstants
 import at.petrak.hexcasting.api.mod.HexConfig
 import at.petrak.hexcasting.api.mod.HexStatistics
+import at.petrak.hexcasting.api.mod.HexTags
+import at.petrak.hexcasting.api.utils.isOfTag
 import at.petrak.hexcasting.common.blocks.behavior.HexComposting
 import at.petrak.hexcasting.common.blocks.behavior.HexStrippables
 import at.petrak.hexcasting.common.casting.PatternRegistryManifest
@@ -16,6 +22,7 @@ import at.petrak.hexcasting.common.casting.actions.spells.great.OpAltiora
 import at.petrak.hexcasting.common.command.PatternResKeyArgument
 import at.petrak.hexcasting.common.entities.HexEntities
 import at.petrak.hexcasting.common.items.ItemJewelerHammer
+import at.petrak.hexcasting.common.items.storage.ItemScroll
 import at.petrak.hexcasting.common.lib.*
 import at.petrak.hexcasting.common.lib.hex.*
 import at.petrak.hexcasting.common.misc.AkashicTreeGrower
@@ -26,13 +33,19 @@ import at.petrak.hexcasting.common.recipe.HexRecipeStuffRegistry
 import at.petrak.hexcasting.common.recipe.ingredient.brainsweep.BrainsweepeeIngredients
 import at.petrak.hexcasting.common.recipe.ingredient.state.StateIngredients
 import at.petrak.hexcasting.fabric.cc.HexCardinalComponents
+import at.petrak.hexcasting.fabric.cc.adimpl.CCHexHolder
+import at.petrak.hexcasting.fabric.cc.adimpl.CCIotaHolder
+import at.petrak.hexcasting.fabric.cc.adimpl.CCItemIotaHolder
 import at.petrak.hexcasting.fabric.cc.adimpl.CCMediaHolder
+import at.petrak.hexcasting.fabric.cc.adimpl.CCPigment
+import at.petrak.hexcasting.fabric.cc.adimpl.CCVariantItem
 import at.petrak.hexcasting.fabric.event.VillagerConversionCallback
 import at.petrak.hexcasting.fabric.loot.FabricHexLootModJankery
 import at.petrak.hexcasting.fabric.network.FabricPacketHandler
 import at.petrak.hexcasting.fabric.recipe.FabricModConditionalIngredient
 import at.petrak.hexcasting.fabric.recipe.FabricUnsealedIngredient
 import at.petrak.hexcasting.fabric.storage.FabricImpetusStorage
+import at.petrak.hexcasting.fabric.xplat.FabricXplatImpl
 import at.petrak.hexcasting.interop.HexInterop
 import at.petrak.hexcasting.xplat.IXplatAbstractions
 import net.fabricmc.api.ModInitializer
@@ -46,20 +59,26 @@ import net.fabricmc.fabric.api.event.player.UseEntityCallback
 import net.fabricmc.fabric.api.item.v1.DefaultItemComponentEvents
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents
 import net.fabricmc.fabric.api.loot.v3.LootTableEvents
+import net.fabricmc.fabric.api.`object`.builder.v1.entity.FabricDefaultAttributeRegistry
 import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredientSerializer
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry
 import net.minecraft.commands.synchronization.SingletonArgumentInfo
 import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.InteractionResult
+import net.minecraft.world.entity.EntityType
 import net.minecraft.world.entity.player.Player
+import net.minecraft.world.item.Item
+import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
 import net.minecraft.world.level.block.Blocks
 import net.minecraft.world.level.block.state.properties.BlockSetType
 import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction
 import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator
 import java.util.function.BiConsumer
+import java.util.function.Function
 
 object FabricHexInitializer : ModInitializer {
     lateinit var CONFIG: FabricHexConfig
@@ -132,30 +151,56 @@ object FabricHexInitializer : ModInitializer {
             }
         }
 
-        ItemGroupEvents.MODIFY_ENTRIES_ALL.register { tab, entries ->
-            HexBlocks.registerBlockCreativeTab(entries::accept, tab)
-            HexItems.registerItemCreativeTab(entries, tab)
+        ItemGroupEvents.modifyEntriesEvent(HexCreativeTabs.SCROLLS_KEY).register { r ->
+            val keyList = ArrayList<ResourceKey<ActionRegistryEntry?>?>()
+            val regi = FabricXplatImpl.INSTANCE.getActionRegistry()
+            for (key in regi.registryKeySet()) if (isOfTag<ActionRegistryEntry?>(
+                    regi,
+                    key,
+                    HexTags.Actions.PER_WORLD_PATTERN
+                )
+            ) keyList.add(key)
+            keyList.sortWith(Comparator.comparing<ResourceKey<ActionRegistryEntry?>?, ResourceLocation?>(Function { obj: ResourceKey<ActionRegistryEntry?>? -> obj!!.location() }))
+            for (key in keyList) {
+                r.accept(
+                    ItemScroll.withPerWorldPattern(
+                        ItemStack(HexItems.SCROLL_LARGE),
+                        key
+                    )
+                )
+            }
+        }
+        ItemGroupEvents.modifyEntriesEvent(HexCreativeTabs.HEX_KEY).register { r ->
+            for (item in this.itemsToAddToCreativeTab) {
+                r.accept(item)
+            }
         }
     }
 
     private fun initRegistries() {
-        fabricOnlyRegistration()
-
         HexBlockSetTypes.registerBlocks(BlockSetType::register)
 
         HexCreativeTabs.registerCreativeTabs(bind(BuiltInRegistries.CREATIVE_MODE_TAB))
 
         HexSounds.registerSounds(bind(BuiltInRegistries.SOUND_EVENT))
         HexBlocks.registerBlocks(bind(BuiltInRegistries.BLOCK))
-        HexBlocks.registerBlockItems(bind(BuiltInRegistries.ITEM))
+        HexBlocks.registerBlockItems(boundForItem)
         HexBlockEntities.registerTiles(bind(BuiltInRegistries.BLOCK_ENTITY_TYPE))
-        HexItems.registerItems(bind(BuiltInRegistries.ITEM))
+        HexItems.registerItems(boundForItem)
         // Registry.register(IngredientDeserializer.REGISTRY, FabricModConditionalIngredient.ID, FabricModConditionalIngredient.Deserializer.INSTANCE)
         CustomIngredientSerializer.register(FabricUnsealedIngredient.Serializer.INSTANCE);
         CustomIngredientSerializer.register(FabricModConditionalIngredient.Serializer.INSTANCE);
 
         HexEntities.registerEntities(bind(BuiltInRegistries.ENTITY_TYPE))
         HexAttributes.register()
+        FabricDefaultAttributeRegistry.register(EntityType.PLAYER,
+            Player.createAttributes()
+                .add(HexAttributes.GRID_ZOOM)
+                .add(HexAttributes.SCRY_SIGHT)
+                .add(HexAttributes.FEEBLE_MIND)
+                .add(HexAttributes.AMBIT_RADIUS)
+                .add(HexAttributes.MEDIA_CONSUMPTION_MODIFIER)
+                .add(HexAttributes.SENTINEL_RADIUS))
         HexMobEffects.register(bind(BuiltInRegistries.MOB_EFFECT))
         HexPotions.registerPotions(bind(BuiltInRegistries.POTION))
         HexDataComponents.registerDataComponents(bind(BuiltInRegistries.DATA_COMPONENT_TYPE))
@@ -186,6 +231,8 @@ object FabricHexInitializer : ModInitializer {
         butYouCouldBeFire()
 
         HexStatistics.register()
+
+        fabricOnlyRegistration()
     }
 
     // sorry lex (not sorry)
@@ -196,6 +243,29 @@ object FabricHexInitializer : ModInitializer {
             })
         }
 
+        for (item in BuiltInRegistries.ITEM) {
+            if (item is PigmentItem) {
+                HexCardinalComponents.PIGMENT_ITEM_LOOKUP.registerForItems({
+                    item, _ -> CCPigment.ItemBased(item);
+                }, item)
+            }
+            if (item is IotaHolderItem) {
+                HexCardinalComponents.IOTA_HOLDER_LOOKUP.registerForItems({
+                    item, _ -> CCItemIotaHolder.ItemBased(item);
+                }, item)
+            }
+            if (item is HexHolderItem) {
+                HexCardinalComponents.HEX_HOLDER_LOOKUP.registerForItems({
+                    item, _ -> CCHexHolder.ItemBased(item);
+                }, item)
+            }
+            if (item is VariantItem) {
+                HexCardinalComponents.VARIANT_ITEM_LOOKUP.registerForItems({
+                    item, _ -> CCVariantItem.ItemBased(item);
+                }, item)
+            }
+        }
+
         HexCardinalComponents.MEDIA_HOLDER_LOOKUP.registerForItems({
          stack, _ -> CCMediaHolder.Static({ HexConfig.common().dustMediaAmount() }, ADMediaHolder.AMETHYST_DUST_PRIORITY, stack)
         }, HexItems.AMETHYST_DUST)
@@ -217,6 +287,14 @@ object FabricHexInitializer : ModInitializer {
         }, HexBlocks.QUENCHED_ALLAY.asItem())
     }
 
+    private val itemsToAddToCreativeTab : MutableSet<Item> = mutableSetOf()
+
+	private val boundForItem : BiConsumer<Item, ResourceLocation> = BiConsumer {
+        t, id -> this.itemsToAddToCreativeTab.add(t)
+        Registry.register(BuiltInRegistries.ITEM, id, t)
+    }
+
+
     private fun butYouCouldBeFire() {
         val flameOn = FlammableBlockRegistry.getDefaultInstance()
         for (log in listOf(
diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/HexCardinalComponents.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/HexCardinalComponents.java
@@ -58,13 +58,13 @@ public class HexCardinalComponents implements EntityComponentInitializer, ItemCo
     public static final ComponentKey<CCVariantItem> VARIANT_ITEM = ComponentRegistry.getOrCreate(modLoc("variant_item"),
         CCVariantItem.class);
 
-    public static final ItemApiLookup<ADMediaHolder, Void> MEDIA_HOLDER_LOOKUP = ItemApiLookup.get(modLoc("media_holder"), ADMediaHolder.class, Void.class);
+    public static final ItemApiLookup<ADMediaHolder, Void> MEDIA_HOLDER_LOOKUP = ItemApiLookup.get(modLoc("media_holder_item"), ADMediaHolder.class, Void.class);
 
-    public static final ItemApiLookup<ADIotaHolder, Void> IOTA_HOLDER_LOOKUP = ItemApiLookup.get(modLoc("iota_holder"), ADIotaHolder.class, Void.class);
+    public static final ItemApiLookup<ADIotaHolder, Void> IOTA_HOLDER_LOOKUP = ItemApiLookup.get(modLoc("iota_holder_item"), ADIotaHolder.class, Void.class);
 
     public static final ItemApiLookup<ADPigment, Void> PIGMENT_ITEM_LOOKUP = ItemApiLookup.get(modLoc("pigment_item"), ADPigment.class, Void.class);
 
-    public static final ItemApiLookup<ADHexHolder, Void> HEX_HOLDER_LOOKUP = ItemApiLookup.get(modLoc("hex_holder"), ADHexHolder.class, Void.class);
+    public static final ItemApiLookup<ADHexHolder, Void> HEX_HOLDER_LOOKUP = ItemApiLookup.get(modLoc("hex_holder_item"), ADHexHolder.class, Void.class);
 
     public static final ItemApiLookup<ADVariantItem, Void> VARIANT_ITEM_LOOKUP = ItemApiLookup.get(modLoc("variant_item"), ADVariantItem.class, Void.class);
 
diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/BrainsweepeeEmiStack.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/BrainsweepeeEmiStack.java
@@ -26,9 +26,7 @@ public class BrainsweepeeEmiStack extends EmiStack {
 
     public BrainsweepeeEmiStack(BrainsweepeeIngredient ingr) {
         this.ingredient = ingr;
-
-        var bareId = this.ingredient.toString();
-        this.id = modLoc(bareId);
+        this.id = modLoc(this.ingredient.getSomeKindOfReasonableIDForEmi());
     }
 
     @Override
diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/mixin/FabricPlayerMixin.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/mixin/FabricPlayerMixin.java
diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricRegister.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricRegister.java
diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java
diff --git a/Fabric/src/main/resources/fabricasting.mixins.json b/Fabric/src/main/resources/fabricasting.mixins.json
diff --git a/gradle.properties b/gradle.properties

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ loom {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`configureEach {`
`52`		`- runDir "run"`
	`52`	`+ runDir "Fabric/run"`
`53`	`53`	`ideConfigGenerated(true)`
`54`	`54`	`}`
`55`	`55`	`}`
`@@ -121,7 +121,7 @@ dependencies {`
`121`	`121`	`shadowBundle project(path: ':Common', configuration: 'transformProductionFabric')`
`122`	`122`
`123`	`123`	`// === MANDATORY DEPS ===`
`124`		`- modCompileOnly("at.petra-k:paucal:$paucalVersion+$minecraftVersion-common")`
	`124`	`+ modCompileOnly("at.petra-k:paucal:$paucalVersion+$minecraftVersion-fabric")`
`125`	`125`	`// dear mod devs, don't put the platform in the middle of your version code`
`126`	`126`	`modImplementation "vazkii.patchouli:Patchouli:1.21-$patchouliVersion-FABRIC-SNAPSHOT"`
`127`	`127`	`modImplementation "com.samsthenerd.inline:inline-fabric:$minecraftVersion-$inlineVersion"`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@ public class BrainsweepeeEmiStack extends EmiStack {`
`26`	`26`
`27`	`27`	`public BrainsweepeeEmiStack(BrainsweepeeIngredient ingr) {`
`28`	`28`	`this.ingredient = ingr;`
`29`		`-`
`30`		`- var bareId = this.ingredient.toString();`
`31`		`- this.id = modLoc(bareId);`
	`29`	`+ this.id = modLoc(this.ingredient.getSomeKindOfReasonableIDForEmi());`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`@Override`