Dev

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Java CI - Build on Push
 
 on:
   push:
-    branches: [ main, dev, "1.*" ]
+    branches: [ main, dev, "1.**" ]
   workflow_dispatch:
     inputs:
       skip_maven_publish:

CHANGELOG.md

@@ -4,6 +4,34 @@ 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).
 
+## [2111.1.0]
+
+### Changed
+
+## [2101.1.13]
+
+### Added
+* An API `CustomMinYEvent` event to register custom `min-y` providers
+
+### Removed
+* Remove the previously added support for custom min-y per chunk scanning. This does not effect the global min-y already available
+
+## [2101.1.12]
+
+### Added
+* Added support for a user defined minimum `y` level to start the surface block scanning from. This allows the scanning to start from a `y` level other than the worlds lowest point.
+
+## [2101.1.11]
+
+### Added
+* Translation keys may now be used as waypoint text; the translated text will be shown where applicable
+  * Primarily useful for adding localized waypoints via command or API
+
+### Changed
+* Moved a lot of entity face icon loading code into FTB Library
+  * No player-visible changes here
+  * This release requires FTB Library 2101.1.21+
+
 ## [2101.1.10]
 
 ### Added
@@ -298,7 +326,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   * Periodically, least-recently accessed region data is released from RAM, requiring reload from disk on the next access. Every 300 seconds by default; can be tuned in client config.
   * When the large map screen is closed, regions furthest from the player are released from RAM, down to 32 loaded regions by default; also tunable in client config.
   * Map zoom-out is limited where the ratio of the number of known (explored) regions to available JVM memory is poor. Limiting zoom-out reduces the number of regions which need to be loaded in memory at a given moment. This can be disabled in client config if you prefer.
-  * New client config settings are available in the "Memory Usage" section of the client config; tuning them is a trade-off between RAM usage and disk activity. However, even when tuned toward lower RAM usage, the level of disk activity should not be a major concern. 
+  * New client config settings are available in the "Memory Usage" section of the client config; tuning them is a trade-off between RAM usage and disk activity. However, even when tuned toward lower RAM usage, the level of disk activity should not be a major concern.
 
 ## [1902.3.20]
 
@@ -319,7 +347,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Fixed
 * Fixed a crash with fake player mods which use buckets to pick up water in protected chunks
 * Fixed interaction with Fabric mods which do block placement protection by firing the FAPI block break event directly (thanks @TelepathicGrunt)
-  * Example mod: Bumblezone 
+  * Example mod: Bumblezone
   * Architectury currently handles this via its own mixin
 
 
@@ -415,7 +443,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   * This means player heads will only be visible to team-mates and allies by default; if you're not in a party team but want to be visible on the map, set your "Location Visibility" to "Public" in team settings.
 * Player heads can now be tracked on the map at any range, not just inside the default entity tracking range
   * The same visibility restrictions apply as above, via "Location Visibility"
-  * Added server-side config item `long_range_tracker_interval` which controls how frequently long-range tracking data is sent by the server to clients; default is every 20 ticks (for players who are moving). 
+  * Added server-side config item `long_range_tracker_interval` which controls how frequently long-range tracking data is sent by the server to clients; default is every 20 ticks (for players who are moving).
   * Set this to 0 to disable long-tracking entirely
   * Be careful about setting this to very low (non-zero) values; it can cause extra server and network load, especially on very busy servers
 * Added entity interaction protection as a Team setting

build.gradle

@@ -1,7 +1,7 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
-	id "me.modmuss50.mod-publish-plugin" version "0.5.1"
+	id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
+	id "me.modmuss50.mod-publish-plugin" version "1.1.0"
 }
 
 apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/changelog.gradle'
@@ -62,6 +62,12 @@ allprojects {
 				includeGroup "dev.ftb.mods"
 			}
 		}
+        maven {
+            url = "https://cursemaven.com"
+            content {
+                includeGroup "curse.maven"
+            }
+        }
 	}
 
 	java {

common/src/main/java/dev/ftb/mods/ftbchunks/CustomMinYRegistryImpl.java

@@ -0,0 +1,35 @@
+package dev.ftb.mods.ftbchunks;
+
+import dev.ftb.mods.ftbchunks.api.LevelMinYCalculator;
+import dev.ftb.mods.ftbchunks.api.event.CustomMinYEvent;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+
+import java.util.List;
+import java.util.OptionalInt;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+public class CustomMinYRegistryImpl implements CustomMinYEvent.CustomMinYRegistry {
+    private static final CustomMinYRegistryImpl serverInstance = new CustomMinYRegistryImpl();
+    private static final CustomMinYRegistryImpl clientInstance = new CustomMinYRegistryImpl();
+
+    private final List<LevelMinYCalculator> calculators = new CopyOnWriteArrayList<>();  // needs to be threadsafe
+
+    public static CustomMinYRegistryImpl getInstance(boolean isClientSide) {
+        return isClientSide ? clientInstance : serverInstance;
+    }
+
+    public void register(LevelMinYCalculator calculator) {
+        calculators.add(calculator);
+    }
+
+    public int getMinYAt(Level level, BlockPos pos) {
+        for (var calc : calculators) {
+            OptionalInt h = calc.getLevelMinY(level, pos);
+            if (h.isPresent()) {
+                return h.getAsInt();
+            }
+        }
+        return level.getMinY();
+    }
+}

common/src/main/java/dev/ftb/mods/ftbchunks/EntityTypeBoolMapValue.java

@@ -1,97 +1,58 @@
 package dev.ftb.mods.ftbchunks;
 
 import com.mojang.logging.LogUtils;
+import com.mojang.serialization.Codec;
 import dev.ftb.mods.ftbchunks.client.gui.EntityIconSettingsScreen;
-import dev.ftb.mods.ftblibrary.config.ConfigCallback;
-import dev.ftb.mods.ftblibrary.config.ConfigGroup;
-import dev.ftb.mods.ftblibrary.config.ConfigValue;
-import dev.ftb.mods.ftblibrary.snbt.SNBTCompoundTag;
-import dev.ftb.mods.ftblibrary.snbt.config.BaseValue;
-import dev.ftb.mods.ftblibrary.snbt.config.SNBTConfig;
-import dev.ftb.mods.ftblibrary.ui.Widget;
-import dev.ftb.mods.ftblibrary.ui.input.MouseButton;
-import net.minecraft.ResourceLocationException;
+import dev.ftb.mods.ftblibrary.client.config.ConfigCallback;
+import dev.ftb.mods.ftblibrary.client.config.EditableConfigGroup;
+import dev.ftb.mods.ftblibrary.client.config.editable.EditableConfigValue;
+import dev.ftb.mods.ftblibrary.client.gui.input.MouseButton;
+import dev.ftb.mods.ftblibrary.client.gui.widget.Widget;
+import dev.ftb.mods.ftblibrary.config.value.AbstractMapValue;
+import dev.ftb.mods.ftblibrary.config.value.Config;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.EntityType;
-import org.jetbrains.annotations.Nullable;
+import org.apache.commons.lang3.mutable.MutableInt;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 
-import java.util.HashMap;
 import java.util.Map;
 
-public class EntityTypeBoolMapValue extends BaseValue<Map<ResourceKey<EntityType<?>>, Boolean>> {
-
+public class EntityTypeBoolMapValue extends AbstractMapValue<Boolean> {
     private static final Logger LOGGER = LogUtils.getLogger();
 
-    public EntityTypeBoolMapValue(@Nullable SNBTConfig c, String n, Map<ResourceKey<EntityType<?>>, Boolean> def) {
-        super(c, n, def);
-        super.set(new HashMap<>(def));
-    }
-
-    @Override
-    public void write(SNBTCompoundTag tag) {
-        Map<ResourceKey<EntityType<?>>, Boolean> map = get();
-        SNBTCompoundTag mapTag = new SNBTCompoundTag();
-
-        for (Map.Entry<ResourceKey<EntityType<?>>, Boolean> entry : map.entrySet()) {
-            mapTag.putBoolean(entry.getKey().location().toString(), entry.getValue());
-        }
-
-        tag.put(key, mapTag);
-    }
-
-    @Override
-    public void read(SNBTCompoundTag tag) {
-        Map<ResourceKey<EntityType<?>>, Boolean> map = new HashMap<>();
-
-        SNBTCompoundTag compound = tag.getCompound(key);
-        for (String key : compound.getAllKeys()) {
-            try {
-                ResourceLocation parse = ResourceLocation.parse(key);
-                map.put(ResourceKey.create(Registries.ENTITY_TYPE, parse), compound.getBoolean(key));
-            } catch (ResourceLocationException e) {
-                LOGGER.error("Failed to parse {} skipping", key, e);
-            }
-        }
-
-        set(map);
+    public EntityTypeBoolMapValue(Config parent, String key, Map<String, Boolean> defaultValue) {
+        super(parent, key, defaultValue, Codec.BOOL);
     }
 
     @Override
-    public void createClientConfig(ConfigGroup group) {
-        group.add(key, new EntityTypeBoolMapConfigValue(), get(), stringBooleanMap -> {
-        }, defaultValue);
+    protected @Nullable EditableConfigValue<?> fillClientConfig(EditableConfigGroup group) {
+        return group.add(key, new EntityTypeBoolMapConfigValue(), get(), stringBooleanMap -> {}, defaultValue);
     }
 
-    public static class EntityTypeBoolMapConfigValue extends ConfigValue<Map<ResourceKey<EntityType<?>>, Boolean>> {
-
+    public static class EntityTypeBoolMapConfigValue extends EditableConfigValue<Map<String, Boolean>> {
         @Override
         public void onClicked(Widget clickedWidget, MouseButton button, ConfigCallback callback) {
             new EntityIconSettingsScreen(false).openGui();
         }
 
         @Override
-        public Component getStringForGUI(@Nullable Map<ResourceKey<EntityType<?>>, Boolean> v) {
-            if (v == null) {
-                return super.getStringForGUI(null);
-            }
-            int enabled = 0;
-            int disabled = 0;
-            for (ResourceKey<EntityType<?>> entityTypeResourceKey : v.keySet()) {
-                EntityType<?> entityType = BuiltInRegistries.ENTITY_TYPE.get(entityTypeResourceKey);
-                if (entityType != null) {
+        public Component getStringForGUI(Map<String, Boolean> v) {
+            MutableInt enabled = new MutableInt();
+            MutableInt disabled = new MutableInt();
+            for (String entityTypeResourceKey : v.keySet()) {
+                BuiltInRegistries.ENTITY_TYPE.get(ResourceKey.create(Registries.ENTITY_TYPE, Identifier.parse(entityTypeResourceKey))).ifPresent(holder -> {
                     if (v.get(entityTypeResourceKey)) {
-                        enabled++;
+                        enabled.increment();
                     } else {
-                        disabled++;
+                        disabled.increment();
                     }
-                }
+                });
             }
-            return Component.translatable("ftbchunks.gui.enabled_disabled_count", enabled, disabled);
+            return Component.translatable("ftbchunks.gui.enabled_disabled_count", enabled.get(), disabled.get());
         }
     }
 

common/src/main/java/dev/ftb/mods/ftbchunks/FTBCUtils.java

@@ -13,7 +13,6 @@ public static boolean isRail(Block block) {
 		throw new AssertionError();
 	}
 
-
 	/**
 	 * Used after various events have been cancelled server-side; client may already have updated the held item for the
 	 * player, but it needs to be brought back in sync with the server.
@@ -24,7 +23,7 @@ public static boolean isRail(Block block) {
 	public static void forceHeldItemSync(ServerPlayer sp, InteractionHand hand) {
 		if (sp.connection != null) {
 			switch (hand) {
-				case MAIN_HAND -> sp.connection.send(new ClientboundContainerSetSlotPacket(-2, 0, sp.getInventory().selected, sp.getItemInHand(hand)));
+				case MAIN_HAND -> sp.connection.send(new ClientboundContainerSetSlotPacket(-2, 0, sp.getInventory().getSelectedSlot(), sp.getItemInHand(hand)));
 				case OFF_HAND -> sp.connection.send(new ClientboundContainerSetSlotPacket(-2, 0, Inventory.SLOT_OFFHAND, sp.getItemInHand(hand)));
 			}
 		}