Dev

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [26.1.2.4-beta]
+
+### Changed
+* NeoForge 26.1.2.71 required
+  * Previous versions of FTB Essentials will not work with NeoForge 26.1.2.70+ due to NeoForge API break
+
+### Fixed
+* Fixed player nickname not being shown after player logs in again (or after server restart)
+
 ## [26.1.2.3-beta]
 
 ### Fixed

common/src/main/java/dev/ftb/mods/ftbessentials/FTBEEventHandler.java

@@ -10,6 +10,7 @@
 import dev.ftb.mods.ftbessentials.util.FTBEWorldData;
 import dev.ftb.mods.ftbessentials.util.TeleportPos;
 import dev.ftb.mods.ftbessentials.util.WarmupCooldownTeleporter;
+import dev.ftb.mods.ftblibrary.platform.Platform;
 import dev.ftb.mods.ftblibrary.util.TimeUtils;
 import dev.ftb.mods.ftblibrary.util.result.Outcome;
 import net.minecraft.ChatFormatting;
@@ -56,6 +57,10 @@ public void playerLoggedIn(ServerPlayer serverPlayer) {
 			data.setLastSeenPos(new TeleportPos(serverPlayer));
 			data.markDirty();
 
+			if (!data.getNick().isEmpty()) {
+				Platform.get().misc().refreshDisplayName(serverPlayer);
+			}
+
 			FTBEPlayerData.sendPlayerTabs(serverPlayer);
 
 			KitManager.getInstance().allKits().forEach((kitName, kit) -> {

common/src/main/java/dev/ftb/mods/ftbessentials/util/FTBEPlayerData.java

@@ -216,25 +216,25 @@ public void markDirty() {
 	}
 
 	public Json5Object toJson() {
-		Json5Object nbt = new Json5Object();
-		nbt.addProperty("muted", muted);
-		nbt.addProperty("fly", canFly);
-		nbt.addProperty("god", god);
-		nbt.addProperty("nick", nick);
-		if (lastSeenPos != null) nbt.add("last_seen", lastSeenPos.toJson());
-		nbt.addProperty("recording", recording.getId());
+		Json5Object json = new Json5Object();
+		json.addProperty("muted", muted);
+		json.addProperty("fly", canFly);
+		json.addProperty("god", god);
+		json.addProperty("nick", nick);
+		if (lastSeenPos != null) json.add("last_seen", lastSeenPos.toJson());
+		json.addProperty("recording", recording.getId());
 
 		Json5Array tph = new Json5Array();
 		for (TeleportPos pos : teleportHistory) {
 			tph.add(pos.toJson());
 		}
-		nbt.add("teleport_history", tph);
+		json.add("teleport_history", tph);
 
-		nbt.add("homes", homes.toJson());
+		json.add("homes", homes.toJson());
 
-		nbt.add("kit_use_times", Util.make(new Json5Object(), tag -> kitUseTimes.forEach(tag::addProperty)));
+		json.add("kit_use_times", Util.make(new Json5Object(), tag -> kitUseTimes.forEach(tag::addProperty)));
 
-		return nbt;
+		return json;
 	}
 
 	public void readJson(Json5Object json) {

gradle.properties

@@ -10,12 +10,12 @@ supported_minecraft_versions=26.1,26.1.1,26.1.2
 minecraft_version_range_maven=[26.1,27)
 minecraft_version_range_semver=>=26.1.0
 
-mod_version=3
+mod_version=4
 mod_author=FTB Team
 
 # Deps
-neoforge_version=26.1.2.7-beta
-neoforge_version_range=[26.1.0.19-beta,27)
+neoforge_version=26.1.2.71
+neoforge_version_range=[26.1.0.71,27)
 neoforge_loader_version=4
 
 fabric_loader_version=0.18.4

neoforge/src/main/java/dev/ftb/mods/ftbessentials/neoforge/FTBEssentialsNeoForge.java

@@ -53,7 +53,7 @@ public FTBEssentialsNeoForge() {
 				essentials.eventHandler.onPlayerDeath((ServerPlayer) event.getOriginal(), (ServerPlayer) event.getEntity(), !event.isWasDeath())
 		);
 		bus.addListener(LivingDamageEvent.Post.class, event ->
-				essentials.eventHandler.onPlayerHurt(event.getEntity(), event.getNewDamage(), event.getNewDamage() > 0f)
+				essentials.eventHandler.onPlayerHurt(event.getEntity(), event.getInflictedDamage(), event.getBlockedDamage() > 0f)
 		);
 		bus.addListener(EventPriority.HIGHEST, ServerChatEvent.class, event -> {
 			if (essentials.eventHandler.allowChat(event.getPlayer()).isFail()) {