diff --git a/gradle.properties b/gradle.properties index b22b227..ebcc34a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.21.4+build.8 loader_version=0.16.10 # Mod Properties -mod_version=1.1.0 +mod_version=1.1.1 maven_group=wtf.hak.survivalfabric archives_base_name=survivalfabric diff --git a/src/main/java/wtf/hak/survivalfabric/commands/SpectatorCommand.java b/src/main/java/wtf/hak/survivalfabric/commands/SpectatorCommand.java index 49bd81a..f6fbcdb 100644 --- a/src/main/java/wtf/hak/survivalfabric/commands/SpectatorCommand.java +++ b/src/main/java/wtf/hak/survivalfabric/commands/SpectatorCommand.java @@ -36,7 +36,7 @@ public class SpectatorCommand { player.teleport(data.world, data.x, data.y, data.z, Set.of(), data.yaw, data.pitch, false); player.changeGameMode(GameMode.SURVIVAL); spectating.remove(player); - DimensionTeams.assignCorrectTeam(player, data.world.getRegistryKey().getValue().toTranslationKey()); + //DimensionTeams.assignCorrectTeam(player, data.world.getRegistryKey().getValue().toTranslationKey()); } else { spectating.put(player, new LocationData(player @@ -47,7 +47,7 @@ public class SpectatorCommand { .getPitch(), player .getServerWorld())); player.changeGameMode(GameMode.SPECTATOR); - DimensionTeams.assignCorrectTeam(player, ""); + //DimensionTeams.assignCorrectTeam(player, ""); } return 1; } diff --git a/src/main/java/wtf/hak/survivalfabric/mixin/PlayerManagerMixin.java b/src/main/java/wtf/hak/survivalfabric/mixin/PlayerManagerMixin.java index 3a1a84c..a240655 100644 --- a/src/main/java/wtf/hak/survivalfabric/mixin/PlayerManagerMixin.java +++ b/src/main/java/wtf/hak/survivalfabric/mixin/PlayerManagerMixin.java @@ -34,7 +34,7 @@ public abstract class PlayerManagerMixin { @Inject(method = {"onPlayerConnect"}, at = {@At(value = "HEAD")}) public void onPlayerConnectHead(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) { - DimensionTeams.assignCorrectTeam(player, player.getServerWorld().getRegistryKey().getValue().toTranslationKey()); + //DimensionTeams.assignCorrectTeam(player, player.getServerWorld().getRegistryKey().getValue().toTranslationKey()); } @ModifyArg(method = {"onPlayerConnect"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Z)V")) diff --git a/src/main/java/wtf/hak/survivalfabric/mixin/ServerWorldMixin.java b/src/main/java/wtf/hak/survivalfabric/mixin/ServerWorldMixin.java index 2a44db4..b140733 100644 --- a/src/main/java/wtf/hak/survivalfabric/mixin/ServerWorldMixin.java +++ b/src/main/java/wtf/hak/survivalfabric/mixin/ServerWorldMixin.java @@ -19,8 +19,8 @@ public class ServerWorldMixin { if(entity instanceof ServerPlayerEntity) { ServerPlayerEntity player = (ServerPlayerEntity)entity; String dimension = Messages.getDimensionFormatted(player.getServerWorld().getRegistryKey().getValue().toTranslationKey()); - player.sendMessage(Text.literal(dimension), false); - DimensionTeams.assignCorrectTeam(player, player.getServerWorld().getRegistryKey().getValue().toTranslationKey()); + //player.sendMessage(Text.literal(dimension), false); + //DimensionTeams.assignCorrectTeam(player, player.getServerWorld().getRegistryKey().getValue().toTranslationKey()); } } }