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

Update to 1.19 pre 5

Browse Source
This commit is contained in:
Semmieboy YT 2022-06-01 20:25:54 +02:00
parent 839283a8fa
commit 4b63771be6
4 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@ -2,8 +2,8 @@
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-pre4 minecraft_version=1.19-pre5
yarn_mappings=1.19-pre4+build.1 yarn_mappings=1.19-pre5+build.3
loader_version=0.14.6 loader_version=0.14.6
# Mod Properties # Mod Properties
mod_version=1.2.0 mod_version=1.2.0
@ -11,4 +11,4 @@ maven_group=semmieboy_yt
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.53.4+1.19 fabric_version=0.54.0+1.19

16
src/main/java/semmiedev/disc_jockey/DiscjockeyCommand.java
View File

@ -1,32 +1,22 @@
package semmiedev.disc_jockey; package semmiedev.disc_jockey;
import com.google.common.base.Predicate; import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.brigadier.suggestion.SuggestionProvider;
import com.mojang.brigadier.suggestion.Suggestions;
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.command.CommandSource; import net.minecraft.command.CommandSource;
import net.minecraft.command.argument.EntityArgumentType;
import net.minecraft.server.command.PlaceCommand;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import semmiedev.disc_jockey.gui.screen.DiscJockeyScreen; import semmiedev.disc_jockey.gui.screen.DiscJockeyScreen;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import java.util.stream.Collectors;
import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument;
import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
public class DiscjockeyCommand { public class DiscjockeyCommand {
public static void register() { public static void register(CommandDispatcher<FabricClientCommandSource> commandDispatcher) {
ClientCommandManager.DISPATCHER.register( commandDispatcher.register(
literal("discjockey") literal("discjockey")
.executes(context -> { .executes(context -> {
FabricClientCommandSource source = context.getSource(); FabricClientCommandSource source = context.getSource();

7
src/main/java/semmiedev/disc_jockey/Main.java
View File

@ -4,6 +4,7 @@ import me.shedaniel.autoconfig.AutoConfig;
import me.shedaniel.autoconfig.ConfigHolder; import me.shedaniel.autoconfig.ConfigHolder;
import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer; import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer;
import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.fabricmc.fabric.api.client.networking.v1.ClientLoginConnectionEvents; import net.fabricmc.fabric.api.client.networking.v1.ClientLoginConnectionEvents;
@ -45,8 +46,6 @@ public class Main implements ClientModInitializer {
songsFolder = new File(FabricLoader.getInstance().getConfigDir()+File.separator+MOD_ID+File.separator+"songs"); songsFolder = new File(FabricLoader.getInstance().getConfigDir()+File.separator+MOD_ID+File.separator+"songs");
if (!songsFolder.isDirectory()) songsFolder.mkdirs(); if (!songsFolder.isDirectory()) songsFolder.mkdirs();
DiscjockeyCommand.register();
SongLoader.loadSongs(); SongLoader.loadSongs();
KeyBinding openScreenKeyBind = KeyBindingHelper.registerKeyBinding(new KeyBinding(MOD_ID+".key_bind.open_screen", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_J, "key.category."+MOD_ID)); KeyBinding openScreenKeyBind = KeyBindingHelper.registerKeyBinding(new KeyBinding(MOD_ID+".key_bind.open_screen", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_J, "key.category."+MOD_ID));
@ -76,6 +75,10 @@ public class Main implements ClientModInitializer {
for (ClientTickEvents.StartWorldTick listener : TICK_LISTENERS) listener.onStartTick(world); for (ClientTickEvents.StartWorldTick listener : TICK_LISTENERS) listener.onStartTick(world);
}); });
ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
DiscjockeyCommand.register(dispatcher);
});
ClientLoginConnectionEvents.DISCONNECT.register((handler, client) -> { ClientLoginConnectionEvents.DISCONNECT.register((handler, client) -> {
PREVIEWER.stop(); PREVIEWER.stop();
SONG_PLAYER.stop(); SONG_PLAYER.stop();

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

@ -19,11 +19,7 @@
] ]
}, },
"depends": { "depends": {
"fabric-command-api-v2": "*", "fabric": "*",
"fabric-lifecycle-events-v1": "*", "minecraft": "1.19-beta.5"
"fabric-networking-api-v1": "*",
"fabric-rendering-v1": "*",
"fabric-key-binding-api-v1": "*",
"minecraft": "1.19-beta.4"
} }
} }