Skip to content

Commit 11be136

Browse files
committed
picking up thrown identity disc with right click, phyiscs substeps, minor fmt/refactor/cleanup, direnv & flake.nix
1 parent 3c78b78 commit 11be136

File tree

9 files changed

+238
-133
lines changed

9 files changed

+238
-133
lines changed

.envrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use flake

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ hs_err_*.log
3838
replay_*.log
3939
*.hprof
4040
*.jfr
41+
.direnv

flake.lock

Lines changed: 77 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
inputs = {
3+
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
4+
flake-parts.url = "github:hercules-ci/flake-parts";
5+
systems.url = "github:nix-systems/default";
6+
};
7+
8+
outputs = inputs:
9+
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
10+
systems = import inputs.systems;
11+
12+
perSystem = { config, self', pkgs, lib, system, ... }: let
13+
java = pkgs.jetbrains.jdk-no-jcef;
14+
15+
nativeBuildInputs = with pkgs; [
16+
java
17+
git
18+
];
19+
20+
buildInputs = with pkgs; [
21+
libGL
22+
glfw
23+
xorg.libX11
24+
xorg.libXext
25+
xorg.libXcursor
26+
xorg.libXrandr
27+
xorg.libXxf86vm
28+
xorg.xrandr
29+
glfw-wayland-minecraft # Not always needed, but in case it is, it's here.
30+
flite # TTS
31+
libpulseaudio # Required for audio
32+
];
33+
in {
34+
devShells.default = pkgs.mkShell {
35+
inherit nativeBuildInputs buildInputs;
36+
37+
env = {
38+
LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;
39+
JAVA_HOME = "${java.home}";
40+
};
41+
};
42+
};
43+
};
44+
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Done to increase the memory available to gradle.
2-
org.gradle.jvmargs=-Xmx3G
2+
org.gradle.jvmargs=-Xmx1G
33
org.gradle.parallel=true
44

55
# Fabric Properties

src/main/java/amble/tron/client/render/IdentityDiscThrownItemRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void render(T entity, float yaw, float tickDelta, MatrixStack matrices, V
5555
return;
5656
}
5757

58-
boolean bl = !flyingItem.isInGroundTracked();
58+
boolean bl = !flyingItem.isInGround();
5959

6060
matrices.push();
6161
matrices.scale(0.8f, 0.8f, 0.8f);

0 commit comments

Comments
 (0)