1.19.2 (#45)

MineInAbyss · Aug 14, 2022 · efc0eb2 · efc0eb2
1 parent 6fda0bb
commit efc0eb2
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
     // Other plugins
-    compileOnly(lootylibs.geary.papermc.core)
+    compileOnly(lootyLibs.geary.papermc.core)
 
     // From Geary
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=com.mineinabyss
-version=0.7
+version=0.8
 kotlinVersion=1.6.10
-idofrontVersion=0.11.97
-serverVersion=1.19-R0.1-SNAPSHOT
+idofrontVersion=0.12.102
+serverVersion=1.19.2-R0.1-SNAPSHOT
diff --git a/gradle/lootylibs.versions.toml → gradle/lootyLibs.versions.toml b/gradle/lootylibs.versions.toml → gradle/lootyLibs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-geary = "0.18.105"
+geary = "0.19.108"
 
 [libraries]
 geary-papermc-core = { module = "com.mineinabyss:geary-papermc-core", version.ref = "geary" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -30,7 +30,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("libs").from("com.mineinabyss:catalog:$idofrontVersion")
-        create("lootylibs").from(files("gradle/lootylibs.versions.toml"))
+        create("lootyLibs").from(files("gradle/lootyLibs.versions.toml"))
     }
 }
 

diff --git a/src/main/kotlin/com/mineinabyss/looty/LootyFactory.kt b/src/main/kotlin/com/mineinabyss/looty/LootyFactory.kt
@@ -2,7 +2,7 @@ package com.mineinabyss.looty
 
 import com.mineinabyss.geary.components.RegenerateUUIDOnClash
 import com.mineinabyss.geary.datatypes.GearyEntity
-import com.mineinabyss.geary.datatypes.GearyType
+import com.mineinabyss.geary.datatypes.GearyEntityType
 import com.mineinabyss.geary.helpers.NO_ENTITY
 import com.mineinabyss.geary.helpers.addParent
 import com.mineinabyss.geary.helpers.entity
@@ -64,7 +64,7 @@ object LootyFactory {
                 CraftMagicNumbers.getMaterial(item.item),
                 tag.getInt("CustomModelData")
             )] ?: return
-            pdc.encodeComponents(setOf(), GearyType())
+            pdc.encodeComponents(setOf(), GearyEntityType())
             pdc.encodePrefabs(listOf(prefab))
         }
     }

diff --git a/src/main/kotlin/com/mineinabyss/looty/ecs/systems/ItemRecipeSystem.kt b/src/main/kotlin/com/mineinabyss/looty/ecs/systems/ItemRecipeSystem.kt
@@ -2,7 +2,7 @@ package com.mineinabyss.looty.ecs.systems
 
 import com.mineinabyss.geary.annotations.AutoScan
 import com.mineinabyss.geary.prefabs.PrefabKey
-import com.mineinabyss.geary.systems.TickingSystem
+import com.mineinabyss.geary.systems.RepeatingSystem
 import com.mineinabyss.geary.systems.accessors.TargetScope
 import com.mineinabyss.idofront.recipes.register
 import com.mineinabyss.looty.LootyFactory
@@ -17,7 +17,7 @@ import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.inventory.ItemStack
 
 @AutoScan
-class ItemRecipeSystem : TickingSystem(), Listener {
+class ItemRecipeSystem : RepeatingSystem(), Listener {
     private val TargetScope.recipes by get<RegisterRecipeComponent>()
     private val TargetScope.prefabKey by get<PrefabKey>()
     private val registeredRecipes = mutableSetOf<NamespacedKey>()

diff --git a/src/main/kotlin/com/mineinabyss/looty/ecs/systems/PeriodicSaveSystem.kt b/src/main/kotlin/com/mineinabyss/looty/ecs/systems/PeriodicSaveSystem.kt
@@ -4,15 +4,15 @@ import com.mineinabyss.geary.annotations.AutoScan
 import com.mineinabyss.geary.components.relations.Persists
 import com.mineinabyss.geary.papermc.store.encode
 import com.mineinabyss.geary.papermc.store.encodeComponentsTo
-import com.mineinabyss.geary.systems.TickingSystem
+import com.mineinabyss.geary.systems.RepeatingSystem
 import com.mineinabyss.geary.systems.accessors.TargetScope
 import com.mineinabyss.geary.systems.accessors.building.flatten
 import com.mineinabyss.idofront.items.editItemMeta
 import org.bukkit.inventory.ItemStack
 import kotlin.time.Duration.Companion.seconds
 
 @AutoScan
-class PeriodicSaveSystem : TickingSystem(interval = 5.seconds) {
+class PeriodicSaveSystem : RepeatingSystem(interval = 5.seconds) {
     private val TargetScope.persisting by getRelations<Persists, Any>().flatten()
     private val TargetScope.item by get<ItemStack>()
 

diff --git a/src/main/kotlin/com/mineinabyss/looty/ecs/systems/tracking/ItemTrackerSystem.kt b/src/main/kotlin/com/mineinabyss/looty/ecs/systems/tracking/ItemTrackerSystem.kt
@@ -12,7 +12,7 @@ import com.mineinabyss.geary.papermc.GearyMCContext
 import com.mineinabyss.geary.papermc.GearyMCContextKoin
 import com.mineinabyss.geary.papermc.access.toGeary
 import com.mineinabyss.geary.systems.GearyListener
-import com.mineinabyss.geary.systems.TickingSystem
+import com.mineinabyss.geary.systems.RepeatingSystem
 import com.mineinabyss.geary.systems.accessors.TargetScope
 import com.mineinabyss.idofront.nms.aliases.NMSItemStack
 import com.mineinabyss.idofront.nms.aliases.toNMS
@@ -38,7 +38,7 @@ import org.bukkit.entity.Player
  * - All valid items get re-serialized TODO in the future there should be some form of dirty tag so we aren't unnecessarily serializing things
  */
 @AutoScan
-class ItemTrackerSystem : TickingSystem(interval = 1.ticks) {
+class ItemTrackerSystem : RepeatingSystem(interval = 1.ticks) {
     private val TargetScope.player by get<Player>()
     private val TargetScope.itemCache by get<PlayerItemCache>()