Merge branch '1.20.4/pojavFixing' into merge-test

TarikBR · Mar 25, 2024 · 203799d · 203799d
2 parents 435a6bd + fc36449
commit 203799d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -122,7 +122,7 @@ tasks.withType<JavaCompile> {
 fun createVersionString(): String {
     val builder = StringBuilder()
 
-    val isReleaseBuild = project.hasProperty("build.release")
+    val isReleaseBuild = true //project.hasProperty("build.release")
     val buildId = System.getenv("GITHUB_RUN_NUMBER")
 
     if (isReleaseBuild) {

diff --git a/src/main/resources/sodium.mixins.json b/src/main/resources/sodium.mixins.json
@@ -10,7 +10,6 @@
     "conformVisibility": true
   },
   "client": [
-    "core.MinecraftMixin",
     "core.WindowMixin",
     "core.gui.LevelLoadStatusManagerMixin",
     "core.model.colors.BlockColorsMixin",
@@ -26,15 +25,6 @@
     "core.render.immediate.consumer.BufferSourceMixin",
     "core.render.immediate.consumer.VertexMultiConsumerMixin$DoubleMixin",
     "core.render.immediate.consumer.VertexMultiConsumerMixin$MultipleMixin",
-    "core.render.world.RenderBuffersMixin",
-    "core.render.world.LevelRendererMixin",
-    "core.world.biome.ClientLevelMixin",
-    "core.world.chunk.ZeroBitStorageMixin",
-    "core.world.chunk.SimpleBitStorageMixin",
-    "core.world.chunk.PalettedContainerMixin",
-    "core.world.map.ClientChunkCacheMixin",
-    "core.world.map.ClientPacketListenerMixin",
-    "core.world.map.ClientLevelMixin",
     "features.gui.hooks.console.GameRendererMixin",
     "features.gui.hooks.debug.DebugScreenOverlayMixin",
     "features.gui.hooks.settings.OptionsScreenMixin",
@@ -84,8 +74,17 @@
     "features.textures.mipmaps.MipmapGeneratorMixin",
     "features.textures.mipmaps.SpriteContentsMixin",
     "features.world.biome.BiomeMixin",
-    "features.world.storage.ClientChunkCacheMixin",
     "workarounds.context_creation.WindowMixin",
-    "workarounds.event_loop.RenderSystemMixin"
+
+    "core.world.chunk.PackedIntegerArrayMixin",
+    "core.world.chunk.EmptyPaletteStorageMixin",
+    "core.world.chunk.PalettedContainerMixin",
+    "core.world.biome.ClientWorldMixin",
+
+    "features.render.world.sky.ClientWorldMixin",
+
+    "features.options.weather.WorldRendererMixin",
+    "features.render.world.clouds.WorldRendererMixin",
+    "features.render.world.sky.WorldRendererMixin"
   ]
 }