Removed Energy Integration

Hiiragi283 · Nov 1, 2024 · 8e7ae9c · 8e7ae9c
1 parent f098d6d
commit 8e7ae9c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 100 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ fabric-kotlin = { group = "net.fabricmc", name = "fabric-language-kotlin", versi
 #cca-api = { group = "org.ladysnake.cardinal-components-api", name = "cardinal-components-api", version.ref = "cca" }
 #cca-base = { group = "org.ladysnake.cardinal-components-api", name = "cardinal-components-base", version.ref = "cca" }
 #cca-entity = { group = "org.ladysnake.cardinal-components-api", name = "cardinal-components-entity", version.ref = "cca" }
-#energy = { group = "teamreborn", name = "energy", version.ref = "energy" }
+
 #libgui = { group = "io.github.cottonmc", name = "LibGui", version.ref = "lib-gui" }
 
 accessories = { group = "io.wispforest", name = "accessories-fabric", version.ref = "accessories" }

diff --git a/src/client/kotlin/hiiragi283/ragium/integration/jade/HTMachineProvider.kt b/src/client/kotlin/hiiragi283/ragium/integration/jade/HTMachineProvider.kt
@@ -2,6 +2,7 @@ package hiiragi283.ragium.integration.jade
 
 import com.mojang.serialization.Codec
 import com.mojang.serialization.MapCodec
+import hiiragi283.ragium.api.inventory.HTDelegatedInventory
 import hiiragi283.ragium.api.inventory.HTSimpleInventory
 import hiiragi283.ragium.api.machine.HTMachineTier
 import hiiragi283.ragium.api.machine.HTMachineType
@@ -83,7 +84,7 @@ object HTMachineProvider : IBlockComponentProvider, IServerDataProvider<BlockAcc
         accessor.machineEntity?.let { machine: HTMachineEntity<*> ->
             accessor.writeData(TYPE, machine.machineType)
             accessor.writeData(TIER, machine.tier)
-            accessor.writeData(INVENTORY, machine.parent)
+            (machine as? HTDelegatedInventory<*>)?.parent?.let { accessor.writeData(INVENTORY, it) }
             accessor.writeData(TICK, machine.property.get(0))
             accessor.writeData(MAX_TICK, machine.property.get(1))
             if (machine is HTMultiblockController) {

diff --git a/src/main/kotlin/hiiragi283/ragium/integration/RagiumEnergyPlugin.kt b/src/main/kotlin/hiiragi283/ragium/integration/RagiumEnergyPlugin.kt
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -49,10 +49,6 @@
         "value": "hiiragi283.ragium.integration.RagiumClientAccessoriesPlugin",
         "adapter": "kotlin"
       },
-      {
-        "value": "hiiragi283.ragium.integration.RagiumEnergyPlugin",
-        "adapter": "kotlin"
-      },
       {
         "value": "hiiragi283.ragium.integration.RagiumPatchouliPlugin",
         "adapter": "kotlin"