fix: build

SirEdvin · Jul 30, 2023 · 69794e2 · 69794e2
1 parent 630431c
commit 69794e2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.warning.mode = all
 # Check these on https://fabricmc.net/develop/
 minecraftVersion = 1.20.1
 # Mod Properties
-modVersion = 1.3.0-pre.2
+modVersion = 1.3.0-pre.3
 mavenGroup = site.siredvin
 modBaseName = peripheralworks
 archivesBaseName = peripheralworks

diff --git a/projects/core/src/main/kotlin/site/siredvin/peripheralworks/PeripheralWorksCore.kt b/projects/core/src/main/kotlin/site/siredvin/peripheralworks/PeripheralWorksCore.kt
@@ -2,10 +2,8 @@ package site.siredvin.peripheralworks
 import net.minecraft.world.item.CreativeModeTab
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
-import site.siredvin.peripheralium.extra.plugins.AbstractInventoryPlugin
 import site.siredvin.peripheralium.storages.item.ItemStorageExtractor
 import site.siredvin.peripheralium.xplat.BaseInnerPlatform
-import site.siredvin.peripheralworks.common.blockentity.EntityLinkBlockEntity
 import site.siredvin.peripheralworks.common.setup.Blocks
 import site.siredvin.peripheralworks.computercraft.ComputerCraftProxy
 import site.siredvin.peripheralworks.computercraft.EnergyStorageProvider

diff --git a/...forge/src/main/kotlin/site/siredvin/peripheralworks/integrations/occultism/Integration.kt b/...forge/src/main/kotlin/site/siredvin/peripheralworks/integrations/occultism/Integration.kt
@@ -3,16 +3,13 @@ package site.siredvin.peripheralworks.integrations.occultism
 import com.klikli_dev.occultism.api.common.blockentity.IStorageController
 import com.klikli_dev.occultism.api.common.blockentity.IStorageControllerProxy
 import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity
-import com.klikli_dev.occultism.common.entity.spirit.MaridEntity
 import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.world.level.Level
 import site.siredvin.peripheralium.api.peripheral.IPeripheralPlugin
 import site.siredvin.peripheralium.extra.plugins.PeripheralPluginUtils
-import site.siredvin.peripheralium.storages.ForgeStorageUtils
 import site.siredvin.peripheralium.storages.item.ItemHandlerWrapper
-import site.siredvin.peripheralium.storages.item.ItemStorage
 import site.siredvin.peripheralium.storages.item.ItemStorageExtractor
 import site.siredvin.peripheralworks.api.PeripheralPluginProvider
 import site.siredvin.peripheralworks.common.configuration.PeripheralWorksConfig
@@ -84,18 +81,21 @@ class Integration : Runnable {
             },
         )
         ItemStorageExtractor.addStorageExtractor(
-            ItemStorageExtractor.StorageEntityExtractor {_, entity ->
-                if (entity is SpiritEntity)
+            ItemStorageExtractor.StorageEntityExtractor { _, entity ->
+                if (entity is SpiritEntity) {
                     return@StorageEntityExtractor ItemHandlerWrapper(entity.inventory)
+                }
                 return@StorageEntityExtractor null
-            }
+            },
+        )
+        EntityLinkPeripheral.ENRICHERS.add(
+            BiConsumer { entity, data ->
+                if (entity is SpiritEntity) {
+                    data["age"] = entity.spiritAge
+                    data["maxAge"] = entity.spiritMaxAge
+                }
+            },
         )
-        EntityLinkPeripheral.ENRICHERS.add(BiConsumer { entity, data ->
-            if (entity is SpiritEntity) {
-                data["age"] = entity.spiritAge
-                data["maxAge"] = entity.spiritMaxAge
-            }
-        })
         PeripheralWorksConfig.registerIntegrationConfiguration(Configuration)
     }
 }