diff --git a/build.gradle b/build.gradle index d2cc5b50..7989ad1a 100644 --- a/build.gradle +++ b/build.gradle @@ -110,14 +110,17 @@ dependencies { include(implementation "org.lwjgl:lwjgl-zstd") runtimeOnly "org.lwjgl:lwjgl:$lwjglVersion:natives-windows" runtimeOnly "org.lwjgl:lwjgl:$lwjglVersion:natives-linux" + runtimeOnly "org.lwjgl:lwjgl:$lwjglVersion:natives-linux-arm64" include(runtimeOnly "org.lwjgl:lwjgl-lmdb:$lwjglVersion:natives-windows") include(runtimeOnly "org.lwjgl:lwjgl-zstd:$lwjglVersion:natives-windows") include(runtimeOnly "org.lwjgl:lwjgl-lmdb:$lwjglVersion:natives-linux") include(runtimeOnly "org.lwjgl:lwjgl-zstd:$lwjglVersion:natives-linux") + include(runtimeOnly "org.lwjgl:lwjgl-lmdb:$lwjglVersion:natives-linux-arm64") + include(runtimeOnly "org.lwjgl:lwjgl-zstd:$lwjglVersion:natives-linux-arm64") include(implementation 'org.rocksdb:rocksdbjni:8.10.0') include(implementation 'redis.clients:jedis:5.1.0') include(implementation 'org.apache.commons:commons-pool2:2.12.0') //implementation 'org.rocksdb:rocksdbjni:8.10.0' //implementation 'redis.clients:jedis:5.1.0' -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index c020cd64..16ba9e96 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_mappings=1.20.4+build.1 loader_version=0.15.1 # Mod Properties -mod_version = 0.1.4-alpha +mod_version = 0.1.5-alpha maven_group = me.cortex archives_base_name = voxy diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/Gl46FarWorldRenderer.java b/src/main/java/me/cortex/voxy/client/core/rendering/Gl46FarWorldRenderer.java index e45bc6c0..31fc01e9 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/Gl46FarWorldRenderer.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/Gl46FarWorldRenderer.java @@ -142,6 +142,7 @@ public void renderFarAwayOpaque(Gl46Viewport viewport) { glDisable(GL_CULL_FACE); //glPointSize(10); glMultiDrawElementsIndirectCountARB(GL_TRIANGLES, GL_UNSIGNED_SHORT, 0, 0, (int) (this.geometry.getSectionCount()*4.4), 0); + //glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, 0, (int) (this.geometry.getSectionCount()*4.4), 0); glEnable(GL_CULL_FACE); diff --git a/src/main/java/me/cortex/voxy/client/saver/ContextSelectionSystem.java b/src/main/java/me/cortex/voxy/client/saver/ContextSelectionSystem.java index e3cbaa1d..e646ddc4 100644 --- a/src/main/java/me/cortex/voxy/client/saver/ContextSelectionSystem.java +++ b/src/main/java/me/cortex/voxy/client/saver/ContextSelectionSystem.java @@ -107,11 +107,12 @@ private static Path getBasePath(ClientWorld world) { if (iserver != null) { basePath = iserver.getSavePath(WorldSavePath.ROOT).resolve("voxy"); } else { - var netHandle = MinecraftClient.getInstance().getNetworkHandler(); - if (netHandle == null) { - System.err.println("Network handle null"); + var interactionManager = MinecraftClient.getInstance().interactionManager; + if (interactionManager == null) { + System.err.println("interactionManager handle null"); basePath = basePath.resolve("UNKNOWN"); } else { + var netHandle = interactionManager.networkHandler; var info = netHandle.getServerInfo(); if (info == null) { System.err.println("Server info null"); diff --git a/src/main/resources/assets/voxy/shaders/post/ssao.comp b/src/main/resources/assets/voxy/shaders/post/ssao.comp index ba791e08..e291e1c9 100644 --- a/src/main/resources/assets/voxy/shaders/post/ssao.comp +++ b/src/main/resources/assets/voxy/shaders/post/ssao.comp @@ -19,11 +19,11 @@ vec4 reDeProject(vec3 pos) { vec2 UV = clamp(view.xy*0.5+0.5, 0.0, 1.0); //TODO: sample the colour texture and check if the alpha has the hasAO flag - float depth = texture(depthTex, UV, -4.0f).x; + float depth = texture(depthTex, UV).x; if (depth == 1.0f) { return vec4(-1.0f); } - uint meta = uint(255.0f*texture(colourTex, UV, -4.0f).w); + uint meta = uint(255.0f*texture(colourTex, UV).w); if ((meta>>6)==0) { return vec4(-1.0f); } diff --git a/src/main/resources/voxy.accesswidener b/src/main/resources/voxy.accesswidener index 0b19a2a7..c66ec8f6 100644 --- a/src/main/resources/voxy.accesswidener +++ b/src/main/resources/voxy.accesswidener @@ -9,6 +9,7 @@ accessible field net/minecraft/client/render/GameRenderer zoomY F accessible field net/minecraft/client/render/GameRenderer zoom F accessible field net/minecraft/client/world/ClientWorld worldRenderer Lnet/minecraft/client/render/WorldRenderer; accessible field net/minecraft/world/biome/source/BiomeAccess seed J +accessible field net/minecraft/client/network/ClientPlayerInteractionManager networkHandler Lnet/minecraft/client/network/ClientPlayNetworkHandler; accessible class net/minecraft/client/render/RenderLayer$MultiPhase accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters