Rewrite dropper and hopper mixins with cross-platform injections. Fix #…

…4176
SpongePowered · Feb 22, 2025 · 3d15ed2 · 3d15ed2
1 parent f01a93b
commit 3d15ed2
Show file tree

Hide file tree

Showing 10 changed files with 174 additions and 380 deletions.
diff --git a/...ixin/inventory/event/world/level/block/entity/HopperBlockEntityMixin_Inventory_Forge.java b/...ixin/inventory/event/world/level/block/entity/HopperBlockEntityMixin_Inventory_Forge.java
diff --git a/forge/src/mixins/resources/mixins.spongeforge.inventory.json b/forge/src/mixins/resources/mixins.spongeforge.inventory.json
@@ -5,6 +5,5 @@
   "target": "@env(DEFAULT)",
   "priority": 1300,
   "mixins": [
-   "event.world.level.block.entity.HopperBlockEntityMixin_Inventory_Forge"
   ]
 }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -187,6 +187,14 @@
             <sha256 value="826f7596352179b24f51540ad2f7d4747cc59345fb026e36f7b2376acbd85e46" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.electronwill.night-config" name="core" version="3.8.1">
+         <artifact name="core-3.8.1.jar">
+            <sha256 value="831144d6c417671360ed240c4ebf51147b8b54f2df126f08f71835bdcda3a1f3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-3.8.1.module">
+            <sha256 value="a8228c533e40bd57e535bf8dee52f6784a47e0aeec11de8d3d5c9d41a7404536" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.electronwill.night-config" name="toml" version="3.6.4">
          <artifact name="toml-3.6.4.jar">
             <sha256 value="3cb3d0ef3352e204cda68215fbe41afdc7f56425ef4fd8e84006964a656117d4" origin="Generated by Gradle"/>
@@ -233,6 +241,14 @@
             <sha256 value="bd42f1ff0a4712e5c54a50e11df0eff922823c47c1f565996aebdc1cb7965f97" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.electronwill.night-config" name="toml" version="3.8.1">
+         <artifact name="toml-3.8.1.jar">
+            <sha256 value="3c782b62bc6a1cc49967696a475f10f709ad385784cd9bb4ec882350cc4efbeb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="toml-3.8.1.module">
+            <sha256 value="834cdcd448f710559a0857bc1474772742adf1ac877a5eebfde8c212f118c702" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml" name="oss-parent" version="41">
          <artifact name="oss-parent-41.pom">
             <sha256 value="af650fa4dd400bc5769320bcef08ed93813f349cabe8213d469acafbbd945d8a" origin="Generated by Gradle"/>
@@ -4853,6 +4869,20 @@
             <sha256 value="fb399fca9a08419d8233dc8d57108d90a4ea315843b62139ea6999a5db3b1abb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.neoforged" name="neoforge" version="21.4.93-beta">
+         <artifact name="neoforge-21.4.93-beta-installer.jar">
+            <sha256 value="b2662a4188a01a6c97615eb741aedc3d1f639b254f2fb9275247938ac5a6e27b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="neoforge-21.4.93-beta-universal.jar">
+            <sha256 value="e08b3c3191e47890e115d7cebdb589722ae8a464db70895f7a6daf3f6f082b45" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="neoforge-21.4.93-beta-userdev.jar">
+            <sha256 value="4f17356117473a42f58daf4e229f3f1586878d270ff58efbab6dce3fb96addde" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="neoforge-21.4.93-beta.module">
+            <sha256 value="d25407fdcf4405a29bbc8b22ea3902bc962efc18c9edd8ca9d265e522db94e1f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.neoforged" name="neoform" version="1.21.1-20240808.144430">
          <artifact name="neoform-1.21.1-20240808.144430.module">
             <sha256 value="c697a0da4423ac17b9a5f891782a4bfd65143a39a3773de43cb54c67ba7d5747" origin="Generated by Gradle"/>
@@ -4957,6 +4987,14 @@
             <sha256 value="05476914c61bcc32af1c164dd0399dd93287178615864049dc93af54b4cd11c1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.neoforged.fancymodloader" name="earlydisplay" version="6.0.9">
+         <artifact name="earlydisplay-6.0.9.jar">
+            <sha256 value="5420beb4f2e6af6418a4a64bfe84710603a28ae7688ebd50ef0f2e5e65546f23" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="earlydisplay-6.0.9.module">
+            <sha256 value="95d62cb1f1251de40b309e72b642daecd54e213357f89a59e9d99ca7a4b65b38" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.neoforged.fancymodloader" name="loader" version="4.0.24">
          <artifact name="loader-4.0.24.jar">
             <sha256 value="c76d1e7c27b40dcb4ba9f376766a95845647dff21f5e3a77d32858461f109ca1" origin="Generated by Gradle"/>
@@ -4989,6 +5027,14 @@
             <sha256 value="b39fb61c6a38c9bba906282eb2e4b535521c07b05f55e31db07024cfaffa1c03" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.neoforged.fancymodloader" name="loader" version="6.0.9">
+         <artifact name="loader-6.0.9.jar">
+            <sha256 value="d50f2719267393af099d766da912c7ccbf63168d62a5e102c2707bd5a69a40d4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="loader-6.0.9.module">
+            <sha256 value="17507a374f59d8956779cfdddee8588b54e83ce647bb7b84e33c56a82acdd564" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.neoforged.installertools" name="binarypatcher" version="2.1.2">
          <artifact name="binarypatcher-2.1.2-fatjar.jar">
             <sha256 value="9d73d565b775c8ec9da83da6d2a25454c7aad95eba22f64def9261f214cc49ba" origin="Generated by Gradle"/>
@@ -5980,6 +6026,11 @@
             <sha256 value="06e2e4db63f9105a0b64ddf34747550f73c8004fe54df0a4b7b196df43c7f6c3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.maven" name="maven" version="3.9.9">
+         <artifact name="maven-3.9.9.pom">
+            <sha256 value="d24ed68923df210d085bb5d386d4336d12ede5473392e159d5e6e64497af6f39" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.maven" name="maven-artifact" version="3.8.1">
          <artifact name="maven-artifact-3.8.1.jar">
             <sha256 value="9dbd3db15ac4816471e72981cb06ef90f3ffa8be6628dddf7135f7bd69bee0c0" origin="Generated by Gradle"/>
@@ -6012,6 +6063,14 @@
             <sha256 value="53aa5f80f6664b7bb2b4a11f63cb96b9331dc64d20fbc2603958acec6573cd58" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.maven" name="maven-artifact" version="3.9.9">
+         <artifact name="maven-artifact-3.9.9.jar">
+            <sha256 value="30f015d1c1a393e19c18cd4f43532089c36d4ca328608ce3dda78b74d3d31515" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="maven-artifact-3.9.9.pom">
+            <sha256 value="65ddf76b92a707b9f1240eccbb4774b30d4c77778671291fd355e06d4d3a96df" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.maven" name="maven-model" version="3.6.0">
          <artifact name="maven-model-3.6.0.jar">
             <sha256 value="a1bf0c7856afd1f1b9c81c22818328fb7a796b4047010e08f2e859d1896080a9" origin="Generated by Gradle"/>
@@ -6040,6 +6099,11 @@
             <sha256 value="cfe4820aa1d96ae51d1dc5b0e2a9dc582c42478c24c95ca8238f547e60bef721" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.maven" name="maven-parent" version="43">
+         <artifact name="maven-parent-43.pom">
+            <sha256 value="468a1262e9aaa5febf9d604e2836267f815351f2b4520f28fb17f53c71e33554" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.maven.doxia" name="doxia" version="1.12.0">
          <artifact name="doxia-1.12.0.pom">
             <sha256 value="2d02a0bd64f331b767cee7455b3193c6fb82110143a119858abc968798a5fc29" origin="Generated by Gradle"/>

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.4.30-beta
+neoForgeVersion=21.4.93-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
diff --git a/.../mixin/inventory/event/world/level/block/entity/HopperBlockEntityMixin_Inventory_Neo.java b/.../mixin/inventory/event/world/level/block/entity/HopperBlockEntityMixin_Inventory_Neo.java
diff --git a/neoforge/src/mixins/resources/mixins.spongeneo.inventory.json b/neoforge/src/mixins/resources/mixins.spongeneo.inventory.json
@@ -6,7 +6,6 @@
   "priority": 1300,
   "mixins": [
     "event.entity.PlayerMixin_Inventory_Neo",
-    "event.server.level.ServerPlayerMixin_Inventory_Neo",
-    "event.world.level.block.entity.HopperBlockEntityMixin_Inventory_Neo"
+    "event.server.level.ServerPlayerMixin_Inventory_Neo"
   ]
 }