Skip to content

Commit

Permalink
Merge pull request #21 from BlackLotus-SMP/1.20.4
Browse files Browse the repository at this point in the history 
1.20.4 update
  • Loading branch information
@Kahzerx
Kahzerx authored Jan 1, 2024
2 parents 29f3ef9 + b0a5374 commit 05098bb
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ jobs:
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
automatic_release_tag: 1.20.2
automatic_release_tag: 1.20.4
files: |
build/libs/*.jar
6 changes: 3 additions & 3 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/versions.html
minecraft_version=1.20.2
yarn_mappings=1.20.2+build.1
loader_version=0.14.22
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.3
loader_version=0.15.3

# Mod Properties
mod_version = 4.6
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/kahzerx/kahzerxmod/ExtensionManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public void loadExtensions(String settings) {
this.registerExtension(new SeedExtension(fileSettings));
this.registerExtension(new FckPrivacyExtension(fileSettings));
this.registerExtension(new SpoofExtension(fileSettings));
this.registerExtension(new ScoreboardExtension(fileSettings));
// this.registerExtension(new ScoreboardExtension(fileSettings));
this.registerExtension(new SpawnExtension(fileSettings));
this.registerExtension(new WhereExtension(fileSettings));
this.registerExtension(new BocaExtension(fileSettings));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/kahzerx/kahzerxmod/extensions/backExtension/BackPos.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public record BackPos(double x, double y, double z, String dim) {
public boolean isValid() {
return dim != null && !dim.equals("");
return dim != null && !dim.isEmpty();
}

public double getX() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/kahzerx/kahzerxmod/extensions/discordExtension/commands/InfoCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public PlayerData collectData(File skinPng, String uuid, DiscordWhitelistExtensi
long dsId = extension.getDiscordID(uuid);
Member dsName = guild.retrieveMemberById(dsId).complete();
String mcName = extension.getMinecraftNick(uuid);
Team serverTeam = server.getScoreboard().getPlayerTeam(mcName);
Team serverTeam = server.getScoreboard().getTeam(mcName);
String playerRole = "**Has no role**";
if (serverTeam != null) {
String playerTeam = serverTeam.getName();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/kahzerx/kahzerxmod/extensions/memberExtension/MemberExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ public void onPlayerJoined(ServerPlayerEntity player) {
team.setShowFriendlyInvisibles(false);
}
if (teamNames.contains("TEST_MEMBER")) {
Team playerTeam = server.getScoreboard().getPlayerTeam(player.getName().getString());
Team playerTeam = server.getScoreboard().getScoreHolderTeam(player.getName().getString());
if (playerTeam != null) {
return;
}
Team team = server.getScoreboard().getTeam("TEST_MEMBER");
server.getScoreboard().addPlayerToTeam(player.getName().getString(), team);
server.getScoreboard().addScoreHolderToTeam(player.getName().getString(), team);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/kahzerx/kahzerxmod/extensions/permsExtension/PermsExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ public void onPlayerJoined(ServerPlayerEntity player) {
if (server == null) {
return;
}
Team actual = server.getScoreboard().getPlayerTeam(player.getName().getString());
Team actual = server.getScoreboard().getScoreHolderTeam(player.getName().getString());
Team shouldTeam = server.getScoreboard().getTeam(playerPerms.get(playerUUID).getName());
if (actual == null || shouldTeam == null) {
return;
}
if (!actual.isEqual(shouldTeam)) {
server.getScoreboard().addPlayerToTeam(player.getName().getString(), shouldTeam);
server.getScoreboard().addScoreHolderToTeam(player.getName().getString(), shouldTeam);
}
}

Expand Down Expand Up @@ -199,7 +199,7 @@ public int updatePerms(ServerCommandSource source, String player, String value)

Collection<String> teamNames = source.getServer().getScoreboard().getTeamNames();
if (teamNames.contains(PermsLevels.getValue(level).getName())) {
source.getServer().getScoreboard().addPlayerToTeam(player, source.getServer().getScoreboard().getTeam(PermsLevels.getValue(level).getName()));
source.getServer().getScoreboard().addScoreHolderToTeam(player, source.getServer().getScoreboard().getTeam(PermsLevels.getValue(level).getName()));
}

return 1;
Expand Down
30 changes: 11 additions & 19 deletions src/main/java/com/kahzerx/kahzerxmod/extensions/scoreboardExtension/ScoreboardExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@
import net.minecraft.item.Item;
import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.scoreboard.*;
import net.minecraft.scoreboard.number.StyledNumberFormat;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.stat.ServerStatHandler;
import net.minecraft.stat.Stat;
import net.minecraft.stat.Stats;
import net.minecraft.text.Style;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.Identifier;
Expand Down Expand Up @@ -100,7 +102,7 @@ public int hideSidebar(ServerCommandSource source) {
} else {
scoreboard.setObjectiveSlot(ScoreboardDisplaySlot.SIDEBAR, null);
assert entity != null;
source.getServer().getPlayerManager().broadcast(MarkEnum.TICK.appendMsg(entity.getEntityName() + " removed the scoreboard."), false);
source.getServer().getPlayerManager().broadcast(MarkEnum.TICK.appendMsg(entity.getName().getString() + " removed the scoreboard."), false);
}
return 1;
}
Expand Down Expand Up @@ -144,7 +146,7 @@ public Text display(Scoreboard scoreboard, ScoreboardObjective scoreboardObjecti
} else {
tickSet = tick + (20 * 20);
}
text = MarkEnum.TICK.appendText(Text.literal(Formatting.WHITE + entity.getEntityName() + " has selected " + Formatting.GOLD + "[" + scoreboardObjective.getDisplayName().getString() + "]"));
text = MarkEnum.TICK.appendText(Text.literal(Formatting.WHITE + entity.getName().getString() + " has selected " + Formatting.GOLD + "[" + scoreboardObjective.getDisplayName().getString() + "]"));
}
return text;
}
Expand Down Expand Up @@ -174,7 +176,7 @@ public void showSideBar(ServerCommandSource source, Identifier id, String type,
return;
}
ScoreboardCriterion criteria = opCriteria.get();
scoreboard.addObjective(objectiveName, criteria, Text.literal(displayName).formatted(Formatting.GOLD), criteria.getDefaultRenderType());
scoreboard.addObjective(objectiveName, criteria, Text.literal(displayName).formatted(Formatting.GOLD), criteria.getDefaultRenderType(), true, new StyledNumberFormat(Style.EMPTY));
ScoreboardObjective newScoreboardObjective = scoreboardObjective = scoreboard.getNullableObjective(objectiveName);
try {
initScoreboard(source, newScoreboardObjective, entityType, type);
Expand All @@ -194,7 +196,7 @@ public void showSideBar(ServerCommandSource source, Identifier id, String type,
}
assert entity != null;
assert scoreboardObjective != null;
text = MarkEnum.TICK.appendText(Text.literal(Formatting.WHITE + entity.getEntityName() + " has selected " + Formatting.GOLD + "[" + scoreboardObjective.getDisplayName().getString() + "]"));
text = MarkEnum.TICK.appendText(Text.literal(Formatting.WHITE + entity.getName().getString() + " has selected " + Formatting.GOLD + "[" + scoreboardObjective.getDisplayName().getString() + "]"));
}
source.getServer().getPlayerManager().broadcast(text, false);
}
Expand All @@ -219,8 +221,7 @@ public void showSideBar(ServerCommandSource source, ItemStackArgument item, Stri
return;
}
ScoreboardCriterion criteria = opCriteria.get();

scoreboard.addObjective(objectiveName, criteria, Text.literal(displayName).formatted(Formatting.GOLD), criteria.getDefaultRenderType());
scoreboard.addObjective(objectiveName, criteria, Text.literal(displayName).formatted(Formatting.GOLD), criteria.getDefaultRenderType(), true, new StyledNumberFormat(Style.EMPTY));

ScoreboardObjective newScoreboardObjective = scoreboardObjective = scoreboard.getNullableObjective(objectiveName);
try {
Expand All @@ -241,7 +242,7 @@ public void showSideBar(ServerCommandSource source, ItemStackArgument item, Stri
}
assert entity != null;
assert scoreboardObjective != null;
text = MarkEnum.TICK.appendText(Text.literal(Formatting.WHITE + entity.getEntityName() + " has selected " + Formatting.GOLD + "[" + scoreboardObjective.getDisplayName().getString() + "]"));
text = MarkEnum.TICK.appendText(Text.literal(Formatting.WHITE + entity.getName().getString() + " has selected " + Formatting.GOLD + "[" + scoreboardObjective.getDisplayName().getString() + "]"));
}
source.getServer().getPlayerManager().broadcast(text, false);
}
Expand All @@ -258,24 +259,21 @@ public void initCustom(ServerCommandSource source, ScoreboardObjective scoreboar
UUID uuid = UUID.fromString(uuidString);
ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid);
int value;
String playerName;
Stat<?> finalStat = Stats.CUSTOM.getOrCreateStat(id);
if (player != null) {
value = player.getStatHandler().getStat(finalStat);
playerName = player.getEntityName();
} else {
ServerStatHandler serverStatHandler = new ServerStatHandler(server, stat);
value = serverStatHandler.getStat(finalStat);
Optional<GameProfile> gameProfile = server.getUserCache().getByUuid(uuid);
if (gameProfile.isEmpty()) {
continue;
}
playerName = gameProfile.get().getName();
}
if (value == 0) {
continue;
}
ScoreboardPlayerScore scoreboardPlayerScore = scoreboard.getPlayerScore(playerName, scoreboardObjective);
ScoreAccess scoreboardPlayerScore = scoreboard.getOrCreateScore(player, scoreboardObjective);
scoreboardPlayerScore.setScore(value);
}
}
Expand Down Expand Up @@ -306,10 +304,8 @@ public void initScoreboard(ServerCommandSource source, ScoreboardObjective score
finalStat = Stats.DROPPED.getOrCreateStat(item);
}
int value;
String playerName;
if (player != null) {
value = player.getStatHandler().getStat(finalStat);
playerName = player.getEntityName();
} else {
ServerStatHandler serverStatHandler = new ServerStatHandler(server, stat);
value = serverStatHandler.getStat(finalStat);
Expand All @@ -318,12 +314,11 @@ public void initScoreboard(ServerCommandSource source, ScoreboardObjective score
if (gameProfile.isEmpty()) {
continue;
}
playerName = gameProfile.get().getName();
}
if (value == 0) {
continue;
}
ScoreboardPlayerScore scoreboardPlayerScore = scoreboard.getPlayerScore(playerName, scoreboardObjective);
ScoreAccess scoreboardPlayerScore = scoreboard.getOrCreateScore(player, scoreboardObjective);
scoreboardPlayerScore.setScore(value);
}
}
Expand All @@ -346,10 +341,8 @@ public void initScoreboard(ServerCommandSource source, ScoreboardObjective score
finalStat = Stats.KILLED_BY.getOrCreateStat(entityType);
}
int value;
String playerName;
if (player != null) {
value = player.getStatHandler().getStat(finalStat);
playerName = player.getEntityName();
} else {
ServerStatHandler serverStatHandler = new ServerStatHandler(server, stat);
value = serverStatHandler.getStat(finalStat);
Expand All @@ -358,12 +351,11 @@ public void initScoreboard(ServerCommandSource source, ScoreboardObjective score
if (gameProfile.isEmpty()) {
continue;
}
playerName = gameProfile.get().getName();
}
if (value == 0) {
continue;
}
ScoreboardPlayerScore scoreboardPlayerScore = scoreboard.getPlayerScore(playerName, scoreboardObjective);
ScoreAccess scoreboardPlayerScore = scoreboard.getOrCreateScore(player, scoreboardObjective);
scoreboardPlayerScore.setScore(value);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/kahzerx/kahzerxmod/mixin/badgeExtension/PlayerManagerMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private void onBroadcast(ServerPlayerEntity instance, SentMessage message, boole
if (BadgeExtension.isExtensionEnabled && sender != null) {
MutableText t = Text.literal("");
List<BadgeInstance> badges = BadgeExtension.playerBadges.get(sender.getUuid().toString());
if (badges.size() != 0) {
if (!badges.isEmpty()) {
t = Text.literal(" ");
MutableText hover = Text.literal("");
hover.append(Text.literal("Badges:").styled(style -> style.withColor(Formatting.WHITE)));
Expand All @@ -49,7 +49,7 @@ private void onBroadcast(ServerPlayerEntity instance, SentMessage message, boole
MutableText display = MutableText.of(sender.getDisplayName().getContent());
display.setStyle(sender.getDisplayName().getStyle());
MutableText m = Text.literal("");
if (sender.getDisplayName().getSiblings().size() != 0) {
if (!sender.getDisplayName().getSiblings().isEmpty()) {
display.append(sender.getDisplayName().getSiblings().get(0));
display.append(sender.getDisplayName().getSiblings().get(1));
m.append(sender.getDisplayName().getSiblings().get(2).copy());
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/kahzerx/kahzerxmod/mixin/opOnWhitelistExtension/ServerConfigMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void onWhitelistAdd(V entry, CallbackInfo ci) {
JSONParser parser = new JSONParser();
JSONObject obj = (JSONObject) parser.parse(new Gson().toJson(entry));
Set<?> keys = obj.keySet();
if (keys.size() == 0) {
if (keys.isEmpty()) {
return;
}
Optional<?> k = keys.stream().findFirst();
Expand All @@ -51,7 +51,7 @@ public void onWhitelistRemove(ServerConfigEntry<K> entry, CallbackInfo ci) {
JSONParser parser = new JSONParser();
JSONObject obj = (JSONObject) parser.parse(new Gson().toJson(entry));
Set<?> keys = obj.keySet();
if (keys.size() == 0) {
if (keys.isEmpty()) {
return;
}
Optional<?> k = keys.stream().findFirst();
Expand Down
25 changes: 12 additions & 13 deletions src/main/java/com/kahzerx/kahzerxmod/mixin/scoreboardExtension/ScoreboardMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

import com.kahzerx.kahzerxmod.extensions.scoreboardExtension.ScoreboardExtension;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.s2c.play.ScoreboardPlayerUpdateS2CPacket;
import net.minecraft.scoreboard.Scoreboard;
import net.minecraft.scoreboard.ScoreboardObjective;
import net.minecraft.scoreboard.ScoreboardPlayerScore;
import net.minecraft.scoreboard.ServerScoreboard;
import net.minecraft.network.packet.s2c.play.ScoreboardScoreUpdateS2CPacket;
import net.minecraft.scoreboard.*;
import net.minecraft.scoreboard.number.StyledNumberFormat;
import net.minecraft.server.MinecraftServer;
import net.minecraft.text.Style;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
Expand All @@ -27,25 +27,24 @@ public class ScoreboardMixin extends Scoreboard {
private void onCreate(ScoreboardObjective objective, CallbackInfoReturnable<List<Packet<?>>> cir) {
if (ScoreboardExtension.isExtensionEnabled) {
int i = 0;
for (ScoreboardPlayerScore score : getAllPlayerScores(objective)) {
i += score.getScore();
for (ScoreboardEntry se : getScoreboardEntries(objective)) {
i += se.value();
}
cir.getReturnValue().add(new ScoreboardPlayerUpdateS2CPacket(ServerScoreboard.UpdateMode.CHANGE, objective.getName(), Formatting.BOLD + "TOTAL", i));
cir.getReturnValue().add(new ScoreboardScoreUpdateS2CPacket(Formatting.BOLD + "TOTAL", objective.getName(), i, Text.literal(Formatting.BOLD + "TOTAL"), new StyledNumberFormat(Style.EMPTY)));
}
}

@Inject(method = "updateScore", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;sendToAll(Lnet/minecraft/network/packet/Packet;)V"))
private void onUpdate(ScoreboardPlayerScore score, CallbackInfo ci) {
private void onUpdate(ScoreHolder scoreHolder, ScoreboardObjective objective, ScoreboardScore score, CallbackInfo ci) {
if (ScoreboardExtension.isExtensionEnabled) {
ScoreboardObjective objective = score.getObjective();
if (objective == null) {
return;
}
int i = 0;
for (ScoreboardPlayerScore sc : getAllPlayerScores(objective)) {
i += sc.getScore();
for (ScoreboardEntry se : getScoreboardEntries(objective)) {
i += se.value();
}
server.getPlayerManager().sendToAll(new ScoreboardPlayerUpdateS2CPacket(ServerScoreboard.UpdateMode.CHANGE, objective.getName(), Formatting.BOLD + "TOTAL", i));
server.getPlayerManager().sendToAll(new ScoreboardScoreUpdateS2CPacket(Formatting.BOLD + "TOTAL", objective.getName(), i, Text.literal(Formatting.BOLD + "TOTAL"), new StyledNumberFormat(Style.EMPTY)));
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/kahzerx/kahzerxmod/mixin/server/PlayerEventsMixins.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static class PlayerBreak {

@Shadow protected ServerWorld world;

@Inject(method = "tryBreakBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;onBreak(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/player/PlayerEntity;)V", shift = At.Shift.BEFORE))
@Inject(method = "tryBreakBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;onBroken(Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V", shift = At.Shift.BEFORE))
private void onBroken(BlockPos pos, CallbackInfoReturnable<Boolean> cir) {
KahzerxServer.onPlayerBreakBlock(player, world, pos);
}
Expand Down Expand Up @@ -93,7 +93,7 @@ public static class PlayerAdvancement {

@Inject(method = "method_53637", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Z)V"))
private void onAdvancement(AdvancementEntry advancementEntry, AdvancementDisplay display, CallbackInfo ci) {
Text text = Text.translatable("chat.type.advancement." + display.getFrame().getId(), owner.getDisplayName(), Advancement.getNameFromIdentity(advancementEntry));
Text text = Text.translatable("chat.type.advancement." + display.getFrame().getChatAnnouncementText(advancementEntry, owner), owner.getDisplayName(), Advancement.getNameFromIdentity(advancementEntry));
KahzerxServer.onAdvancement(text.getString().replace("_", "\\_"));
}
}
Expand Down

0 comments on commit 05098bb

Please sign in to comment.