Update glitter to artifactory

Author: thecodewarrior

modules/glitter/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    `module-conventions`
+    `liblib-module-root`
 }
 
 module {
@@ -9,19 +9,6 @@ module {
     moduleDependencies("core", "etcetera", "albedo")
 }
 
-configureFabricModJson {
-    entrypoint("main", adapter = "kotlin", value = "com.teamwizardry.librarianlib.glitter.LibLibGlitter\$CommonInitializer")
-    entrypoint("client", adapter = "kotlin", value = "com.teamwizardry.librarianlib.glitter.LibLibGlitter\$ClientInitializer")
-    entrypoint("server", adapter = "kotlin", value = "com.teamwizardry.librarianlib.glitter.LibLibGlitter\$ServerInitializer")
-    mixin("ll/glitter/glitter.mixins.json")
-}
-
-configureFabricTestModJson {
-    entrypoint("main", adapter = "kotlin", value = "com.teamwizardry.librarianlib.glitter.test.LibLibGlitterTest\$CommonInitializer")
-    entrypoint("client", adapter = "kotlin", value = "com.teamwizardry.librarianlib.glitter.test.LibLibGlitterTest\$ClientInitializer")
-    entrypoint("server", adapter = "kotlin", value = "com.teamwizardry.librarianlib.glitter.test.LibLibGlitterTest\$ServerInitializer")
-}
-
 dependencies {
     shade("org.magicwerk:brownies-collections:0.9.13")
 }

modules/glitter/common/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    `liblib-module-common`
+}

…ib/glitter/bindings/CallbackBinding.java …ib/glitter/bindings/CallbackBinding.javamodules/glitter/src/main/java/com/teamwizardry/librarianlib/glitter/bindings/CallbackBinding.java renamed to modules/glitter/common/src/main/java/com/teamwizardry/librarianlib/glitter/bindings/CallbackBinding.java modules/glitter/src/main/java/com/teamwizardry/librarianlib/glitter/bindings/CallbackBinding.java renamed to modules/glitter/common/src/main/java/com/teamwizardry/librarianlib/glitter/bindings/CallbackBinding.java

@@ -18,13 +18,13 @@ class MinecraftClientHooks {
     public void joinWorld(ClientWorld world, DownloadingTerrainScreen.WorldEntryReason worldEntryReason, CallbackInfo ci) {
         GlitterWorldCollider.INSTANCE.clearCaches();
         GlitterLightingCache.INSTANCE.clearCache();
-        ParticleSystemManager.INSTANCE.clearParticles$glitter();
+        ParticleSystemManager.INSTANCE.clearParticles$common();
     }
 
     @Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("HEAD"))
     public void disconnect(Screen screen, CallbackInfo ci) {
         GlitterWorldCollider.INSTANCE.clearCaches();
         GlitterLightingCache.INSTANCE.clearCache();
-        ParticleSystemManager.INSTANCE.clearParticles$glitter();
+        ParticleSystemManager.INSTANCE.clearParticles$common();
     }
 }

…rianlib/glitter/mixin/DebugHudMixin.java …rianlib/glitter/mixin/DebugHudMixin.javamodules/glitter/src/main/java/com/teamwizardry/librarianlib/glitter/mixin/DebugHudMixin.java renamed to modules/glitter/common/src/main/java/com/teamwizardry/librarianlib/glitter/mixin/DebugHudMixin.java modules/glitter/src/main/java/com/teamwizardry/librarianlib/glitter/mixin/DebugHudMixin.java renamed to modules/glitter/common/src/main/java/com/teamwizardry/librarianlib/glitter/mixin/DebugHudMixin.java

@@ -0,0 +1,24 @@
+package com.teamwizardry.librarianlib.glitter
+
+import com.teamwizardry.librarianlib.LibLibInternal
+import com.teamwizardry.librarianlib.glitter.platform.GlitterPlatformClient
+import com.teamwizardry.librarianlib.platform.LibLibPlatformCommon
+import net.minecraft.resource.ResourceType
+import net.minecraft.util.Identifier
+
+@LibLibInternal
+public object GlitterClientInitializer {
+    public fun initializeClient() {
+        LibLibPlatformCommon.instance.registerResourceReloadListener(
+            ResourceType.CLIENT_RESOURCES,
+            ParticleSystemManager,
+            Identifier.of("liblib-glitter:particle_system_manager")
+        )
+        GlitterPlatformClient.instance.registerClientTickEvent {
+            GlitterLightingCache.tickCache()
+            GlitterWorldCollider.tickCaches()
+            ParticleSystemManager.tickParticles()
+        }
+        GlitterPlatformClient.instance.registerRenderWorldEvent(ParticleSystemManager::renderSystems)
+    }
+}

…/glitter/mixin/MinecraftClientHooks.java …/glitter/mixin/MinecraftClientHooks.javamodules/glitter/src/main/java/com/teamwizardry/librarianlib/glitter/mixin/MinecraftClientHooks.java renamed to modules/glitter/common/src/main/java/com/teamwizardry/librarianlib/glitter/mixin/MinecraftClientHooks.java modules/glitter/src/main/java/com/teamwizardry/librarianlib/glitter/mixin/MinecraftClientHooks.java renamed to modules/glitter/common/src/main/java/com/teamwizardry/librarianlib/glitter/mixin/MinecraftClientHooks.java

@@ -192,7 +192,7 @@ public object GlitterWorldCollider {
         blockCache.get(blockKey)?.let { return it }
 
         // get the chunk without trying to load or generate it
-        val chunk = world.getChunk(sectionX, sectionY, ChunkStatus.EMPTY, false)
+        val chunk = world.getChunk(sectionX, sectionZ, ChunkStatus.EMPTY, false)
         if (chunk == null) {
             // the entire chunk is unloaded. Mark all its sub-chunks as empty
             for (i in world.bottomSectionCoord until world.topSectionCoord) {

modules/glitter/common/src/main/kotlin/com/teamwizardry/librarianlib/glitter/GlitterClientInitializer.kt

@@ -0,0 +1,6 @@
+package com.teamwizardry.librarianlib.glitter
+
+import com.teamwizardry.librarianlib.LibLibModule
+
+internal object LibLibGlitter : LibLibModule("liblib-glitter", "Glitter") {
+}