Skip to content

Update build.gradle to include linux arm64 natives #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update build.gradle to include linux arm64 natives #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e714bf2
Fix unknown server due to network handler being null
Feb 28, 2024
cfec339
Update build.gradle to include linux arm64 natives
jason-green-io Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/main/java/me/cortex/voxy/client/core/rendering/Gl46FarWorldRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);


Expand Down
7 changes: 4 additions & 3 deletions src/main/java/me/cortex/voxy/client/saver/ContextSelectionSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/voxy/shaders/post/ssao.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/voxy.accesswidener
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down