Working 1.21 port (for the most part) #985

SuperKnux · 2025-12-24T21:22:58Z

No description provided.

# Conflicts: # Fabric/build.gradle # Forge/build.gradle # Forge/src/generated/resources/.cache/d4b3e6634c30118e1127c02b727ea285752e5aac # Neoforge/src/main/java/at/petrak/hexcasting/forge/loot/ForgeHexCypherLootMod.java

…ck later!

… now :c

* Attempted fix of Networking (Incomplete) * Some minor fixes here and there

* Other fixes here and there (fixed up some whole minor folders so that's pretty cool) * Fixed NBTUtils!

* New ContainerInput for Recipes * Various edits to different Items * etc, this is setting up for a merge anyway

…o indev/1.21.1

…visualizing on impeti scrying sight mishap) Fixed slate rendering both as a block entity and an item stack.

…n Fabric; might overhaul the registry with it. * Registered ItemApiLookups (ParticleSprays function on Fabric!!!) * Readded BrainsweepeeIngredient.getSomeKindOfReasonableIDForEmi(), EMI recipes work for the most part * Fixed Fabric Creative Tabs (mostly)

…r other things. * Fixed Fabric interop naming.

…(Not when erroring) * Adjusted Fabric creative mode tab entries (untested) * Fixed scrolls being unreadable * Fixed rendering artifacts when both toasts and casting stack are present on screen

…partially)

* Fixed Media Cube implementation killing server * Adjusted neoforge.mods.toml

…elief:

* Fixed ClientCastingStacks not ticking on Neo

…weep recipes, minor fixes on Fabric

…ve existed in the first place

object-Object · 2026-01-17T20:08:54Z

A note for future reviewers: you can hide all JSON file changes to make the page work significantly faster

object-Object · 2026-01-17T22:11:41Z

Another note for future reviewers: if you use Bitwarden, apparently disabling its browser extension makes the review page work significantly faster???????

object-Object

Mostly only reviewed Common, will come back and look through the platform code later. Left many questions/comments/suggestions.

I think my main concern is with how EntityIota was ported. I'm not sure how we want it to work, but I'm not satisfied with how it currently is. We can discuss it more on Discord.

object-Object · 2026-01-17T19:22:13Z

build.gradle

+compileKotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_21
+    }
+}
+compileTestKotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_21
+    }
+}
+


This is already in subprojects, why do we need it here?

object-Object · 2026-01-17T19:24:53Z

Common/build.gradle

+pkSubproj {
+    platform = "common"
+    pkPublish = false
+}


This is unnecessary. We configure platform in the base build.gradle, and pkPublish defaults to false already.

object-Object · 2026-01-17T19:25:38Z

Common/build.gradle

+loom {
+    accessWidenerPath = file("src/main/resources/hexplat.accesswidener")
+}


This is a duplicate.

object-Object · 2026-01-17T19:38:36Z

Fabric/build.gradle

@@ -9,6 +10,7 @@ architectury {

 // FIXME: update dependencies/versions before releasing 0.12
 pkSubproj {
+    platform = "fabric"


This is already set in the root build.gradle

object-Object · 2026-01-17T19:39:32Z

Fabric/build.gradle

+    modLocalRuntime "dev.architectury:architectury-fabric:$architecturyVersion"
+    modLocalRuntime "com.samsthenerd.inline:inline-fabric:$minecraftVersion-$inlineVersion"
+    modLocalRuntime "at.petra-k:paucal:$paucalVersion+$minecraftVersion-fabric"
+    localRuntime "hexcasting:jankson:1.2.3"


Surely we can get jankson from an actual maven? Why do we need to vendor it?

This was the most reliable way via trial and error for me to prevent Fabric:runClient from failing due to a strange NoSuchMethodError related to Jankson; it's in the name 😭 (it randomly shows up or disappears, it's really weird)

Yes, but why do we need to include the jar locally? Jankson is on Maven Central. Also, can you put that context in a comment here?

object-Object · 2026-01-18T00:09:36Z

Common/src/main/java/at/petrak/hexcasting/xplat/IXplatAbstractions.java

    GameProfile HEXCASTING = new GameProfile(UUID.fromString("8BE7E9DA-1667-11EE-BE56-0242AC120002"), "[HexCasting]");

    boolean isBreakingAllowed(ServerLevel world, BlockPos pos, BlockState state, @Nullable Player player);

    boolean isPlacingAllowed(ServerLevel world, BlockPos pos, ItemStack blockStack, @Nullable Player player);

+    <B> IXplatRegister<B> createRegistar(ResourceKey<Registry<B>> registryKey);


Please add a doc comment

object-Object · 2026-01-18T00:10:08Z

Common/src/main/java/at/petrak/hexcasting/xplat/IXplatRegister.java

+import java.util.function.Supplier;
+
+/**
+ * Handles registration


Can you elaborate a bit?

NeoForge registration uses deferred registry, fabric registration registers things directly, it's platform-independent interface useable in Common module

object-Object · 2026-01-18T00:10:24Z

Common/src/main/java/at/petrak/hexcasting/xplat/IXplatRegister.java

+ * Handles registration
+ * @param <B>
+ */
+public interface IXplatRegister<B> {


Why is the type parameter called B?

it was like that when i got here 😭, i can change it to T instead

It's B because it is BASE class for registry entry.
MyItem extends Item, where MyItem is T generic parameter in register method of this class and B is base class of registry, type parameter of the class

object-Object · 2026-01-18T00:11:49Z

Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt

+        LootTableEvents.MODIFY.register { key, tableBuilder, source, lookup ->
+            if (Blocks.AMETHYST_CLUSTER.lootTable.equals(key)) {
+                tableBuilder.modifyPools { pool ->
+                    pool.apply(SetItemCountFunction.setCount(UniformGenerator.between(1.0f, 2.0f)))
+                }
+            }
+        }
+


What's this for?

The Fabric version of changing the amethyst cluster's default drops for amethyst shards to half of its' original amount.
The 1.20 way of doing it no longer exists in 1.21, so I have to use FAPI to do it.

object-Object · 2026-01-18T00:12:45Z

Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt

+                    HexTags.Actions.PER_WORLD_PATTERN
+                )
+            ) keyList.add(key)
+            keyList.sortWith(Comparator.comparing<ResourceKey<ActionRegistryEntry?>?, ResourceLocation?>(Function { obj: ResourceKey<ActionRegistryEntry?>? -> obj!!.location() }))


Why do we need !! here?

slava110 and others added 30 commits June 15, 2025 20:45

Merge branch 'main' into devel/port-1.21

6bcb401

# Conflicts: # Fabric/build.gradle # Forge/build.gradle # Forge/src/generated/resources/.cache/d4b3e6634c30118e1127c02b727ea285752e5aac # Neoforge/src/main/java/at/petrak/hexcasting/forge/loot/ForgeHexCypherLootMod.java

Fixed Gradle problems and turned off Fabric temporarily. Will come ba…

2774bbb

…ck later!

Ported to 1.21 NeoForge, some Neo-specific stuff is on common package…

e3391a8

… now :c

Fixing errors made during port

c9274b9

Bumped Java version on workflow from 17 to 21

9f1e2f0

Fix resources

87e9ab1

Fix inline displaying for entity iotas

fb7544e

Fix creative tab item ordering

1098f8a

* Mostly complete Implementation of Item Components

09495cb

* Attempted fix of Networking (Incomplete) * Some minor fixes here and there

* More attempts to fix networking

c4ed240

* Other fixes here and there (fixed up some whole minor folders so that's pretty cool) * Fixed NBTUtils!

* More various fixes like...

b07e5b7

* New ContainerInput for Recipes * Various edits to different Items * etc, this is setting up for a merge anyway

Merge remote-tracking branch 'refs/remotes/slava/devel/port-1.21' int…

b3a63f5

…o indev/1.21.1

Biiiiiig fixes :3

8ade16d

that's. that's not how remapping works

93a695a

* Mod finally builds, but fails to launch client

254917c

* Replaced serialization-hooks with Fabric API's CustomIngredient system

caea11d

* Forgot to remove traces of serialization-hooks

63ef2cd

* New FabricRegister for Registries

facfe82

* Attempted fix for Fabric Packet handling

96fe119

* Updated loom and fixed Fabric building.

f60841f

* Changed some files and mixins :help:

60bafd6

* Some datagen

d550985

* Finally finished datagen!

b0debec

Fixed crash with impeti breaking (also, fixed failure of item stacks …

cf1a3aa

…visualizing on impeti scrying sight mishap) Fixed slate rendering both as a block entity and an item stack.

* Added handlers to S2C Payloads

9a8fad3

Duplicates strategy stuff

b64763f

* Turned MobEffects into Holder<MobEffect>s. Might have to do this fo…

96e569e

…r other things. * Fixed Fabric interop naming.

* Fixed Impeti not spraying particles or making noise when activated …

7987ab5

…(Not when erroring) * Adjusted Fabric creative mode tab entries (untested) * Fixed scrolls being unreadable * Fixed rendering artifacts when both toasts and casting stack are present on screen

* Fixed slate rendering, scroll rendering, inline pattern rendering (…

871d6ff

…partially)

github-project-automation bot added this to Hex Casting Dec 24, 2025

github-project-automation bot moved this to 📋 Backlog in Hex Casting Dec 24, 2025

SuperKnux added 2 commits December 26, 2025 19:17

* Added a workaround for SamsTheNerd/inline#34

47d68cc

* Fixed Media Cube implementation killing server * Adjusted neoforge.mods.toml

* i guess non-flat inline patterns will be fullbright for now :N_Disb…

9a9e54a

…elief:

SuperKnux marked this pull request as ready for review December 27, 2025 02:09

SuperKnux and others added 8 commits December 27, 2025 08:27

Update artifact preparation to include Neoforge

057042c

* Fixed particle texture bleeding on Neo

b9beb48

* Fixed ClientCastingStacks not ticking on Neo

Merge remote-tracking branch 'origin/indev/1.21.1' into indev/1.21.1

5735591

* Removed the hex_unbreakable.jsons in generated data

6f8d182

* oops

8c860c5

* Merge updated 1.21 from upstream to indev/1.21.1

a9b83be

Updated generated resources, added synthetic EMI IDs to Fabric brains…

eda63f6

…weep recipes, minor fixes on Fabric

IDEA failed to be useful; readded generated resources as they should'…

6de5e26

…ve existed in the first place

object-Object requested changes Jan 18, 2026

View reviewed changes

github-project-automation bot moved this from 📋 Backlog to 🏗 In progress in Hex Casting Jan 18, 2026

Working 1.21 port (for the most part) #985

Are you sure you want to change the base?

Working 1.21 port (for the most part) #985

Conversation

SuperKnux commented Dec 24, 2025

Uh oh!

object-Object commented Jan 17, 2026

Uh oh!

object-Object commented Jan 17, 2026

Uh oh!

object-Object left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SuperKnux Jan 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

SuperKnux Jan 18, 2026 •

edited

Loading