Update to Ars Nouveau 4.6.0

Closes #7
62832 · Oct 9, 2023 · 7d1668d · 7d1668d
1 parent 7e0d4b7
commit 7d1668d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,7 +35,7 @@ minecraft {
         configureEach {
             workingDirectory(project.file("run"))
             property("forge.logging.markers", "REGISTRIES")
-            property("forge.logging.console.level", "info")
+            property("forge.logging.console.level", "debug")
 
             mods {
                 create(modId) {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -27,7 +27,7 @@ dependencyResolutionManagement {
             version("ae2", "15.0.11")
             library("ae2", "appeng", "appliedenergistics2-forge").versionRef("ae2")
 
-            version("ars", "4.3.0.72")
+            version("ars", "4.6.0.99")
             library("ars", "com.hollingsworth.ars_nouveau", "ars_nouveau-$minecraftVersion").versionRef("ars")
 
             library("geckolib", "software.bernie.geckolib", "geckolib-forge-$minecraftVersion").version("4.2.1")

diff --git a/src/main/java/gripe/_90/arseng/definition/ArsEngCapabilities.java b/src/main/java/gripe/_90/arseng/definition/ArsEngCapabilities.java
@@ -70,21 +70,27 @@ private boolean isNotBlackListed(ISourceTile tile) {
             event.addListener(provider::invalidate);
         }
 
-        event.addCapability(ArsEnergistique.makeId("generic_inv_wrapper"), new ICapabilityProvider() {
+        var genericInvWrapper = new ICapabilityProvider() {
+            private LazyOptional<ISourceTile> sourceHandler = LazyOptional.empty();
+
             @SuppressWarnings("UnstableApiUsage")
             @NotNull
             @Override
             public <T> LazyOptional<T> getCapability(@NotNull Capability<T> cap, @Nullable Direction side) {
                 if (cap == SOURCE_TILE) {
-                    return be.getCapability(Capabilities.GENERIC_INTERNAL_INV, side)
-                            .lazyMap(GenericStackSourceStorage::new)
-                            .cast();
+                    sourceHandler = be.getCapability(Capabilities.GENERIC_INTERNAL_INV, side)
+                            .lazyMap(GenericStackSourceStorage::new);
                 }
 
-                // this probably shouldn't have an invalidator considering GENERIC_INTERNAL_INV doesn't typically
-                // provide invalidation anyway
-                return LazyOptional.empty();
+                return sourceHandler.cast();
+            }
+
+            private void invalidate() {
+                sourceHandler.invalidate();
             }
-        });
+        };
+
+        event.addCapability(ArsEnergistique.makeId("generic_inv_wrapper"), genericInvWrapper);
+        event.addListener(genericInvWrapper::invalidate);
     }
 }
diff --git a/src/main/java/gripe/_90/arseng/mixin/ConvertBuddingGoalMixin.java b/src/main/java/gripe/_90/arseng/mixin/ConvertBuddingGoalMixin.java
@@ -9,6 +9,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import com.hollingsworth.arsnouveau.client.particle.ParticleColor;
 import com.hollingsworth.arsnouveau.client.particle.ParticleUtil;
 import com.hollingsworth.arsnouveau.common.entity.AmethystGolem;
 import com.hollingsworth.arsnouveau.common.entity.goal.amethyst_golem.ConvertBuddingGoal;
@@ -40,7 +41,7 @@ private void convertCertus(CallbackInfo ci) {
                             targetCluster,
                             AEBlocks.FLAWED_BUDDING_QUARTZ.block().defaultBlockState(),
                             3);
-            ParticleUtil.spawnTouchPacket(golem.level(), targetCluster, ParticleUtil.defaultParticleColorWrapper());
+            ParticleUtil.spawnTouchPacket(golem.level(), targetCluster, ParticleColor.defaultParticleColor());
         }
     }