diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1677688..673b0e0 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -4,7 +4,7 @@ name: Java CI with Gradle concurrency: - group: "build-1.19.1" + group: "build-1.19.2" cancel-in-progress: true on: @@ -34,9 +34,9 @@ jobs: - uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "latest-1.19.1" + automatic_release_tag: "latest-1.19.2" prerelease: false - title: "1.19.1 Build" + title: "1.19.2 Build" files: | ./build/libs/*.jar diff --git a/gradle.properties b/gradle.properties index fad030f..3eeb2d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties -minecraft_version=1.19.1 -yarn_version=1.19.1+build.4 -loader_version=0.14.8 +minecraft_version=1.19.2 +yarn_version=1.19.2+build.1 +loader_version=0.14.9 # Mod Properties mod_version = 0.2 diff --git a/src/main/java/anticope/rejects/commands/SaveSkinCommand.java b/src/main/java/anticope/rejects/commands/SaveSkinCommand.java index b8ad97b..46cc560 100644 --- a/src/main/java/anticope/rejects/commands/SaveSkinCommand.java +++ b/src/main/java/anticope/rejects/commands/SaveSkinCommand.java @@ -43,7 +43,7 @@ public class SaveSkinCommand extends Command { @Override public void build(LiteralArgumentBuilder builder) { - builder.then(argument("player", PlayerArgumentType.player()).executes(ctx -> { + builder.then(argument("player", PlayerArgumentType.create()).executes(ctx -> { PlayerEntity playerEntity = ctx.getArgument("player", PlayerEntity.class); String path = TinyFileDialogs.tinyfd_saveFileDialog("Save image", null, filters, null); if (path == null) IO_EXCEPTION.create(); diff --git a/src/main/java/anticope/rejects/gui/hud/RadarHud.java b/src/main/java/anticope/rejects/gui/hud/RadarHud.java index b73911b..d3ea7b7 100644 --- a/src/main/java/anticope/rejects/gui/hud/RadarHud.java +++ b/src/main/java/anticope/rejects/gui/hud/RadarHud.java @@ -7,6 +7,7 @@ import meteordevelopment.meteorclient.systems.hud.Hud; import meteordevelopment.meteorclient.systems.hud.HudElementInfo; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import it.unimi.dsi.fastutil.objects.Object2BooleanMap; @@ -15,8 +16,7 @@ import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.ColorSetting; import meteordevelopment.meteorclient.settings.DoubleSetting; import meteordevelopment.meteorclient.settings.EntityTypeListSetting; -import meteordevelopment.meteorclient.settings.Setting; -import meteordevelopment.meteorclient.settings.SettingGroup; +import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.hud.HudRenderer; import meteordevelopment.meteorclient.systems.hud.HudElement; import meteordevelopment.meteorclient.systems.modules.Modules; @@ -117,15 +117,16 @@ public class RadarHud extends HudElement { Iterator waypoints = Waypoints.get().iterator(); while (waypoints.hasNext()) { Waypoint waypoint = waypoints.next(); - Vec3 c = waypoint.getCoords(); + BlockPos blockPos = waypoint.getPos(); + Vec3 c = new Vec3(blockPos.getX() + 0.5, blockPos.getY(), blockPos.getZ() + 0.5); Vec3d coords = new Vec3d(c.x, c.y, c.z); double xPos = ((coords.getX() - mc.player.getX()) * scale.get() * zoom.get() + width/2); double yPos = ((coords.getZ() - mc.player.getZ()) * scale.get() * zoom.get() + height/2); if (xPos < 0 || yPos < 0 || xPos > width - scale.get() || yPos > height - scale.get()) continue; String icon = "*"; - if (letters.get() && waypoint.name.length() > 0) - icon = waypoint.name.substring(0, 1); - renderer.text(icon, xPos + x, yPos + y, waypoint.color, false); + if (letters.get() && waypoint.name.get().length() > 0) + icon = waypoint.name.get().substring(0, 1); + renderer.text(icon, xPos + x, yPos + y, waypoint.color.get(), false); } } Renderer2D.COLOR.render(null);