Skip to content

Commit 4b7fb03

Browse files
ColoryrColoryr
committed
up
1 parent faa7aff commit 4b7fb03

29 files changed

Lines changed: 140 additions & 150 deletions

File tree

‎fabric_1_21/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ repositories {
3232
dependencies {
3333
// To change the versions see the gradle.properties file
3434
minecraft "com.mojang:minecraft:${project.minecraft_version}"
35-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
35+
mappings loom.officialMojangMappings()
3636
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
3737

3838
// Fabric API. This is technically optional, but you probably want it anyway.

‎fabric_1_21/src/main/java/com/coloryr/allmusic/server/CommandFabric.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,43 @@
88
import com.mojang.brigadier.suggestion.SuggestionProvider;
99
import com.mojang.brigadier.suggestion.Suggestions;
1010
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
11-
import net.minecraft.server.command.CommandManager;
12-
import net.minecraft.server.command.ServerCommandSource;
11+
import net.minecraft.commands.CommandSourceStack;
12+
import net.minecraft.commands.Commands;
1313

1414
import java.util.List;
1515
import java.util.concurrent.CompletableFuture;
1616
import java.util.function.Predicate;
1717

18-
public class CommandFabric implements Command<ServerCommandSource>, Predicate<ServerCommandSource>, SuggestionProvider<ServerCommandSource> {
18+
public class CommandFabric implements Command<CommandSourceStack>, Predicate<CommandSourceStack>, SuggestionProvider<CommandSourceStack> {
1919
public static CommandFabric instance = new CommandFabric();
2020

21-
public void register(CommandDispatcher<ServerCommandSource> dispatcher) {
22-
dispatcher.register(((CommandManager.literal("music").requires(this)).executes(this))
23-
.then(CommandManager.argument("args", StringArgumentType.greedyString())
21+
public void register(CommandDispatcher<CommandSourceStack> dispatcher) {
22+
dispatcher.register(((Commands.literal("music").requires(this)).executes(this))
23+
.then(Commands.argument("args", StringArgumentType.greedyString())
2424
.suggests(this).executes(this)));
2525
}
2626

2727
@Override
28-
public int run(CommandContext<ServerCommandSource> context) {
28+
public int run(CommandContext<CommandSourceStack> context) {
2929
var item = context.getSource();
3030

3131
var input = context.getInput();
3232
var temp = input.split(" ");
3333
var arg = new String[temp.length - 1];
3434
System.arraycopy(temp, 1, arg, 0, arg.length);
3535

36-
CommandEX.execute(item, context.getSource().getName(), arg);
36+
CommandEX.execute(item, context.getSource().getTextName(), arg);
3737

3838
return 0;
3939
}
4040

4141
@Override
42-
public boolean test(ServerCommandSource stack) {
42+
public boolean test(CommandSourceStack stack) {
4343
return true;
4444
}
4545

4646
@Override
47-
public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerCommandSource> context, SuggestionsBuilder builder) {
47+
public CompletableFuture<Suggestions> getSuggestions(CommandContext<CommandSourceStack> context, SuggestionsBuilder builder) {
4848
var item = context.getSource();
4949

5050
var input = context.getInput();
@@ -54,7 +54,7 @@ public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerComman
5454

5555
builder = builder.createOffset(builder.getInput().lastIndexOf(32) + 1);
5656

57-
List<String> results = CommandEX.getTabList(item, item.getName(), arg);
57+
List<String> results = CommandEX.getTabList(item, item.getTextName(), arg);
5858

5959
String remaining = builder.getRemaining().trim();
6060

‎fabric_1_21/src/main/java/com/coloryr/allmusic/server/SideFabric.java‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
import com.coloryr.allmusic.server.event.MusicPlayEvent;
1212
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
1313
import net.kyori.adventure.text.Component;
14-
import net.minecraft.server.command.ServerCommandSource;
15-
import net.minecraft.server.network.ServerPlayerEntity;
16-
import net.minecraft.text.Text;
17-
import net.minecraft.util.ActionResult;
14+
import net.minecraft.commands.CommandSourceStack;
15+
import net.minecraft.server.level.ServerPlayer;
1816

1917
import java.io.File;
2018
import java.util.Collection;
@@ -36,14 +34,14 @@ public void runTask(Runnable run1, int delay) {
3634

3735
@Override
3836
public boolean checkPermission(Object player) {
39-
ServerCommandSource source = (ServerCommandSource) player;
40-
return source.hasPermissionLevel(2);
37+
CommandSourceStack source = (CommandSourceStack) player;
38+
return source.hasPermission(2);
4139
}
4240

4341
@Override
4442
public boolean isPlayer(Object player) {
45-
ServerCommandSource source = (ServerCommandSource) player;
46-
return source.isExecutedByPlayer();
43+
CommandSourceStack source = (CommandSourceStack) player;
44+
return source.isPlayer();
4745
}
4846

4947
@Override
@@ -53,7 +51,7 @@ public boolean checkPermission(Object player, String permission) {
5351

5452
@Override
5553
public boolean needPlay(boolean islist) {
56-
for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) {
54+
for (var player : AllMusicServer.server.getPlayerList().getPlayers()) {
5755
if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) {
5856
return true;
5957
}
@@ -63,12 +61,12 @@ public boolean needPlay(boolean islist) {
6361

6462
@Override
6563
public Collection<?> getPlayers() {
66-
return AllMusicServer.server.getPlayerManager().getPlayerList();
64+
return AllMusicServer.server.getPlayerList().getPlayers();
6765
}
6866

6967
@Override
7068
public String getPlayerName(Object player) {
71-
if (player instanceof ServerPlayerEntity player1) {
69+
if (player instanceof ServerPlayer player1) {
7270
return player1.getName().getString();
7371
}
7472

@@ -82,19 +80,19 @@ public String getPlayerServer(Object player) {
8280

8381
@Override
8482
public void send(Object player, CommandType type, String data, int data1) {
85-
if (player instanceof ServerPlayerEntity player1) {
83+
if (player instanceof ServerPlayer player1) {
8684
send(player1, new MusicPack(type, data, data1));
8785
}
8886
}
8987

9088
@Override
9189
public Object getPlayer(String player) {
92-
return AllMusicServer.server.getPlayerManager().getPlayer(player);
90+
return AllMusicServer.server.getPlayerList().getPlayerByName(player);
9391
}
9492

9593
@Override
9694
public void sendBar(Object player, Component data) {
97-
if (player instanceof ServerPlayerEntity player1) {
95+
if (player instanceof ServerPlayer player1) {
9896
player1.sendActionBar(data);
9997
}
10098
}
@@ -106,7 +104,7 @@ public File getFolder() {
106104

107105
@Override
108106
public void broadcast(Component message) {
109-
for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) {
107+
for (var player : AllMusicServer.server.getPlayerList().getPlayers()) {
110108
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
111109
player.sendMessage(message);
112110
}
@@ -115,23 +113,23 @@ public void broadcast(Component message) {
115113

116114
@Override
117115
public void sendMessage(Object obj, Component message) {
118-
if(obj instanceof ServerCommandSource source) {
116+
if(obj instanceof CommandSourceStack source) {
119117
source.sendMessage(message);
120118
}
121119
}
122120

123121
@Override
124122
public boolean onMusicPlay(SongInfoObj obj) {
125-
return MusicPlayEvent.EVENT.invoker().interact(obj) != ActionResult.PASS;
123+
return !MusicPlayEvent.EVENT.invoker().interact(obj);
126124
}
127125

128126
@Override
129127
public boolean onMusicAdd(Object obj, PlayerAddMusicObj music) {
130-
ServerCommandSource source = (ServerCommandSource) obj;
131-
return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS;
128+
CommandSourceStack source = (CommandSourceStack) obj;
129+
return !MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music);
132130
}
133131

134-
private void send(ServerPlayerEntity players, MusicPack data) {
132+
private void send(ServerPlayer players, MusicPack data) {
135133
if (players == null)
136134
return;
137135
runTask(() -> ServerPlayNetworking.send(players, new MusicCodec(data)));

‎fabric_1_21/src/main/java/com/coloryr/allmusic/server/Tasks.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class Tasks {
88
private static final List<TaskItem> taskItems = new CopyOnWriteArrayList<>();
99

1010
public static void init() {
11-
AllMusicServer.server.addServerGuiTickable(Tasks::tick);
11+
AllMusicServer.server.addTickable(Tasks::tick);
1212
}
1313

1414
public static void tick() {

‎fabric_1_21/src/main/java/com/coloryr/allmusic/server/event/MusicAddEvent.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@
33
import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj;
44
import net.fabricmc.fabric.api.event.Event;
55
import net.fabricmc.fabric.api.event.EventFactory;
6-
import net.minecraft.server.network.ServerPlayerEntity;
7-
import net.minecraft.util.ActionResult;
6+
import net.minecraft.server.level.ServerPlayer;
87

98
public interface MusicAddEvent {
109
Event<MusicAddEvent> EVENT = EventFactory.createArrayBacked(MusicAddEvent.class,
1110
(listeners) -> (player, music) -> {
1211
for (MusicAddEvent listener : listeners) {
13-
ActionResult result = listener.interact(player, music);
12+
boolean result = listener.interact(player, music);
1413

15-
if (result != ActionResult.PASS) {
16-
return result;
14+
if (!result) {
15+
return false;
1716
}
1817
}
1918

20-
return ActionResult.PASS;
19+
return true;
2120
});
2221

23-
ActionResult interact(ServerPlayerEntity player, PlayerAddMusicObj music);
22+
boolean interact(ServerPlayer player, PlayerAddMusicObj music);
2423
}

‎fabric_1_21/src/main/java/com/coloryr/allmusic/server/event/MusicPlayEvent.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@
33
import com.coloryr.allmusic.server.core.objs.music.SongInfoObj;
44
import net.fabricmc.fabric.api.event.Event;
55
import net.fabricmc.fabric.api.event.EventFactory;
6-
import net.minecraft.util.ActionResult;
76

87
public interface MusicPlayEvent {
98
Event<MusicPlayEvent> EVENT = EventFactory.createArrayBacked(MusicPlayEvent.class,
109
(listeners) -> (music) -> {
1110
for (MusicPlayEvent listener : listeners) {
12-
ActionResult result = listener.interact(music);
11+
boolean result = listener.interact(music);
1312

14-
if (result != ActionResult.PASS) {
13+
if (!result) {
1514
return result;
1615
}
1716
}
1817

19-
return ActionResult.PASS;
18+
return true;
2019
});
2120

22-
ActionResult interact(SongInfoObj music);
21+
boolean interact(SongInfoObj music);
2322
}

‎fabric_1_21/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
import com.coloryr.allmusic.server.core.AllMusic;
44
import com.coloryr.allmusic.server.core.music.PlayMusic;
5-
import net.minecraft.network.ClientConnection;
6-
import net.minecraft.server.PlayerManager;
7-
import net.minecraft.server.network.ConnectedClientData;
8-
import net.minecraft.server.network.ServerPlayerEntity;
5+
import net.minecraft.network.Connection;
6+
import net.minecraft.server.level.ServerPlayer;
7+
import net.minecraft.server.network.CommonListenerCookie;
8+
import net.minecraft.server.players.PlayerList;
99
import org.spongepowered.asm.mixin.Mixin;
1010
import org.spongepowered.asm.mixin.injection.At;
1111
import org.spongepowered.asm.mixin.injection.Inject;
1212
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1313

14-
@Mixin(PlayerManager.class)
14+
@Mixin(PlayerList.class)
1515
public class ServerPlayerMixin {
1616
@Inject(at = @At("HEAD"), method = "remove")
17-
private void remove(ServerPlayerEntity entity, CallbackInfo info) {
17+
private void remove(ServerPlayer entity, CallbackInfo info) {
1818
PlayMusic.removeNowPlayPlayer(entity.getName().getString());
1919
}
2020

21-
@Inject(at = @At("TAIL"), method = "onPlayerConnect")
22-
private void add(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) {
23-
AllMusic.joinPlay(player.getName().getString());
21+
@Inject(at = @At("TAIL"), method = "placeNewPlayer")
22+
private void add(Connection connection, ServerPlayer serverPlayer, CommonListenerCookie commonListenerCookie, CallbackInfo ci) {
23+
AllMusic.joinPlay(serverPlayer.getName().getString());
2424
}
2525
}

‎fabric_1_21_6/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ repositories {
3232
dependencies {
3333
// To change the versions see the gradle.properties file
3434
minecraft "com.mojang:minecraft:${project.minecraft_version}"
35-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
35+
mappings loom.officialMojangMappings()
3636
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
3737

3838
// Fabric API. This is technically optional, but you probably want it anyway.

‎fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/CommandFabric.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,43 @@
88
import com.mojang.brigadier.suggestion.SuggestionProvider;
99
import com.mojang.brigadier.suggestion.Suggestions;
1010
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
11-
import net.minecraft.server.command.CommandManager;
12-
import net.minecraft.server.command.ServerCommandSource;
11+
import net.minecraft.commands.CommandSourceStack;
12+
import net.minecraft.commands.Commands;
1313

1414
import java.util.List;
1515
import java.util.concurrent.CompletableFuture;
1616
import java.util.function.Predicate;
1717

18-
public class CommandFabric implements Command<ServerCommandSource>, Predicate<ServerCommandSource>, SuggestionProvider<ServerCommandSource> {
18+
public class CommandFabric implements Command<CommandSourceStack>, Predicate<CommandSourceStack>, SuggestionProvider<CommandSourceStack> {
1919
public static CommandFabric instance = new CommandFabric();
2020

21-
public void register(CommandDispatcher<ServerCommandSource> dispatcher) {
22-
dispatcher.register(((CommandManager.literal("music").requires(this)).executes(this))
23-
.then(CommandManager.argument("args", StringArgumentType.greedyString())
21+
public void register(CommandDispatcher<CommandSourceStack> dispatcher) {
22+
dispatcher.register(((Commands.literal("music").requires(this)).executes(this))
23+
.then(Commands.argument("args", StringArgumentType.greedyString())
2424
.suggests(this).executes(this)));
2525
}
2626

2727
@Override
28-
public int run(CommandContext<ServerCommandSource> context) {
28+
public int run(CommandContext<CommandSourceStack> context) {
2929
var item = context.getSource();
3030

3131
var input = context.getInput();
3232
var temp = input.split(" ");
3333
var arg = new String[temp.length - 1];
3434
System.arraycopy(temp, 1, arg, 0, arg.length);
3535

36-
CommandEX.execute(item, context.getSource().getName(), arg);
36+
CommandEX.execute(item, context.getSource().getTextName(), arg);
3737

3838
return 0;
3939
}
4040

4141
@Override
42-
public boolean test(ServerCommandSource stack) {
42+
public boolean test(CommandSourceStack stack) {
4343
return true;
4444
}
4545

4646
@Override
47-
public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerCommandSource> context, SuggestionsBuilder builder) {
47+
public CompletableFuture<Suggestions> getSuggestions(CommandContext<CommandSourceStack> context, SuggestionsBuilder builder) {
4848
var item = context.getSource();
4949

5050
var input = context.getInput();
@@ -54,12 +54,12 @@ public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerComman
5454

5555
builder = builder.createOffset(builder.getInput().lastIndexOf(32) + 1);
5656

57-
List<String> results = CommandEX.getTabList(item, item.getName(), arg);
57+
List<String> results = CommandEX.getTabList(item, item.getTextName(), arg);
5858

5959
String remaining = builder.getRemaining().trim();
6060

6161
for (String s : results) {
62-
if (s.startsWith(remaining)) {
62+
if (s.startsWith(remaining)){
6363
builder.suggest(s);
6464
}
6565
}

0 commit comments

Comments
 (0)