BRanulf/DIsc_Jockey-revive
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update to 1.19.3

Browse Source
This commit is contained in:
Semmieboy YT 2022-12-08 18:43:28 +01:00
parent 0078f0e786
commit f2e8c6174a
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -20,15 +20,15 @@ dependencies {
// Fabric API. This is technically optional, but you probably want it anyway. // Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" 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") 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") exclude(group: "net.fabricmc.fabric-api")
} }
modApi("com.terraformersmc:modmenu:4.0.5") modApi("com.terraformersmc:modmenu:5.0.1")
} }
processResources { processResources {

10
gradle.properties
View File

@ -2,13 +2,13 @@
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.19.1 minecraft_version=1.19.3
yarn_mappings=1.19.1+build.4 yarn_mappings=1.19.3+build.2
loader_version=0.14.8 loader_version=0.14.11
# Mod Properties # Mod Properties
mod_version=1.2.1 mod_version=1.2.3
maven_group=semmiedev maven_group=semmiedev
archives_base_name=disc_jockey archives_base_name=disc_jockey
# Dependencies # Dependencies
# check this on https://modmuss50.me/fabric.html # check this on https://modmuss50.me/fabric.html
fabric_version=0.58.5+1.19.1 fabric_version=0.68.1+1.19.3

2
src/main/java/semmiedev/disc_jockey/Previewer.java
View File

@ -30,7 +30,7 @@ public class Previewer implements ClientTickEvents.StartWorldTick {
while (running) { while (running) {
long note = song.notes[i]; long note = song.notes[i];
if ((short)note == Math.round(tick)) { 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++; i++;
if (i >= song.notes.length) { if (i >= song.notes.length) {
stop(); stop();

12
src/main/java/semmiedev/disc_jockey/gui/screen/DiscJockeyScreen.java
View File

@ -54,7 +54,7 @@ public class DiscJockeyScreen extends Screen {
if (song.entry.selected) songListWidget.setSelected(song.entry); 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) { if (Main.SONG_PLAYER.running) {
Main.SONG_PLAYER.stop(); Main.SONG_PLAYER.stop();
} else { } else {
@ -64,20 +64,20 @@ public class DiscJockeyScreen extends Screen {
client.setScreen(null); client.setScreen(null);
} }
} }
}); }).dimensions(width / 2 - 160, height - 61, 100, 20).build();
addDrawableChild(playButton); addDrawableChild(playButton);
previewButton = new ButtonWidget(width / 2 - 50, height - 61, 100, 20, PREVIEW, button -> { previewButton = ButtonWidget.builder(PREVIEW, button -> {
if (Main.PREVIEWER.running) { if (Main.PREVIEWER.running) {
Main.PREVIEWER.stop(); Main.PREVIEWER.stop();
} else { } else {
SongListWidget.SongEntry entry = songListWidget.getSelectedOrNull(); SongListWidget.SongEntry entry = songListWidget.getSelectedOrNull();
if (entry != null) Main.PREVIEWER.start(entry.song); if (entry != null) Main.PREVIEWER.start(entry.song);
} }
}); }).dimensions(width / 2 - 50, height - 61, 100, 20).build();
addDrawableChild(previewButton); 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 // TODO: 6/2/2022 Add an auto build mode
if (BlocksOverlay.itemStacks == null) { if (BlocksOverlay.itemStacks == null) {
SongListWidget.SongEntry entry = songListWidget.getSelectedOrNull(); SongListWidget.SongEntry entry = songListWidget.getSelectedOrNull();
@ -114,7 +114,7 @@ public class DiscJockeyScreen extends Screen {
BlocksOverlay.itemStacks = null; BlocksOverlay.itemStacks = null;
client.setScreen(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")); TextFieldWidget searchBar = new TextFieldWidget(textRenderer, width / 2 - 75, height - 31, 150, 20, Text.translatable(Main.MOD_ID+".screen.search"));
searchBar.setChangedListener(query -> { searchBar.setChangedListener(query -> {

2
src/main/resources/fabric.mod.json
View File

@ -26,7 +26,7 @@
], ],
"depends": { "depends": {
"fabric": "*", "fabric": "*",
"minecraft": ">=1.19-beta.5 <=1.19.1", "minecraft": "1.19.3",
"modmenu": "*" "modmenu": "*"
} }
} }