Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

fabric-1.18: remap and update to 1.18-rc1+build.1

Browse source
This commit is contained in:
Kosma Moczek 2021-11-25 19:33:41 +01:00
parent fef6577238
commit 4d8561187e
6 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java
View file

@ -310,7 +310,7 @@ public class DynmapPlugin {
}
// TODO: Consider whether cheats are enabled for integrated server
return server.isSinglePlayer() && player.equalsIgnoreCase(server.getUserName());
return server.isSingleplayer() && player.equalsIgnoreCase(server.getSinglePlayerName());
}
boolean hasPerm(PlayerEntity psender, String permission) {

2
fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricPlayer.java
View file

@ -100,7 +100,7 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
}
Vec3d pos = player.getPos();
return FabricAdapter.toDynmapLocation(plugin, player.getServerWorld(), pos.getX(), pos.getY(), pos.getZ());
return FabricAdapter.toDynmapLocation(plugin, player.getWorld(), pos.getX(), pos.getY(), pos.getZ());
}
@Override

6
fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricServer.java
View file

@ -181,7 +181,7 @@ public class FabricServer extends DynmapServerInterface {
@Override
public String getServerName() {
String sn;
if (server.isSinglePlayer())
if (server.isSingleplayer())
sn = "Integrated";
else
sn = server.getServerIp();
@ -308,7 +308,7 @@ public class FabricServer extends DynmapServerInterface {
@Override
public void broadcastMessage(String msg) {
Text component = new LiteralText(msg);
server.getPlayerManager().broadcastChatMessage(component, MessageType.SYSTEM, Util.NIL_UUID);
server.getPlayerManager().broadcast(component, MessageType.SYSTEM, Util.NIL_UUID);
Log.info(stripChatColor(msg));
}
@ -548,7 +548,7 @@ public class FabricServer extends DynmapServerInterface {
@Override
public String getServerIP() {
if (server.isSinglePlayer())
if (server.isSingleplayer())
return "0.0.0.0";
else
return server.getServerIp();

6
fabric-1.18/src/main/resources/fabric.mod.json
View file

@ -26,8 +26,8 @@
],
"depends": {
"fabricloader": ">=0.7.4",
"fabric": ">=0.17.0",
"minecraft": "1.17.1"
"fabricloader": ">=0.12.5",
"fabric": ">=0.43.1",
"minecraft": "1.18-rc.1"
}
}