Skip to content

Commit 2751740

Browse files
committed
fix color
1 parent 5bb7fbe commit 2751740

File tree

8 files changed

+16
-8
lines changed

8 files changed

+16
-8
lines changed

1.12/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ private void failOnNonRandomSpawns(CallbackInfo ci, @Share("seed") LocalRef<Seed
6969
@Inject(method = "onSpawn", at = @At("TAIL"))
7070
private void sendErrorMessage(CallbackInfo ci) {
7171
if (this.setSpawnError != null) {
72-
this.sendMessage(new LiteralTextContent(this.setSpawnError + " This run is not verifiable.").setStyle(new Style().withColor(Formatting.RED)));
72+
Text message = new LiteralTextContent(this.setSpawnError + " This run is not verifiable.");
73+
message.getStyle().withColor(Formatting.RED);
74+
this.sendMessage(message);
7375
this.setSpawnError = null;
7476
}
7577
}

1.13.x/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private void failOnNonRandomSpawns(CallbackInfo ci, @Share("seed") LocalRef<Seed
8787
@Inject(method = "listenToScreenHandler", at = @At("TAIL"))
8888
private void sendErrorMessage(CallbackInfo ci) {
8989
if (this.setSpawnError != null) {
90-
this.sendMessage(new LiteralText(this.setSpawnError + " This run is not verifiable.").setStyle(new Style().setFormatting(Formatting.RED)), false);
90+
this.sendMessage(new LiteralText(this.setSpawnError + " This run is not verifiable.").formatted(Formatting.RED), false);
9191
this.setSpawnError = null;
9292
}
9393
}

1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.minecraft.server.network.ServerPlayerEntity;
88
import net.minecraft.server.world.ServerWorld;
99
import net.minecraft.text.*;
10+
import net.minecraft.util.Formatting;
1011
import net.minecraft.util.math.*;
1112
import net.set.spawn.mod.*;
1213
import net.set.spawn.mod.interfaces.MinecraftServerExtended;
@@ -96,7 +97,7 @@ private void sendErrorMessage(CallbackInfo ci) {
9697
@Inject(method = "method_14235(Lnet/minecraft/class_1703;)V", at = @At("TAIL"), require = 0)
9798
private void sendErrorMessage2(CallbackInfo ci) {
9899
if (this.setSpawnError != null) {
99-
this.sendMessage(new LiteralText("§c" + this.setSpawnError + " This run is not verifiable."), false);
100+
this.sendMessage(new LiteralText(this.setSpawnError + " This run is not verifiable.").formatted(Formatting.RED), false);
100101
this.setSpawnError = null;
101102
}
102103
}

1.19-1.21.4/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.minecraft.server.network.ServerPlayerEntity;
88
import net.minecraft.server.world.ServerWorld;
99
import net.minecraft.text.Text;
10+
import net.minecraft.util.Formatting;
1011
import net.minecraft.util.math.*;
1112
import net.minecraft.util.math.random.Random;
1213
import net.set.spawn.mod.*;
@@ -106,7 +107,7 @@ private void failOnNonRandomSpawns2(CallbackInfoReturnable<Boolean> cir, @Share(
106107
@Inject(method = "onSpawn", at = @At("TAIL"))
107108
private void sendErrorMessage(CallbackInfo ci) {
108109
if (this.setSpawnError != null) {
109-
this.sendMessage(Text.literal("§c" + this.setSpawnError + " This run is not verifiable."), false);
110+
this.sendMessage(Text.literal(this.setSpawnError + " This run is not verifiable.").formatted(Formatting.RED), false);
110111
this.setSpawnError = null;
111112
}
112113
}

1.3-1.5.2/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public abstract class ServerPlayerEntityMixin {
2121
private String setSpawnError;
2222

2323
@Shadow
24-
public abstract void method_3331(String par1);
24+
public abstract void method_3331(String message);
2525

2626
@WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/util/Random;nextInt(I)I", ordinal = 0))
2727
private int setSpawnX(Random random, int bounds, Operation<Integer> original, @Local(argsOnly = true) MinecraftServer server, @Local BlockPos worldSpawn, @Share("seed") LocalRef<Seed> seed, @Share("zCoord") LocalRef<Integer> zCoord, @Share("isRandomSpawn") LocalBooleanRef isRandomSpawn) {

1.6.x/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public abstract class ServerPlayerEntityMixin {
2323
private String setSpawnError;
2424

2525
@Shadow
26-
public abstract void method_5505(ChatMessage par1);
26+
public abstract void method_5505(ChatMessage message);
2727

2828
@WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/util/Random;nextInt(I)I", ordinal = 0))
2929
private int setSpawnX(Random random, int bounds, Operation<Integer> original, @Local(argsOnly = true) MinecraftServer server, @Local BlockPos worldSpawn, @Local(ordinal = 3) int spawnRadius, @Share("seed") LocalRef<Seed> seed, @Share("zCoord") LocalRef<Integer> zCoord, @Share("isRandomSpawn") LocalBooleanRef isRandomSpawn) {

1.7.x/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ private void failOnNonRandomSpawns(CallbackInfo ci, @Share("seed") LocalRef<Seed
6969
@Inject(method = "listenToScreenHandler", at = @At("TAIL"))
7070
private void sendErrorMessage(CallbackInfo ci) {
7171
if (this.setSpawnError != null) {
72-
this.sendMessage(new LiteralText(this.setSpawnError + " This run is not verifiable.").setStyle(new Style().setFormatting(Formatting.RED)));
72+
Text message = new LiteralText(this.setSpawnError + " This run is not verifiable.");
73+
message.getStyle().setFormatting(Formatting.RED);
74+
this.sendMessage(message);
7375
this.setSpawnError = null;
7476
}
7577
}

1.8-1.12.2/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ private void failOnNonRandomSpawns(CallbackInfo ci, @Share("seed") LocalRef<Seed
6969
@Inject(method = "listenToScreenHandler", at = @At("TAIL"))
7070
private void sendErrorMessage(CallbackInfo ci) {
7171
if (this.setSpawnError != null) {
72-
this.sendMessage(new LiteralText(this.setSpawnError + " This run is not verifiable.").setStyle(new Style().setFormatting(Formatting.RED)));
72+
Text message = new LiteralText(this.setSpawnError + " This run is not verifiable.");
73+
message.getStyle().setFormatting(Formatting.RED);
74+
this.sendMessage(message);
7375
this.setSpawnError = null;
7476
}
7577
}

0 commit comments

Comments
 (0)