From 9e6f341d77873e62eb90dc3e6e8383fd9ea50019 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 06:30:37 -0400 Subject: [PATCH] Fix biome collection bug and add spawn GUI tooltip --- .../java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java | 1 + src/main/java/noppes/npcs/scripted/NpcAPI.java | 2 +- src/main/resources/assets/customnpcs/lang/en_US.lang | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java index ca5b7fe9e..aba615c0e 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java @@ -66,6 +66,7 @@ public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, I addButton(new GuiNpcButton(4, guiLeft + 90, y - 5, 50, 20, "selectServer.edit")); addSlider(new GuiNpcSlider(this, 5, guiLeft + 4, y += 17, 180, 20, (float) this.spawn.itemWeight / 100)); + addExtra(new GuiHoverText(1, "spawning.naturalInfo", guiLeft + 188, y + 5)); this.spawnEntryScroll.guiLeft = guiLeft + 4; this.spawnEntryScroll.guiTop = y + 40; diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index d19c809bf..deadb8b6d 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -281,7 +281,7 @@ public class NpcAPI extends AbstractNpcAPI { List biomes = new ArrayList<>(); Set allBiomes = new HashSet(); for (Type type : BiomeDictionary.Type.values()) { - allBiomes.addAll(BiomeDictionary.getBiomesForType(type)); + Collections.addAll(allBiomes, BiomeDictionary.getBiomesForType(type)); } for (BiomeGenBase base : BiomeGenBase.getBiomeGenArray()) { if (base != null) diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index 92f6c1c8e..ad733fa6b 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -405,6 +405,7 @@ spawning.liquidSpawning=Spawns in Liquid spawning.airSpawning=Spawns in Air spawning.minHeight=Minimum Height spawning.maxHeight=Maximum Height +spawning.naturalInfo=Add at least one spawn entry and configure spawn options for the NPC to spawn naturally role.name=Role role.none=No Role