From 9251163a0274ab7376b9e19a5929956cbcc39373 Mon Sep 17 00:00:00 2001 From: Semmieboy YT Date: Sun, 19 Mar 2023 18:43:36 +0100 Subject: [PATCH] Update to 1.19.4 --- gradle.properties | 10 +++++----- src/main/java/semmiedev/disc_jockey/SongPlayer.java | 3 ++- .../java/semmiedev/disc_jockey/gui/SongListWidget.java | 2 +- .../semmiedev/disc_jockey/gui/hud/BlocksOverlay.java | 4 ++-- .../disc_jockey/gui/screen/DiscJockeyScreen.java | 4 ++-- src/main/resources/fabric.mod.json | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0ad30b6..7ee3cc5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.19.3 -yarn_mappings=1.19.3+build.2 -loader_version=0.14.11 +minecraft_version=1.19.4 +yarn_mappings=1.19.4+build.1 +loader_version=0.14.17 # Mod Properties -mod_version=1.2.3 +mod_version=1.2.4 maven_group=semmiedev archives_base_name=disc_jockey # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.68.1+1.19.3 +fabric_version=0.76.0+1.19.4 diff --git a/src/main/java/semmiedev/disc_jockey/SongPlayer.java b/src/main/java/semmiedev/disc_jockey/SongPlayer.java index fbc233b..94e5d81 100644 --- a/src/main/java/semmiedev/disc_jockey/SongPlayer.java +++ b/src/main/java/semmiedev/disc_jockey/SongPlayer.java @@ -70,7 +70,8 @@ public class SongPlayer implements ClientTickEvents.StartWorldTick { for (int x = -7; x <= 7; x++) { for (int y = -7; y <= 7; y++) { for (int z = -7; z <= 7; z++) { - BlockPos blockPos = new BlockPos(playerPos.add(x, y, z)); + Vec3d vec3d = playerPos.add(x, y, z); + BlockPos blockPos = new BlockPos(MathHelper.floor(vec3d.x), MathHelper.floor(vec3d.y), MathHelper.floor(vec3d.z)); if (intersect(playerPos, MinecraftClient.getInstance().interactionManager.getReachDistance(), BOX.offset(blockPos))) { BlockState blockState = world.getBlockState(blockPos); if (blockState.isOf(Blocks.NOTE_BLOCK) && world.isAir(blockPos.up())) { diff --git a/src/main/java/semmiedev/disc_jockey/gui/SongListWidget.java b/src/main/java/semmiedev/disc_jockey/gui/SongListWidget.java index 453ad90..d042998 100644 --- a/src/main/java/semmiedev/disc_jockey/gui/SongListWidget.java +++ b/src/main/java/semmiedev/disc_jockey/gui/SongListWidget.java @@ -66,7 +66,7 @@ public class SongListWidget extends EntryListWidget { fill(matrices, x + 1, y + 1, x + entryWidth - 1, y + entryHeight - 1, 0x000000); } - drawCenteredText(matrices, client.textRenderer, song.displayName, x + entryWidth / 2, y + 5, selected ? 0xFFFFFF : 0x808080); + drawCenteredTextWithShadow(matrices, client.textRenderer, song.displayName, x + entryWidth / 2, y + 5, selected ? 0xFFFFFF : 0x808080); RenderSystem.setShaderTexture(0, ICONS); drawTexture(matrices, x + 2, y + 2, (favorite ? 26 : 0) + (isOverFavoriteButton(mouseX, mouseY) ? 13 : 0), 0, 13, 12, 52, 12); diff --git a/src/main/java/semmiedev/disc_jockey/gui/hud/BlocksOverlay.java b/src/main/java/semmiedev/disc_jockey/gui/hud/BlocksOverlay.java index c7fc2fa..122ba9e 100644 --- a/src/main/java/semmiedev/disc_jockey/gui/hud/BlocksOverlay.java +++ b/src/main/java/semmiedev/disc_jockey/gui/hud/BlocksOverlay.java @@ -26,11 +26,11 @@ public class BlocksOverlay { ItemRenderer itemRenderer = client.getItemRenderer(); textRenderer.draw(matrices, " × "+amountOfNoteBlocks, 26, 13, 0xFFFFFF); - itemRenderer.renderInGui(NOTE_BLOCK, 6, 6); + itemRenderer.renderInGui(matrices, NOTE_BLOCK, 6, 6); for (int i = 0; i < itemStacks.length; i++) { textRenderer.draw(matrices, " × "+amounts[i], 26, 13 + 20 * (i + 1), 0xFFFFFF); - itemRenderer.renderInGui(itemStacks[i], 6, 6 + 20 * (i + 1)); + itemRenderer.renderInGui(matrices, itemStacks[i], 6, 6 + 20 * (i + 1)); } } } diff --git a/src/main/java/semmiedev/disc_jockey/gui/screen/DiscJockeyScreen.java b/src/main/java/semmiedev/disc_jockey/gui/screen/DiscJockeyScreen.java index 1cf171f..b9140ab 100644 --- a/src/main/java/semmiedev/disc_jockey/gui/screen/DiscJockeyScreen.java +++ b/src/main/java/semmiedev/disc_jockey/gui/screen/DiscJockeyScreen.java @@ -132,8 +132,8 @@ public class DiscJockeyScreen extends Screen { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { super.render(matrices, mouseX, mouseY, delta); - drawCenteredText(matrices, textRenderer, DROP_HINT, width / 2, 5, 0xFFFFFF); - drawCenteredText(matrices, textRenderer, SELECT_SONG, width / 2, 20, 0xFFFFFF); + drawCenteredTextWithShadow(matrices, textRenderer, DROP_HINT, width / 2, 5, 0xFFFFFF); + drawCenteredTextWithShadow(matrices, textRenderer, SELECT_SONG, width / 2, 20, 0xFFFFFF); } @Override diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7384d95..fe3b0fc 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ ], "depends": { "fabric": "*", - "minecraft": "1.19.3", + "minecraft": "1.19.4", "modmenu": "*" } }