summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/NeuSacksJson.kt14
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt6
3 files changed, 20 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/NeuSacksJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/NeuSacksJson.kt
new file mode 100644
index 000000000..c323211fb
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/NeuSacksJson.kt
@@ -0,0 +1,14 @@
+package at.hannibal2.skyhanni.data.jsonobjects.other
+
+import at.hannibal2.skyhanni.utils.NEUInternalName
+import com.google.gson.annotations.Expose
+
+
+data class NeuSacksJson(
+ @Expose val sacks: Map<String, SackInfo>
+)
+
+data class SackInfo(
+ @Expose val item: NEUInternalName,
+ @Expose val contents: List<NEUInternalName>
+)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java
index a2c6dc66e..e8bb83a79 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java
@@ -9,7 +9,4 @@ public class SacksJson {
@Deprecated
@Expose
public List<String> sackList;
-
- @Expose
- public List<String> sackItems;
}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
index 021dd183b..19fba633b 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.data.repo
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.config.ConfigManager
import at.hannibal2.skyhanni.events.DebugDataCollectEvent
+import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent
import at.hannibal2.skyhanni.events.RepositoryReloadEvent
import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.ChatUtils
@@ -279,4 +280,9 @@ class RepoManager(private val configLocation: File) {
)
).use { writer -> writer.write(gson.toJson(json)) }
}
+
+ @SubscribeEvent
+ fun onNeuRepoReload(event: io.github.moulberry.notenoughupdates.events.RepositoryReloadEvent) {
+ NeuRepositoryReloadEvent().postAndCatch()
+ }
}