From 7bed25b441b7417c106ebf432dfcbbbedc163f60 Mon Sep 17 00:00:00 2001 From: BRanulf Date: Wed, 16 Jul 2025 12:59:07 +0800 Subject: [PATCH] eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee --- gradle.properties | 4 ++-- .../java/semmiedev/disc_jockey_revive/Note.java | 16 ++++++++++++++++ .../gui/KeyMappingListWidget.java | 4 ++-- .../gui/ProgressBarRenderer.java | 2 +- .../disc_jockey_revive/gui/SongListWidget.java | 6 +++--- .../gui/screen/DiscJockeyScreen.java | 6 +++--- .../gui/screen/EditKeyMappingsScreen.java | 4 ++-- .../gui/screen/LiveDjScreen.java | 6 +++--- .../gui/screen/SelectNoteScreen.java | 2 +- 9 files changed, 33 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3611439..acb0478 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G +org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://modmuss50.me/fabric.html minecraft_version=1.21.4 @@ -8,7 +8,7 @@ loader_version=0.16.10 mod_name=Disc Jockey Revive mod_id=disc_jockey_revive # Mod Properties -mod_version=1.14.514.046 +mod_version=1.14.514.047 maven_group=semmiedev archives_base_name=disc_jockey_revive # Dependencies diff --git a/src/main/java/semmiedev/disc_jockey_revive/Note.java b/src/main/java/semmiedev/disc_jockey_revive/Note.java index aa00669..44e24db 100644 --- a/src/main/java/semmiedev/disc_jockey_revive/Note.java +++ b/src/main/java/semmiedev/disc_jockey_revive/Note.java @@ -31,6 +31,14 @@ public record Note(NoteBlockInstrument instrument, byte note) { NoteBlockInstrument.BANJO, NoteBlockInstrument.PLING, + NoteBlockInstrument.ZOMBIE, + NoteBlockInstrument.SKELETON, + NoteBlockInstrument.CREEPER, + NoteBlockInstrument.DRAGON, + NoteBlockInstrument.WITHER_SKELETON, + NoteBlockInstrument.PIGLIN, + NoteBlockInstrument.CUSTOM_HEAD + }; static { @@ -50,5 +58,13 @@ public record Note(NoteBlockInstrument instrument, byte note) { INSTRUMENT_BLOCKS.put(NoteBlockInstrument.BIT, Blocks.EMERALD_BLOCK); INSTRUMENT_BLOCKS.put(NoteBlockInstrument.BANJO, Blocks.HAY_BLOCK); INSTRUMENT_BLOCKS.put(NoteBlockInstrument.PLING, Blocks.GLOWSTONE); + + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.ZOMBIE, Blocks.ZOMBIE_HEAD); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.SKELETON, Blocks.SKELETON_SKULL); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.CREEPER, Blocks.CREEPER_HEAD); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.DRAGON, Blocks.DRAGON_HEAD); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.WITHER_SKELETON, Blocks.WITHER_SKELETON_SKULL); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.PIGLIN, Blocks.PIGLIN_HEAD); + INSTRUMENT_BLOCKS.put(NoteBlockInstrument.CUSTOM_HEAD, Blocks.PLAYER_HEAD); } } diff --git a/src/main/java/semmiedev/disc_jockey_revive/gui/KeyMappingListWidget.java b/src/main/java/semmiedev/disc_jockey_revive/gui/KeyMappingListWidget.java index 52230fe..6f3f228 100644 --- a/src/main/java/semmiedev/disc_jockey_revive/gui/KeyMappingListWidget.java +++ b/src/main/java/semmiedev/disc_jockey_revive/gui/KeyMappingListWidget.java @@ -89,9 +89,9 @@ public class KeyMappingListWidget extends EntryListWidget { client.textRenderer, emoji, x + 4, y + 6, - favorite ? 0xFFD700 : 0x808080 + favorite ? 0xFFFFD700 : 0xFF808080 ); // 歌曲名称靠左显示，从收藏图标右侧开始 @@ -81,7 +81,7 @@ public class SongListWidget extends EntryListWidget { client.textRenderer, displayText, textX, y + 6, - selected ? 0xFFFFFF : 0x808080 + selected ? 0xFFFFFFFF : 0xFF808080 ); } @@ -159,7 +159,7 @@ public class SongListWidget extends EntryListWidget { client.textRenderer, displayText, x + 6, y + 6, - selected ? 0xFFFFFF : 0x808080 + selected ? 0xFFFFFFFF : 0xFF808080 ); } diff --git a/src/main/java/semmiedev/disc_jockey_revive/gui/screen/DiscJockeyScreen.java b/src/main/java/semmiedev/disc_jockey_revive/gui/screen/DiscJockeyScreen.java index f97ea29..3431bb9 100644 --- a/src/main/java/semmiedev/disc_jockey_revive/gui/screen/DiscJockeyScreen.java +++ b/src/main/java/semmiedev/disc_jockey_revive/gui/screen/DiscJockeyScreen.java @@ -315,12 +315,12 @@ public class DiscJockeyScreen extends Screen { public void render(DrawContext context, int mouseX, int mouseY, float delta) { super.render(context, mouseX, mouseY, delta); - context.drawCenteredTextWithShadow(textRenderer, DROP_HINT, width / 2, 5, 0xFFFFFF); - context.drawCenteredTextWithShadow(textRenderer, SELECT_SONG, width / 2, 20, 0xFFFFFF); + context.drawCenteredTextWithShadow(textRenderer, DROP_HINT, width / 2, 5, 0xFFFFFFFF); + context.drawCenteredTextWithShadow(textRenderer, SELECT_SONG, width / 2, 20, 0xFFFFFFFF); // 显示当前文件夹和播放模式 String folderName = currentFolder == null ? "/" : currentFolder.name; - context.drawTextWithShadow(textRenderer, CURRENT_FOLDER.getString() + ": " + folderName, 35, 15, 0xFFFFFF); + context.drawTextWithShadow(textRenderer, CURRENT_FOLDER.getString() + ": " + folderName, 35, 15, 0xFFFFFFFF); // context.drawTextWithShadow(textRenderer, PLAY_MODE.getString() + ":", width - 220, 15, 0xFFFFFF); int screenWidth = context.getScaledWindowWidth(); diff --git a/src/main/java/semmiedev/disc_jockey_revive/gui/screen/EditKeyMappingsScreen.java b/src/main/java/semmiedev/disc_jockey_revive/gui/screen/EditKeyMappingsScreen.java index 6d7bec2..b24f484 100644 --- a/src/main/java/semmiedev/disc_jockey_revive/gui/screen/EditKeyMappingsScreen.java +++ b/src/main/java/semmiedev/disc_jockey_revive/gui/screen/EditKeyMappingsScreen.java @@ -135,11 +135,11 @@ public class EditKeyMappingsScreen extends Screen { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { super.render(context, mouseX, mouseY, delta); - context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFF); + context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFFFF); if (waitingForKeyPress) { context.fill(0, 0, this.width, this.height, 0x80000000); - context.drawCenteredTextWithShadow(textRenderer, PRESS_KEY_INSTRUCTION, this.width / 2, this.height / 2 - 10, 0xFFFFFF); + context.drawCenteredTextWithShadow(textRenderer, PRESS_KEY_INSTRUCTION, this.width / 2, this.height / 2 - 10, 0xFFFFFFFF); } mappingListWidget.render(context, mouseX, mouseY, delta); } diff --git a/src/main/java/semmiedev/disc_jockey_revive/gui/screen/LiveDjScreen.java b/src/main/java/semmiedev/disc_jockey_revive/gui/screen/LiveDjScreen.java index ddf2ac7..6f94dd7 100644 --- a/src/main/java/semmiedev/disc_jockey_revive/gui/screen/LiveDjScreen.java +++ b/src/main/java/semmiedev/disc_jockey_revive/gui/screen/LiveDjScreen.java @@ -58,8 +58,8 @@ public class LiveDjScreen extends Screen { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { super.render(context, mouseX, mouseY, delta); - context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFF); - context.drawCenteredTextWithShadow(textRenderer, INSTRUCTIONS, this.width / 2, 30, 0xFFFFFF); + context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFFFF); + context.drawCenteredTextWithShadow(textRenderer, INSTRUCTIONS, this.width / 2, 30, 0xFFFFFFFF); Text tuningStatusText; if (Main.LIVE_DJ_PLAYER.getNoteBlocks() == null) { @@ -112,7 +112,7 @@ public class LiveDjScreen extends Screen { startTuningButton.active = false; startTuningButton.visible = false; } - context.drawCenteredTextWithShadow(textRenderer, tuningStatusText, this.width / 2, 50, 0xFFFFFF); + context.drawCenteredTextWithShadow(textRenderer, tuningStatusText, this.width / 2, 50, 0xFFFFFFFF); if (!Main.LIVE_DJ_PLAYER.missingInstrumentBlocks.isEmpty()) { diff --git a/src/main/java/semmiedev/disc_jockey_revive/gui/screen/SelectNoteScreen.java b/src/main/java/semmiedev/disc_jockey_revive/gui/screen/SelectNoteScreen.java index 30a160b..87992ca 100644 --- a/src/main/java/semmiedev/disc_jockey_revive/gui/screen/SelectNoteScreen.java +++ b/src/main/java/semmiedev/disc_jockey_revive/gui/screen/SelectNoteScreen.java @@ -147,7 +147,7 @@ public class SelectNoteScreen extends Screen { super.render(context, mouseX, mouseY, delta); - context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFF); + context.drawCenteredTextWithShadow(textRenderer, TITLE, this.width / 2, 10, 0xFFFFFFFF); context.drawCenteredTextWithShadow(textRenderer, Text.translatable(Main.MOD_ID + ".screen.select_note.mapping_key", Text.translatable(keyToMap.getTranslationKey())), this.width / 2, 30, 0xFFFFFF); }