Merge pull request #28 from FTBTeam/dev

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).
 
+## [21.1.1]
+
+### Added
+* Waystones integration: Added a config setting "only_show_known_waystones", default true
+  * When true, only activated waystones will appear on FTB Chunks mapping
+
+### Fixed
+* Waystones integration: Fixed excessive client-side logging for waystone discovery and updating
+
 ## [21.1.0]
 
 ### Changed

common/src/main/java/dev/ftb/mods/ftbxmodcompat/ClientUtil.java

@@ -0,0 +1,10 @@
+package dev.ftb.mods.ftbxmodcompat;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.entity.player.Player;
+
+public class ClientUtil {
+    public static Player getClientPlayer() {
+        return Minecraft.getInstance().player;
+    }
+}

common/src/main/java/dev/ftb/mods/ftbxmodcompat/config/FTBXModConfig.java

@@ -1,6 +1,7 @@
 package dev.ftb.mods.ftbxmodcompat.config;
 
 import dev.ftb.mods.ftblibrary.config.NameMap;
+import dev.ftb.mods.ftblibrary.snbt.config.BooleanValue;
 import dev.ftb.mods.ftblibrary.snbt.config.EnumValue;
 import dev.ftb.mods.ftblibrary.snbt.config.SNBTConfig;
 import dev.ftb.mods.ftbxmodcompat.FTBXModCompat;
@@ -16,6 +17,9 @@ public interface FTBXModConfig {
     EnumValue<PermSelector> PERMISSION_SELECTOR = CONFIG.addEnum("permission_selector", NameMap.of(PermSelector.DEFAULT, PermSelector.values()).create())
             .comment("Select the permissions implementation to use", "DEFAULT: use FTB Ranks then Luckperms in preference order, depending on mod availability");
 
+    BooleanValue ONLY_SHOW_KNOWN_WAYSTONES = CONFIG.addBoolean("only_show_known_waystones", true)
+            .comment("Only show waystones that have been discovered");
+
     enum StageSelector {
         DEFAULT(()-> true),
         VANILLA(() -> true),

fabric/build.gradle

@@ -73,7 +73,8 @@ processResources {
                 "ftbquestsversion": project.ftb_quests_version,
                 "ftbchunksversion": project.ftb_chunks_version,
                 "ftbranksversion": project.ftb_ranks_version,
-                "ftbteamsversion": project.ftb_teams_version
+                "ftbteamsversion": project.ftb_teams_version,
+                "required_waystones_version": project.required_waystones_version
     }
 }
 

fabric/src/main/java/dev/ftb/mods/ftbxmodcompat/fabric/ftbchunks/waystones/WaystonesCompat.java

@@ -1,29 +1,40 @@
 package dev.ftb.mods.ftbxmodcompat.fabric.ftbchunks.waystones;
 
-import dev.ftb.mods.ftbxmodcompat.FTBXModCompat;
+import com.mojang.logging.LogUtils;
+import dev.architectury.platform.Platform;
+import dev.architectury.utils.Env;
+import dev.ftb.mods.ftbxmodcompat.ClientUtil;
+import dev.ftb.mods.ftbxmodcompat.config.FTBXModConfig;
 import dev.ftb.mods.ftbxmodcompat.ftbchunks.waystones.WaystoneData;
 import dev.ftb.mods.ftbxmodcompat.ftbchunks.waystones.WaystoneMapIcon;
 import dev.ftb.mods.ftbxmodcompat.ftbchunks.waystones.WaystonesCommon;
 import net.blay09.mods.balm.api.Balm;
 import net.blay09.mods.waystones.api.Waystone;
 import net.blay09.mods.waystones.api.WaystoneVisibility;
+import net.blay09.mods.waystones.api.WaystonesAPI;
 import net.blay09.mods.waystones.api.event.WaystoneRemoveReceivedEvent;
 import net.blay09.mods.waystones.api.event.WaystoneUpdatedEvent;
+import net.minecraft.client.Minecraft;
+import org.slf4j.Logger;
 
 public class WaystonesCompat {
+	private static final Logger LOGGER = LogUtils.getLogger();
+
 	public static void init() {
 		Balm.getEvents().onEvent(WaystoneUpdatedEvent.class, WaystonesCompat::updateWaystone);
 		Balm.getEvents().onEvent(WaystoneRemoveReceivedEvent.class, WaystonesCompat::removeWaystone);
 	}
 
 	private static void removeWaystone(WaystoneRemoveReceivedEvent event) {
-		FTBXModCompat.LOGGER.info("waystone removed: " + event.getWaystoneId());
+		LOGGER.trace("Waystone removed: {}", event.getWaystoneId());
 		WaystonesCommon.removeWaystone(event.getWaystoneId());
 	}
 
 	private static void updateWaystone(WaystoneUpdatedEvent event) {
-		FTBXModCompat.LOGGER.info("waystone updated: " + event.getWaystone().getWaystoneUid());
+		LOGGER.trace("waystone updated: {} {}", event.getWaystone().getWaystoneUid(), event.getWaystone().getVisibility());
 		Waystone w = event.getWaystone();
-		WaystonesCommon.updateWaystone(w.getWaystoneUid(), new WaystoneData(w.getDimension(), new WaystoneMapIcon(w.getPos(), w.getName(), w.getVisibility() == WaystoneVisibility.GLOBAL)));
+		if (Platform.getEnvironment() == Env.CLIENT && (!FTBXModConfig.ONLY_SHOW_KNOWN_WAYSTONES.get() || WaystonesAPI.isWaystoneActivated(ClientUtil.getClientPlayer(), w))) {
+			WaystonesCommon.updateWaystone(w.getWaystoneUid(), new WaystoneData(w.getDimension(), new WaystoneMapIcon(w.getPos(), w.getName(), w.getVisibility() == WaystoneVisibility.GLOBAL)));
+		}
 	}
 }

fabric/src/main/resources/fabric.mod.json

@@ -31,6 +31,7 @@
     "ftbquests": "<2001.3.0",
     "ftbchunks": "<2001.2.0",
     "jei": "<15.2",
-    "kubejs": "<2001.6.3-build.18"
+    "kubejs": "<2001.6.3-build.18",
+    "waystones": "<${required_waystones_version}"
   }
 }

gradle.properties

@@ -6,7 +6,7 @@ enabled_platforms=fabric,neoforge
 
 archives_base_name=ftb-xmod-compat
 readable_name=FTB XMod Compat
-mod_version=21.1.0
+mod_version=21.1.1
 maven_group=dev.ftb.mods
 curseforge_id=889915
 
@@ -15,7 +15,7 @@ neoforge_version=21.1.13
 neoforge_version_range=[21.1.0,)
 neoforge_loader_version=4
 fabric_loader_version=0.15.11
-fabric_api_version=0.100.1+1.21
+fabric_api_version=0.106.0+1.21.1
 fabric_api_version_range=>=0.100.1+1.21
 
 architectury_version=13.0.6
@@ -31,14 +31,16 @@ ftb_filter_system_version=21.0.0
 rei_version=16.0.729
 common_prot_api_version=1.0.0
 luckperms_api_version=5.4
-waystones_neoforge_version=5427156
+waystones_neoforge_version=5841748
 waystones_forge_version=5427151
-waystones_fabric_version=5427150
-balm_neoforge_version=5438018
+waystones_fabric_version=5841746
+balm_neoforge_version=5798246
 balm_forge_version=5438000
 balm_fabric_version=5437997
-jei_version=19.8.5.118
+jei_version=19.21.0.246
 kubejs_version=2100.7.0-build.56
 
+required_waystones_version=21.1.5
+
 # TODO compiling against 1.20.4 version for now
 gamestages_version=15.0.1

neoforge/build.gradle

@@ -71,7 +71,8 @@ processResources {
                 "ftbquestsversion": project.ftb_quests_version,
                 "ftbchunksversion": project.ftb_chunks_version,
                 "ftbranksversion": project.ftb_ranks_version,
-                "ftbteamsversion": project.ftb_teams_version
+                "ftbteamsversion": project.ftb_teams_version,
+                "required_waystones_version": project.required_waystones_version
     }
 }
 

neoforge/src/main/java/dev/ftb/mods/ftbxmodcompat/neoforge/ftbchunks/waystones/WaystonesCompat.java

@@ -1,28 +1,40 @@
 package dev.ftb.mods.ftbxmodcompat.neoforge.ftbchunks.waystones;
 
-import dev.ftb.mods.ftbxmodcompat.FTBXModCompat;
+import com.mojang.logging.LogUtils;
+import dev.architectury.platform.Platform;
+import dev.architectury.utils.Env;
+import dev.ftb.mods.ftbxmodcompat.ClientUtil;
+import dev.ftb.mods.ftbxmodcompat.config.FTBXModConfig;
 import dev.ftb.mods.ftbxmodcompat.ftbchunks.waystones.WaystoneData;
 import dev.ftb.mods.ftbxmodcompat.ftbchunks.waystones.WaystoneMapIcon;
 import dev.ftb.mods.ftbxmodcompat.ftbchunks.waystones.WaystonesCommon;
 import net.blay09.mods.balm.api.Balm;
 import net.blay09.mods.waystones.api.Waystone;
 import net.blay09.mods.waystones.api.WaystoneVisibility;
+import net.blay09.mods.waystones.api.WaystonesAPI;
 import net.blay09.mods.waystones.api.event.*;
+import net.minecraft.client.Minecraft;
+import net.neoforged.api.distmarker.Dist;
+import org.slf4j.Logger;
 
 public class WaystonesCompat {
+	private static final Logger LOGGER = LogUtils.getLogger();
+
 	public static void init() {
 		Balm.getEvents().onEvent(WaystoneUpdatedEvent.class, WaystonesCompat::updateWaystone);
 		Balm.getEvents().onEvent(WaystoneRemoveReceivedEvent.class, WaystonesCompat::removeWaystone);
 	}
 
 	private static void removeWaystone(WaystoneRemoveReceivedEvent event) {
-		FTBXModCompat.LOGGER.info("waystone removed: " + event.getWaystoneId());
+		LOGGER.trace("Waystone removed: {}", event.getWaystoneId());
 		WaystonesCommon.removeWaystone(event.getWaystoneId());
 	}
 
 	private static void updateWaystone(WaystoneUpdatedEvent event) {
-		FTBXModCompat.LOGGER.info("waystone updated: " + event.getWaystone().getWaystoneUid());
+		LOGGER.trace("waystone updated: {} {}", event.getWaystone().getWaystoneUid(), event.getWaystone().getVisibility());
 		Waystone w = event.getWaystone();
-		WaystonesCommon.updateWaystone(w.getWaystoneUid(), new WaystoneData(w.getDimension(), new WaystoneMapIcon(w.getPos(), w.getName(), w.getVisibility() == WaystoneVisibility.GLOBAL)));
+		if (Platform.getEnvironment() == Env.CLIENT && (!FTBXModConfig.ONLY_SHOW_KNOWN_WAYSTONES.get() || WaystonesAPI.isWaystoneActivated(ClientUtil.getClientPlayer(), w))) {
+			WaystonesCommon.updateWaystone(w.getWaystoneUid(), new WaystoneData(w.getDimension(), new WaystoneMapIcon(w.getPos(), w.getName(), w.getVisibility() == WaystoneVisibility.GLOBAL)));
+		}
 	}
 }

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -81,4 +81,9 @@ modId = "luckperms"
 type = "optional"
 versionRange = "[5.4.112,)"
 ordering = "AFTER"
-side = "SERVER"
+side = "SERVER"
+
+[[dependencies.ftbxmodcompat]]
+modId = "waystones"
+type = "optional"
+versionRange = "[${required_waystones_version},)"