Skip to content

Commit

Permalink
Merge branch 'development' into latest
Browse files Browse the repository at this point in the history
  • Loading branch information
Boxadactle committed Oct 27, 2024
2 parents 0db6cfa + cd76e02 commit b9c7d16
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 26 deletions.
8 changes: 2 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
## Changes
- Added 3d compass rendering to config gui
- Added toggle3dCompass subcommand
- Added 3d compass toggle keybind

## New Features
- It is now possible to render a 3d compass client-side in the world
- Updated to 1.21.3
- Fixed flipped Y text in direction mode
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public CompassRenderer3D() {
}

@Override
public void render(PoseStack poseStack, MultiBufferSource multiBufferSource, double v, double v1, double v2) {
public void render(PoseStack poseStack, MultiBufferSource.BufferSource multiBufferSource, double v, double v1, double v2) {
if (WorldUtils.getCamera() != null && CoordinatesDisplay.getConfig().render3dCompass) {
float size = 0.15f;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class CoordinatesDisplay {

public static final String MOD_ID = "coordinatesdisplay";

public static final String VERSION = "13.1.0";
public static final String VERSION = "14.0.0";

public static final String VERSION_STRING = MOD_NAME + " v" + VERSION;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static Direction fromYaw(double yaw) {
}

public static Direction fromPitch(double pitch) {
return pitch > 0 ? POSITIVE_Y : NEGATIVE_Y;
return pitch > 0 ? NEGATIVE_Y : POSITIVE_Y;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ private ResourceLocation resolveCompassTexture(double d) {
public void render(GuiGraphics guiGraphics, int x, int y) {
double degrees = calculateRelativeDirection(component.position.getBlockPos(), new Vec3<>(spawnpoint.getX(), spawnpoint.getY(), spawnpoint.getZ()), component.headRot.wrapYaw());

guiGraphics.blit(resolveCompassTexture(degrees), x, y, 0, 0, size, size, size, size);
RenderUtils.drawTexture(resolveCompassTexture(degrees), guiGraphics, x, y, size, size, 0, 0);
}
}
}
6 changes: 3 additions & 3 deletions fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"coordinatesdisplay.mixins.json"
],
"depends": {
"fabricloader": ">=0.15.10",
"minecraft": ">=1.21",
"boxlib": "14.*",
"fabricloader": ">=0.16",
"minecraft": ">=1.21.2",
"boxlib": "15.*",
"fabric": "*"
},
"recommends": {
Expand Down
4 changes: 2 additions & 2 deletions forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ side="BOTH"
[[dependencies.coordinatesdisplay]]
modId="minecraft"
mandatory=true
versionRange="[1.21,)"
versionRange="[1.21.2,)"
ordering="NONE"
side="BOTH"

[[dependencies.coordinatesdisplay]]
modId="boxlib"
mandatory=true
versionRange="[14.0.0,15.0.0)"
versionRange="[15.0.0,16.0.0)"
ordering="NONE"
side="CLIENT"
18 changes: 9 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ org.gradle.jvmargs=-Xmx2G
org.gradle.parallel=true

# Mod properties
mod_version = 13.2.0
mod_version = 14.0.0
maven_group = dev.boxadactle
archives_name = CoordinatesDisplay
enabled_platforms = fabric,neoforge,forge

# Minecraft properties
minecraft_version = 1.21.1
minecraft_version = 1.21.3

# Dependencies
fabric_loader_version = 0.15.11
fabric_api_version = 0.102.1+1.21.1
neoforge_version = 21.1.18
forge_version = 52.0.4
fabric_loader_version = 0.16.7
fabric_api_version = 0.107.0+1.21.3
neoforge_version = 21.3.3-beta
forge_version = 53.0.4

modmenu_version = 11.0.1
boxlib_version = 14.4.1
modmenu_version = 12.0.0-beta.1
boxlib_version = 15.0.0

# publishing
game_versions = 1.21,1.21.1
game_versions = 1.21.2,1.21.3
project_id_curseforge = 646464
project_id_modrinth = 3mW8PdUo
release_type = release
Expand Down
4 changes: 2 additions & 2 deletions neoforge/src/main/resources/META-INF/neoforge.mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ side = "BOTH"
[[dependencies.coordinatesdisplay]]
modId = "minecraft"
type = "required"
versionRange = "[1.21,1.22)"
versionRange = "[1.21.2,1.22)"
ordering = "NONE"
side = "BOTH"

[[dependencies.coordinatesdisplay]]
modId = "boxlib"
type = "required"
versionRange = "[14.0.0,15.0.0)"
versionRange = "[15.0.0,16.0.0)"
ordering = "NONE"
side = "BOTH"

Expand Down

0 comments on commit b9c7d16

Please sign in to comment.