Skip to content

Commit 071a818

Browse files
ColoryrColoryr
committed
up 使用mojang混淆表
1 parent 4b7fb03 commit 071a818

11 files changed

Lines changed: 56 additions & 63 deletions

File tree

‎fabric_1_20_1/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_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
import net.fabricmc.api.DedicatedServerModInitializer;
55
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
66
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
7+
import net.minecraft.resources.ResourceLocation;
78
import net.minecraft.server.MinecraftServer;
8-
import net.minecraft.util.Identifier;
9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
119

1210
import java.io.File;
1311

1412
public class AllMusicServer implements DedicatedServerModInitializer {
1513
public static MinecraftServer server;
1614

17-
public static final Identifier ID = new Identifier("allmusic", "channel");
15+
public static final ResourceLocation ID = new ResourceLocation("allmusic", "channel");
1816

1917
public static final String dir = "allmusic_server/";
2018

‎fabric_1_20_1/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
}

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

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@
1111
import io.netty.buffer.ByteBuf;
1212
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
1313
import net.kyori.adventure.text.Component;
14-
import net.minecraft.network.PacketByteBuf;
15-
import net.minecraft.server.command.ServerCommandSource;
16-
import net.minecraft.server.network.ServerPlayerEntity;
17-
import net.minecraft.text.Text;
18-
import net.minecraft.util.ActionResult;
14+
import net.minecraft.commands.CommandSourceStack;
15+
import net.minecraft.network.FriendlyByteBuf;
16+
import net.minecraft.server.level.ServerPlayer;
1917

2018
import java.io.File;
2119
import java.util.Collection;
@@ -36,14 +34,13 @@ 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+
ServerPlayer source = (ServerPlayer) player;
38+
return source.hasPermissions(2);
4139
}
4240

4341
@Override
4442
public boolean isPlayer(Object player) {
45-
ServerCommandSource source = (ServerCommandSource) player;
46-
return source.isExecutedByPlayer();
43+
return player instanceof ServerPlayer;
4744
}
4845

4946
@Override
@@ -53,7 +50,7 @@ public boolean checkPermission(Object player, String permission) {
5350

5451
@Override
5552
public boolean needPlay(boolean islist) {
56-
for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) {
53+
for (var player : AllMusicServer.server.getPlayerList().getPlayers()) {
5754
if (!AllMusic.isSkip(player.getName().getString(), null, false, islist)) {
5855
return true;
5956
}
@@ -63,12 +60,12 @@ public boolean needPlay(boolean islist) {
6360

6461
@Override
6562
public Collection<?> getPlayers() {
66-
return AllMusicServer.server.getPlayerManager().getPlayerList();
63+
return AllMusicServer.server.getPlayerList().getPlayers();
6764
}
6865

6966
@Override
7067
public String getPlayerName(Object player) {
71-
if (player instanceof ServerPlayerEntity player1) {
68+
if (player instanceof ServerPlayer player1) {
7269
return player1.getName().getString();
7370
}
7471

@@ -82,19 +79,19 @@ public String getPlayerServer(Object player) {
8279

8380
@Override
8481
public void send(Object player, CommandType type, String data, int data1) {
85-
if (player instanceof ServerPlayerEntity player1) {
82+
if (player instanceof ServerPlayer player1) {
8683
send(player1, MusicPacketCodec.pack(type, data, data1));
8784
}
8885
}
8986

9087
@Override
9188
public Object getPlayer(String player) {
92-
return AllMusicServer.server.getPlayerManager().getPlayer(player);
89+
return AllMusicServer.server.getPlayerList().getPlayerByName(player);
9390
}
9491

9592
@Override
9693
public void sendBar(Object player, Component data) {
97-
if (player instanceof ServerPlayerEntity player1) {
94+
if (player instanceof ServerPlayer player1) {
9895
player1.sendActionBar(data);
9996
}
10097
}
@@ -106,7 +103,7 @@ public File getFolder() {
106103

107104
@Override
108105
public void broadcast(Component message) {
109-
for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) {
106+
for (var player : AllMusicServer.server.getPlayerList().getPlayers()) {
110107
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
111108
player.sendMessage(message);
112109
}
@@ -115,25 +112,25 @@ public void broadcast(Component message) {
115112

116113
@Override
117114
public void sendMessage(Object obj, Component message) {
118-
if (obj instanceof ServerCommandSource source) {
115+
if (obj instanceof CommandSourceStack source) {
119116
source.sendMessage(message);
120117
}
121118
}
122119

123120
@Override
124121
public boolean onMusicPlay(SongInfoObj obj) {
125-
return MusicPlayEvent.EVENT.invoker().interact(obj) != ActionResult.PASS;
122+
return !MusicPlayEvent.EVENT.invoker().interact(obj);
126123
}
127124

128125
@Override
129126
public boolean onMusicAdd(Object obj, PlayerAddMusicObj music) {
130-
ServerCommandSource source = (ServerCommandSource) obj;
131-
return MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music) != ActionResult.PASS;
127+
CommandSourceStack source = (CommandSourceStack) obj;
128+
return !MusicAddEvent.EVENT.invoker().interact(source.getPlayer(), music);
132129
}
133130

134-
private void send(ServerPlayerEntity players, ByteBuf data) {
131+
private void send(ServerPlayer players, ByteBuf data) {
135132
if (players == null)
136133
return;
137-
runTask(() -> ServerPlayNetworking.send(players, AllMusicServer.ID, new PacketByteBuf(data)));
134+
runTask(() -> ServerPlayNetworking.send(players, AllMusicServer.ID, new FriendlyByteBuf(data)));
138135
}
139136
}

‎fabric_1_20_1/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_20_1/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_20_1/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_20_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
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.ServerPlayerEntity;
5+
import net.minecraft.network.Connection;
6+
import net.minecraft.server.level.ServerPlayer;
7+
import net.minecraft.server.players.PlayerList;
88
import org.spongepowered.asm.mixin.Mixin;
99
import org.spongepowered.asm.mixin.injection.At;
1010
import org.spongepowered.asm.mixin.injection.Inject;
1111
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1212

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

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

‎onejar/fabric_1_20_1/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.

‎onejar/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.

0 commit comments

Comments
 (0)