chore: update to 1.21.4 release

SpongePowered · Dec 16, 2024 · 07fb930 · 07fb930
1 parent 0af2492
commit 07fb930
Show file tree

Hide file tree

Showing 6 changed files with 139 additions and 5 deletions.
diff --git a/forge/gradle.properties b/forge/gradle.properties
@@ -2,7 +2,7 @@ name=SpongeForge
 implementation=Forge
 description=The SpongeAPI implementation for MinecraftForge
 
-forgeVersion=52.0.3
+forgeVersion=54.0.6
 loom.platform=forge
 fabric.loom.dontRemap=true
 mixinConfigs=mixins.spongeforge.accessors.json,mixins.spongeforge.api.json,mixins.spongeforge.inventory.json,mixins.spongeforge.inventory.shared.json,mixins.spongeforge.core.json,mixins.spongeforge.core.shared.json,mixins.spongeforge.tracker.json
diff --git a/forge/src/main/java/org/spongepowered/forge/hook/ForgeItemHooks.java b/forge/src/main/java/org/spongepowered/forge/hook/ForgeItemHooks.java
@@ -24,6 +24,7 @@
  */
 package org.spongepowered.forge.hook;
 
+import net.minecraft.core.Holder;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;
 import org.spongepowered.common.hooks.ItemHooks;
@@ -32,6 +33,6 @@ public class ForgeItemHooks implements ItemHooks {
 
     @Override
     public boolean canEnchantmentBeAppliedToItem(Enchantment enchantment, ItemStack stack) {
-        return stack.canApplyAtEnchantingTable(enchantment);
+        return stack.canApplyAtEnchantingTable(Holder.direct(enchantment));
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.c
   mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json
 superClassChanges=common.superclasschange
 
-minecraftVersion=1.21.4-rc3
+minecraftVersion=1.21.4
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ format = { version = "1.1" }
 # See SpongeAPI's gradle/libs.versions.toml for many dependency declarations that Sponge also uses
 [versions]
 asm = "9.7"
-log4j = "2.22.1"
+log4j = "2.24.1"
 forgeAutoRenamingTool = "1.0.6"
 mixin = "0.8.7"
 bootstrap = "2.1.1"

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1006,6 +1006,9 @@
          <artifact name="guava-33.3.1-jre.module">
             <sha256 value="41858c84753fd96a6b7c51122fccef39558c91cc08264e08506bcf20e0e63733" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="guava-33.3.1-jre.pom">
+            <sha256 value="313b67fc13eb3b0634eda715a1229971f5de9b8188bc280762815b83a275f193" origin="Generated by Gradle"/>
+         </artifact>
       </component>
       <component group="com.google.guava" name="guava-parent" version="25.1-jre">
          <artifact name="guava-parent-25.1-jre.pom">
@@ -1304,6 +1307,9 @@
          <artifact name="authlib-6.0.57.module">
             <sha256 value="81034a34ae135cae2671386a6e763183c6e04a6250b9ed5bd2128faf90dc9c8d" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="authlib-6.0.57.pom">
+            <sha256 value="4ec0ac4b4c9adeecccaa3af70d87234c6bdcaa1eb4c009f7c94c0bc8a08c32b0" origin="Generated by Gradle"/>
+         </artifact>
       </component>
       <component group="com.mojang" name="blocklist" version="1.0.10">
          <artifact name="blocklist-1.0.10.jar">
@@ -1430,6 +1436,9 @@
          <artifact name="logging-1.5.10.module">
             <sha256 value="7244de0e9f1bb6ad8c6b1e2024f924e7a9abf86e9b5a9f4a83e94ff1c7c53bf2" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="logging-1.5.10.pom">
+            <sha256 value="4b00e3a9f5bbccfc96a24cf8e177594b68cebfc5f788570bd5cfeee2c3c3c0cc" origin="Generated by Gradle"/>
+         </artifact>
       </component>
       <component group="com.mojang" name="patchy" version="2.2.10">
          <artifact name="patchy-2.2.10.jar">
@@ -1820,6 +1829,14 @@
             <sha256 value="7aaa35810c5d3d831d4db986b622f763d3be631d6c66dbba1f8ee3e7f4c87bbb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="de.oceanlabs.mcp" name="mcp_config" version="1.21.4-20241203.143248">
+         <artifact name="mcp_config-1.21.4-20241203.143248.pom">
+            <sha256 value="332ed9e0f1fe2fa5f87f314d9ef82c639e7a427d9007eef20b90e2397dc586dd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="mcp_config-1.21.4-20241203.143248.zip">
+            <sha256 value="4ab389a224f2f07549ad3e808e936454f9f2b270fcea5dacfb978d449079d330" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="de.siegmar" name="fastcsv" version="2.0.0">
          <artifact name="fastcsv-2.0.0.jar">
             <sha256 value="665d52cb6f35ca236919be9ac81653c208628507f91d6bf13479bc11496db616" origin="Generated by Gradle"/>
@@ -3111,6 +3128,14 @@
             <sha256 value="1b08236075763c856ad8f24ac12874078c65f6b004c10b988e02b2c36ac1652f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="bootstrap" version="2.1.6">
+         <artifact name="bootstrap-2.1.6.jar">
+            <sha256 value="89bef3cb957f6473e72cb5c0ba2310f616f73dc2052a11e1f8bfe4189782599d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="bootstrap-2.1.6.pom">
+            <sha256 value="6e03a8ec859fa0f336db06dbd441d066153bfbe055017d46be6a6dad1f89ef62" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="bootstrap-api" version="2.0.0">
          <artifact name="bootstrap-api-2.0.0.jar">
             <sha256 value="53c802da93c4f4dec14b9c43bf17dc9b7e2d5343b97234e34c11dd670b2df127" origin="Generated by Gradle"/>
@@ -3146,6 +3171,14 @@
             <sha256 value="afa588040b19abdf70837e0fee9780177fb08ae06fe7a0c67db7ce94b992a04f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="bootstrap-api" version="2.1.6">
+         <artifact name="bootstrap-api-2.1.6.jar">
+            <sha256 value="35d94be274925961fb4f39a09ee97d3839ca1ad39f1b704d1460d16e93b69df5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="bootstrap-api-2.1.6.pom">
+            <sha256 value="00c9b25683b9dfd65dd17ae0d535d95d9c21a44acee876d6aa3d8b427d0df8d2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="bootstrap-dev" version="2.1.0">
          <artifact name="bootstrap-dev-2.1.0.jar">
             <sha256 value="0a96b543fd2aaa681c17f360cb13793f2466c4d6b0b3e80fc13bc7d2c2ef6075" origin="Generated by Gradle"/>
@@ -3189,6 +3222,14 @@
             <sha256 value="d2b4fcd512f7055dccac553a9d8703b4829b77cac4b725db2fcd020131a36dfc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="coremods" version="5.2.1">
+         <artifact name="coremods-5.2.1.jar">
+            <sha256 value="d206b334cf0d50b28a9a186c67cf996d1a875368ce5c680f1e912f505777f111" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="coremods-5.2.1.pom">
+            <sha256 value="b79dcee9e9260a616ee2a798b19f865c93581c0bffef82d22bd6398cb93c7df6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="eventbus" version="6.2.0">
          <artifact name="eventbus-6.2.0.jar">
             <sha256 value="6505f676350dfb3fb85766b482a0bb631cdb44fb3b53c66e38eecfd16f0b20ab" origin="Generated by Gradle"/>
@@ -3261,6 +3302,14 @@
             <sha256 value="0ac809823b6f5eba92bf8015b9311d3421d07aab55bb2281a2b21444f810fae7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="fmlcore" version="1.21.4-54.0.6">
+         <artifact name="fmlcore-1.21.4-54.0.6.jar">
+            <sha256 value="4c61a4b491098fa624b2baaa55040827564e340b321de0e086445e3a147bc2dd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="fmlcore-1.21.4-54.0.6.pom">
+            <sha256 value="ee6133a84349dbb4ef384a66fbb76f20e8d4404b87be960b57fea49510a34659" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="fmlearlydisplay" version="1.20.4-49.0.38">
          <artifact name="fmlearlydisplay-1.20.4-49.0.38.jar">
             <sha256 value="93f12d9140f63c6371f35f89a2081490cf895dc30926e06d1883a860cb00d6be" origin="Generated by Gradle"/>
@@ -3309,6 +3358,14 @@
             <sha256 value="950cfdeed818e4e9a076230246480623c76cdd30c8255bdcdb859121a22996b7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="fmlearlydisplay" version="1.21.4-54.0.6">
+         <artifact name="fmlearlydisplay-1.21.4-54.0.6.jar">
+            <sha256 value="2ba94d3a73df8d41912e8bb7d51c42a455a7377206a6fc2685689d3a0b1e31f9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="fmlearlydisplay-1.21.4-54.0.6.pom">
+            <sha256 value="e170221933d4e3b2cb562578fd17de1f2f9ef418f9e86cf4a15adebb92cf5217" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="fmlloader" version="1.20.4-49.0.38">
          <artifact name="fmlloader-1.20.4-49.0.38.jar">
             <sha256 value="038956f20251656f44a0d50aebe4eca7b18437bea88908c4bd2db77166fb0594" origin="Generated by Gradle"/>
@@ -3357,6 +3414,14 @@
             <sha256 value="323b91a44ea95ff5058be25eb4fb05c5ea35a5e1514d21688e59e0022f8fb18f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="fmlloader" version="1.21.4-54.0.6">
+         <artifact name="fmlloader-1.21.4-54.0.6.jar">
+            <sha256 value="bede386db7f4b1ef50c60c15f4e88bd02e839c41d23f05c62a141dc982a7f836" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="fmlloader-1.21.4-54.0.6.pom">
+            <sha256 value="9ec049f901ccc9d90db21fd2261403fb8be67679b86765edc162655a29ec7404" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="forge" version="1.20.4-49.0.38">
          <artifact name="forge-1.20.4-49.0.38-installer.jar">
             <sha256 value="7781ceff8a8afea8a33705ee35775c8278951a1020a667370a8df4d423ea719e" origin="Generated by Gradle"/>
@@ -3441,6 +3506,20 @@
             <sha256 value="8299590f9b3cb3f999cd1707aed14e0ed059835bd60bd201184872320d5ed26a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="forge" version="1.21.4-54.0.6">
+         <artifact name="forge-1.21.4-54.0.6-installer.jar">
+            <sha256 value="aad5e7eb9d0bf5c205a9b0bcd1b5c2186b842e341512bea4d428524de5e5c360" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="forge-1.21.4-54.0.6-universal-srg.jar">
+            <sha256 value="b16e09fac62ffb47eba16f3bd0f826e6883da9cec189ca2d172c99c675065cbb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="forge-1.21.4-54.0.6-userdev.jar">
+            <sha256 value="7ff10ebdfc126fdaed07d2b5a31374e5826e6f393e607c5ee2d6f14c4ca43426" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="forge-1.21.4-54.0.6.pom">
+            <sha256 value="572886b5e364b25839a5f2099a280e07a9cfe169f4ba169b6c26cb6f209b573e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="forgespi" version="7.1.3">
          <artifact name="forgespi-7.1.3.jar">
             <sha256 value="4c331e1bdac3215d134f8d0b92a814a866193d39793fb52441fa08621760851d" origin="Generated by Gradle"/>
@@ -3457,6 +3536,14 @@
             <sha256 value="08b97771de39c61ac3a43b03268f39bd6d124544b079d75dc6a7174ad297c95a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="forgespi" version="7.1.5">
+         <artifact name="forgespi-7.1.5.jar">
+            <sha256 value="6dc1df5e18479dce2d7d65a8b706e22f70448ee79fa9123825b459b458dabcb7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="forgespi-7.1.5.pom">
+            <sha256 value="b43c29c596adc1b523c0010487e2d9261d5092f78ac17bc28217fad6af71d80f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="installertools" version="1.2.0">
          <artifact name="installertools-1.2.0.jar">
             <sha256 value="e1f31d6e2272f29dfb08739721c150b0021d789a580b821515c1a8a782f42fcc" origin="Generated by Gradle"/>
@@ -3513,6 +3600,14 @@
             <sha256 value="3d1046da4bd675a7ad7eb55364a967a54221ff4de15f88ae6c9522924c80b3d0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="javafmllanguage" version="1.21.4-54.0.6">
+         <artifact name="javafmllanguage-1.21.4-54.0.6.jar">
+            <sha256 value="9c350dfc55fb6376c46d82674a622e9bd4928c325a1342f2189b55bb63169d30" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="javafmllanguage-1.21.4-54.0.6.pom">
+            <sha256 value="e7015fb89ce326e5670ce50c2483e66459e5c64f8f09112e3a131fbcc4f1442f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="lowcodelanguage" version="1.20.4-49.0.38">
          <artifact name="lowcodelanguage-1.20.4-49.0.38.jar">
             <sha256 value="3d2afae5f4f287fcaa986ac9a773914768e1494e4f30c2d525a11f8452334e1a" origin="Generated by Gradle"/>
@@ -3561,6 +3656,14 @@
             <sha256 value="5663376c6d9728bac03969b7de72bef5dfce60cc59bdee86317805efb92f3722" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="lowcodelanguage" version="1.21.4-54.0.6">
+         <artifact name="lowcodelanguage-1.21.4-54.0.6.jar">
+            <sha256 value="55839dc8c8d558a6f0ff103798d45b4215b73e07eeb0e3ece1e4f92a1952f3bf" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lowcodelanguage-1.21.4-54.0.6.pom">
+            <sha256 value="7ccc9358fd229e474fbf2447688f255c6e2a55a9b1e9a5a0c3a39a5ab121643c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="mclanguage" version="1.20.4-49.0.38">
          <artifact name="mclanguage-1.20.4-49.0.38.jar">
             <sha256 value="f27a2497aedee2a786976f9b891f1893fbe1e96fa759a4a61800f3e5c5d77cc7" origin="Generated by Gradle"/>
@@ -3609,6 +3712,14 @@
             <sha256 value="374d0a6781901b995fe1ca2c41035f00d9f1714173fefefa2cec61c6294a9063" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="mclanguage" version="1.21.4-54.0.6">
+         <artifact name="mclanguage-1.21.4-54.0.6.jar">
+            <sha256 value="294f583257554f5e03d988b8cbb743727b787082b6b064d6e72e87afe628fd6d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="mclanguage-1.21.4-54.0.6.pom">
+            <sha256 value="b41ad0d9931435c50f0b890c4a4894df22cc55b9a45107a4f6a32437523fe484" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="mergetool" version="1.2.2">
          <artifact name="mergetool-1.2.2.jar">
             <sha256 value="b3dcfdcf49128481e24e4d23ecdb6e34ada10f9ed7fd522404e4eedccaaff36a" origin="Generated by Gradle"/>
@@ -3655,6 +3766,14 @@
             <sha256 value="7423292fa7d00b5ebc888612248c1b5b8172e5a53b0285c141617c79a48f15ad" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.minecraftforge" name="modlauncher" version="10.2.2">
+         <artifact name="modlauncher-10.2.2.jar">
+            <sha256 value="74d0165f967327222ceb6591ac6e08b3a56ee60624e2f558dc8d6b7a2d3dec42" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="modlauncher-10.2.2.pom">
+            <sha256 value="c5aa6bc4acef77146ed6a787c0746e112ba975eea39506ad4dcf5037cc243ebf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.minecraftforge" name="securemodules" version="2.2.10">
          <artifact name="securemodules-2.2.10.jar">
             <sha256 value="784164b8f5bc99e9538512dba01560817078f9ede68fd1fa66ac8a5b82dda7c8" origin="Generated by Gradle"/>
@@ -3686,6 +3805,9 @@
          <artifact name="securemodules-2.2.20.module">
             <sha256 value="07ffefc19bc925a5c60990dc7ca98d4476d56cc021d493c3d31328dba97d1d8d" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="securemodules-2.2.20.pom">
+            <sha256 value="a7f3f89e8371d9bb74d95b041e640c1a78d6070c61854859dc7c616785c7b765" origin="Generated by Gradle"/>
+         </artifact>
       </component>
       <component group="net.minecraftforge" name="srgutils" version="0.4.1">
          <artifact name="srgutils-0.4.1.jar">
@@ -4897,6 +5019,14 @@
             <sha256 value="0d9a55c31778e3ebead54992b58d806aff68e3f061e41fc740df463117b8c546" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.logging.log4j" name="log4j-jpl" version="2.24.1">
+         <artifact name="log4j-jpl-2.24.1.jar">
+            <sha256 value="2772c06178b574a6e55c80df3c19444aff904b7c998e6a6696bbd0336e76ead4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="log4j-jpl-2.24.1.pom">
+            <sha256 value="21183170231199d7e5632ab0e6b980c59e716952fe5fe3709847989b24dab2c2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.logging.log4j" name="log4j-jpl" version="3.0.0-beta2">
          <artifact name="log4j-jpl-3.0.0-beta2.pom">
             <sha256 value="22b2075db19e2776aa163afd37384e42b1e9322775630d4749fbf1079ebd90fb" origin="Generated by Gradle"/>
@@ -5746,6 +5876,9 @@
          <artifact name="joml-1.10.8.module">
             <sha256 value="827732f57b3355f5bcdb5baa997338aac9c7d4483deba560a7575231239ee315" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="joml-1.10.8.pom">
+            <sha256 value="80ba8dd6e9c55594ee473dfccc14c6788d2e75410df75b02ab4d8a103c2d5f2c" origin="Generated by Gradle"/>
+         </artifact>
       </component>
       <component group="org.jspecify" name="jspecify" version="0.3.0">
          <artifact name="jspecify-0.3.0.jar">

diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties
@@ -2,7 +2,7 @@ name=SpongeNeo
 implementation=NeoForge
 description=The SpongeAPI implementation for NeoForge
 
-neoForgeVersion=21.3.0-beta
+neoForgeVersion=21.4.30-beta
 loom.platform=neoforge
 fabric.loom.dontRemap=true
 mixinConfigs=mixins.spongeneo.accessors.json,mixins.spongeneo.api.json,mixins.spongeneo.inventory.json,mixins.spongeneo.core.json,mixins.spongeneo.tracker.json