mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-15 05:41:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update fabric to 1.20 (#3047)

Browse Source 
* update: 23w17a
* update: 1.20-pre2
* update: 1.20-rc1
This commit is contained in:
Drex 2023-06-11 13:40:19 +02:00 committed by GitHub
parent ab4c7454b1
commit bc2b79654a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plan/fabric/build.gradle
View File

@ -8,9 +8,9 @@ dependencies {
shadow "net.playeranalytics:platform-abstraction-layer-api:$palVersion" shadow "net.playeranalytics:platform-abstraction-layer-api:$palVersion"
minecraft "com.mojang:minecraft:1.19.4" minecraft "com.mojang:minecraft:1.20-rc1"
mappings "net.fabricmc:yarn:1.19.4+build.1:v2" mappings "net.fabricmc:yarn:1.20-rc1+build.2:v2"
modImplementation "net.fabricmc:fabric-loader:0.14.17" modImplementation "net.fabricmc:fabric-loader:0.14.21"
modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT') modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT')
// Fabric API // Fabric API
@ -24,7 +24,7 @@ dependencies {
] ]
apiModules.forEach { apiModules.forEach {
modImplementation(fabricApi.module(it, "0.76.0+1.19.4")) modImplementation(fabricApi.module(it, "0.83.0+1.20"))
} }
testImplementation project(path: ":common", configuration: 'testArtifacts') testImplementation project(path: ":common", configuration: 'testArtifacts')

2
Plan/fabric/src/main/java/net/playeranalytics/plan/commands/use/FabricMessageBuilder.java
View File

@ -103,7 +103,7 @@ public class FabricMessageBuilder implements MessageBuilder {
@Override @Override
public void send() { public void send() {
if (previous == null) { if (previous == null) {
sender.sendFeedback(builder, false); sender.sendFeedback(() -> builder, false);
} else { } else {
previous.builder.append(builder); previous.builder.append(builder);
previous.send(); previous.send();

5
Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/mixin/ServerCommandSourceMixin.java
View File

@ -29,6 +29,7 @@ import org.spongepowered.asm.mixin.Shadow;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.function.Supplier;
@Mixin(ServerCommandSource.class) @Mixin(ServerCommandSource.class)
public abstract class ServerCommandSourceMixin implements CMDSender { public abstract class ServerCommandSourceMixin implements CMDSender {
@ -44,7 +45,7 @@ public abstract class ServerCommandSourceMixin implements CMDSender {
} }
@Shadow @Shadow
public abstract void sendFeedback(Text message, boolean broadcastToOps); public abstract void sendFeedback(Supplier<Text> supplier, boolean broadcastToOps);
@Shadow @Shadow
@Nullable @Nullable
@ -72,7 +73,7 @@ public abstract class ServerCommandSourceMixin implements CMDSender {
@Override @Override
public void send(String message) { public void send(String message) {
this.sendFeedback(Text.literal(message), false); this.sendFeedback(() -> Text.literal(message), false);
} }
@Override @Override

2
Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/mixin/ServerPlayNetworkHandlerMixin.java
View File

@ -33,7 +33,7 @@ public class ServerPlayNetworkHandlerMixin {
PlanFabricEvents.ON_COMMAND.invoker().onCommand((ServerPlayNetworkHandler) (Object) this, packet.command()); PlanFabricEvents.ON_COMMAND.invoker().onCommand((ServerPlayNetworkHandler) (Object) this, packet.command());
} }
@Inject(method = "onPlayerMove", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;getWorld()Lnet/minecraft/server/world/ServerWorld;")) @Inject(method = "onPlayerMove", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;getServerWorld()Lnet/minecraft/server/world/ServerWorld;"))
public void onPlayerMove(PlayerMoveC2SPacket packet, CallbackInfo ci) { public void onPlayerMove(PlayerMoveC2SPacket packet, CallbackInfo ci) {
PlanFabricEvents.ON_MOVE.invoker().onMove((ServerPlayNetworkHandler) (Object) this, packet); PlanFabricEvents.ON_MOVE.invoker().onMove((ServerPlayNetworkHandler) (Object) this, packet);
} }