Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 03:05:28 +01:00
Code Issues Projects Releases Wiki Activity

fabric-1.19: migrateMappings to 1.19-pre1+build.1

Browse Source
This commit is contained in:
Kosma Moczek 2022-05-19 17:20:21 +02:00
parent 0ba89fefc4
commit 61b03bcdbb
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fabric-1.19/gradle.properties
View File

@ -1,4 +1,4 @@
minecraft_version=1.18.2 minecraft_version=1.19-pre1
yarn_mappings=1.18.2+build.1 yarn_mappings=1.19-pre1+build.1
loader_version=0.13.3 loader_version=0.14.5
fabric_version=0.47.8+1.18.2 fabric_version=0.52.4+1.19

2
fabric-1.19/src/main/java/org/dynmap/fabric_1_19/DynmapPlugin.java
View File

@ -527,7 +527,7 @@ public class DynmapPlugin {
// getPlayer throws a CommandSyntaxException, so getEntity and instanceof for safety // getPlayer throws a CommandSyntaxException, so getEntity and instanceof for safety
if (commandSource.getEntity() instanceof ServerPlayerEntity) { if (commandSource.getEntity() instanceof ServerPlayerEntity) {
psender = commandSource.getPlayer(); psender = commandSource.getPlayerOrThrow();
} }
if (psender != null) { if (psender != null) {

4
fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricCommandSender.java
View File

@ -1,7 +1,7 @@
package org.dynmap.fabric_1_19; package org.dynmap.fabric_1_19;
import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralTextContent;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import org.dynmap.common.DynmapCommandSender; import org.dynmap.common.DynmapCommandSender;
@ -25,7 +25,7 @@ public class FabricCommandSender implements DynmapCommandSender {
@Override @Override
public void sendMessage(String msg) { public void sendMessage(String msg) {
if (sender != null) { if (sender != null) {
Text ichatcomponent = new LiteralText(msg); Text ichatcomponent = new LiteralTextContent(msg);
sender.sendFeedback(ichatcomponent, false); sender.sendFeedback(ichatcomponent, false);
} }
} }

8
fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricPlayer.java
View File

@ -12,7 +12,7 @@ import net.minecraft.network.packet.s2c.play.TitleFadeS2CPacket;
import net.minecraft.network.packet.s2c.play.TitleS2CPacket; import net.minecraft.network.packet.s2c.play.TitleS2CPacket;
import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralTextContent;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.Util; import net.minecraft.util.Util;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
@ -188,7 +188,7 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override @Override
public void sendMessage(String msg) { public void sendMessage(String msg) {
Text ichatcomponent = new LiteralText(msg); Text ichatcomponent = new LiteralTextContent(msg);
player.sendSystemMessage(ichatcomponent, Util.NIL_UUID); player.sendSystemMessage(ichatcomponent, Util.NIL_UUID);
} }
@ -239,12 +239,12 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
TitleFadeS2CPacket times = new TitleFadeS2CPacket(fadeInTicks, stayTicks, fadeOutTicks); TitleFadeS2CPacket times = new TitleFadeS2CPacket(fadeInTicks, stayTicks, fadeOutTicks);
player.networkHandler.sendPacket(times); player.networkHandler.sendPacket(times);
if (title != null) { if (title != null) {
TitleS2CPacket titlepkt = new TitleS2CPacket(new LiteralText(title)); TitleS2CPacket titlepkt = new TitleS2CPacket(new LiteralTextContent(title));
player.networkHandler.sendPacket(titlepkt); player.networkHandler.sendPacket(titlepkt);
} }
if (subtitle != null) { if (subtitle != null) {
SubtitleS2CPacket subtitlepkt = new SubtitleS2CPacket(new LiteralText(subtitle)); SubtitleS2CPacket subtitlepkt = new SubtitleS2CPacket(new LiteralTextContent(subtitle));
player.networkHandler.sendPacket(subtitlepkt); player.networkHandler.sendPacket(subtitlepkt);
} }
} }

6
fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricServer.java
View File

@ -12,7 +12,7 @@ import net.minecraft.server.BannedPlayerList;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.PlayerManager; import net.minecraft.server.PlayerManager;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralTextContent;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.UserCache; import net.minecraft.util.UserCache;
import net.minecraft.util.Util; import net.minecraft.util.Util;
@ -272,7 +272,7 @@ public class FabricServer extends DynmapServerInterface {
case SIGN_CHANGE: case SIGN_CHANGE:
BlockEvents.SIGN_CHANGE_EVENT.register((world, pos, lines, material, player) -> { BlockEvents.SIGN_CHANGE_EVENT.register((world, pos, lines, material, player) -> {
plugin.core.processSignChange("fabric", FabricWorld.getWorldName(plugin, world), plugin.core.processSignChange("fabric", FabricWorld.getWorldName(plugin, world),
pos.getX(), pos.getY(), pos.getZ(), lines, player.getName().asString()); pos.getX(), pos.getY(), pos.getZ(), lines, player.getName().getContent());
}); });
break; break;
@ -292,7 +292,7 @@ public class FabricServer extends DynmapServerInterface {
@Override @Override
public void broadcastMessage(String msg) { public void broadcastMessage(String msg) {
Text component = new LiteralText(msg); Text component = new LiteralTextContent(msg);
server.getPlayerManager().broadcast(component, MessageType.SYSTEM, Util.NIL_UUID); server.getPlayerManager().broadcast(component, MessageType.SYSTEM, Util.NIL_UUID);
Log.info(stripChatColor(msg)); Log.info(stripChatColor(msg));
} }

4
fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ServerPlayNetworkHandlerMixin.java
View File

@ -8,7 +8,7 @@ import net.minecraft.server.filter.TextStream;
import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralTextContent;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import java.util.List; import java.util.List;
@ -61,6 +61,6 @@ public abstract class ServerPlayNetworkHandlerMixin {
// Put the (possibly updated) texts in the sign. Ignore filtering (is this OK?). // Put the (possibly updated) texts in the sign. Ignore filtering (is this OK?).
for (int i=0; i<signText.size(); i++) for (int i=0; i<signText.size(); i++)
signBlockEntity.setTextOnRow(i, new LiteralText(rawTexts[i])); signBlockEntity.setTextOnRow(i, new LiteralTextContent(rawTexts[i]));
} }
} }