Not Clickable Items now also includes the composter's inventory, so that only selected items can be placed in the composter

1 files changed, 14 insertions, 13 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
index 3cdc0b699..0cd611e2d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt
@@ -32,22 +32,9 @@ class ComposterOverlay {
     private var fuelFactors: Map<String, Double> = emptyMap()
 
     private val config get() = SkyHanniMod.feature.garden
-    private val hidden get() = SkyHanniMod.feature.hidden
     private var organicMatterDisplay = listOf<List<Any>>()
     private var fuelExtraDisplay = listOf<List<Any>>()
 
-    private var currentOrganicMatterItem: String
-        get() = hidden.gardenComposterCurrentOrganicMatterItem
-        set(value) {
-            hidden.gardenComposterCurrentOrganicMatterItem = value
-        }
-
-    private var currentFuelItem: String
-        get() = hidden.gardenComposterCurrentFuelItem
-        set(value) {
-            hidden.gardenComposterCurrentFuelItem = value
-        }
-
     private var currentTimeType = TimeType.HOUR
     private var inComposter = false
     private var inComposterUpgrades = false
@@ -61,7 +48,21 @@ class ComposterOverlay {
     private var lastHovered = 0L
 
     companion object {
+        private val hidden get() = SkyHanniMod.feature.hidden
+        var currentOrganicMatterItem: String
+            get() = hidden.gardenComposterCurrentOrganicMatterItem
+            private set(value) {
+                hidden.gardenComposterCurrentOrganicMatterItem = value
+            }
+
+        var currentFuelItem: String
+            get() = hidden.gardenComposterCurrentFuelItem
+            private set(value) {
+                hidden.gardenComposterCurrentFuelItem = value
+            }
+
         var testOffset = 0
+
         fun onCommand(args: Array<String>) {
             if (args.size != 1) {
                 LorenzUtils.chat("§cUsage: /shtestcomposter <offset>")