diff --git a/build.gradle b/build.gradle index 73896c6..2ff3d54 100644 --- a/build.gradle +++ b/build.gradle @@ -20,15 +20,15 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modApi("me.shedaniel.cloth:cloth-config-fabric:8.0.75") { + modApi("me.shedaniel.cloth:cloth-config-fabric:9.0.94") { exclude(group: "net.fabricmc.fabric-api") } - include("me.shedaniel.cloth:cloth-config-fabric:8.0.75") { + include("me.shedaniel.cloth:cloth-config-fabric:9.0.94") { exclude(group: "net.fabricmc.fabric-api") } - modApi("com.terraformersmc:modmenu:4.0.5") + modApi("com.terraformersmc:modmenu:5.0.1") } processResources { diff --git a/gradle.properties b/gradle.properties index 2fda53d..0ad30b6 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.1 -yarn_mappings=1.19.1+build.4 -loader_version=0.14.8 +minecraft_version=1.19.3 +yarn_mappings=1.19.3+build.2 +loader_version=0.14.11 # Mod Properties -mod_version=1.2.1 +mod_version=1.2.3 maven_group=semmiedev archives_base_name=disc_jockey # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.58.5+1.19.1 +fabric_version=0.68.1+1.19.3 diff --git a/src/main/java/semmiedev/disc_jockey/Previewer.java b/src/main/java/semmiedev/disc_jockey/Previewer.java index 8b96e7b..d31c607 100644 --- a/src/main/java/semmiedev/disc_jockey/Previewer.java +++ b/src/main/java/semmiedev/disc_jockey/Previewer.java @@ -30,7 +30,7 @@ public class Previewer implements ClientTickEvents.StartWorldTick { while (running) { long note = song.notes[i]; if ((short)note == Math.round(tick)) { - world.playSoundFromEntity(MinecraftClient.getInstance().player, MinecraftClient.getInstance().player, Note.INSTRUMENTS[(byte)(note >> Note.INSTRUMENT_SHIFT)].getSound(), SoundCategory.RECORDS, 3, (float)Math.pow(2.0, ((byte)(note >> Note.NOTE_SHIFT) - 12) / 12.0)); + world.playSoundFromEntity(MinecraftClient.getInstance().player, MinecraftClient.getInstance().player, Note.INSTRUMENTS[(byte)(note >> Note.INSTRUMENT_SHIFT)].getSound().value(), SoundCategory.RECORDS, 3, (float)Math.pow(2.0, ((byte)(note >> Note.NOTE_SHIFT) - 12) / 12.0)); i++; if (i >= song.notes.length) { stop(); 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 6c3df9d..1cf171f 100644 --- a/src/main/java/semmiedev/disc_jockey/gui/screen/DiscJockeyScreen.java +++ b/src/main/java/semmiedev/disc_jockey/gui/screen/DiscJockeyScreen.java @@ -54,7 +54,7 @@ public class DiscJockeyScreen extends Screen { if (song.entry.selected) songListWidget.setSelected(song.entry); } - playButton = new ButtonWidget(width / 2 - 160, height - 61, 100, 20, PLAY, button -> { + playButton = ButtonWidget.builder(PLAY, button -> { if (Main.SONG_PLAYER.running) { Main.SONG_PLAYER.stop(); } else { @@ -64,20 +64,20 @@ public class DiscJockeyScreen extends Screen { client.setScreen(null); } } - }); + }).dimensions(width / 2 - 160, height - 61, 100, 20).build(); addDrawableChild(playButton); - previewButton = new ButtonWidget(width / 2 - 50, height - 61, 100, 20, PREVIEW, button -> { + previewButton = ButtonWidget.builder(PREVIEW, button -> { if (Main.PREVIEWER.running) { Main.PREVIEWER.stop(); } else { SongListWidget.SongEntry entry = songListWidget.getSelectedOrNull(); if (entry != null) Main.PREVIEWER.start(entry.song); } - }); + }).dimensions(width / 2 - 50, height - 61, 100, 20).build(); addDrawableChild(previewButton); - addDrawableChild(new ButtonWidget(width / 2 + 60, height - 61, 100, 20, Text.translatable(Main.MOD_ID+".screen.blocks"), button -> { + addDrawableChild(ButtonWidget.builder(Text.translatable(Main.MOD_ID+".screen.blocks"), button -> { // TODO: 6/2/2022 Add an auto build mode if (BlocksOverlay.itemStacks == null) { SongListWidget.SongEntry entry = songListWidget.getSelectedOrNull(); @@ -114,7 +114,7 @@ public class DiscJockeyScreen extends Screen { BlocksOverlay.itemStacks = null; client.setScreen(null); } - })); + }).dimensions(width / 2 + 60, height - 61, 100, 20).build()); TextFieldWidget searchBar = new TextFieldWidget(textRenderer, width / 2 - 75, height - 31, 150, 20, Text.translatable(Main.MOD_ID+".screen.search")); searchBar.setChangedListener(query -> { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 542494a..7384d95 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ ], "depends": { "fabric": "*", - "minecraft": ">=1.19-beta.5 <=1.19.1", + "minecraft": "1.19.3", "modmenu": "*" } }