feat: v2.3.3

DomiIRL · DomiIRL · commit 6fccd14d1c6c · 2025-05-24T16:49:25.000+02:00
diff --git a/mongo-connector/pom.xml b/mongo-connector/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.codingarea.challenges</groupId>
         <artifactId>root</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
     </parent>
 
     <artifactId>mongo-connector</artifactId>
diff --git a/mongo-connector/src/main/resources/plugin.yml b/mongo-connector/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Challenges-MongoConnector
-version: 2.3.2
+version: 2.3.3
 api-version: 1.14
 author: CodingArea
 authors:
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.codingarea.challenges</groupId>
         <artifactId>root</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
     </parent>
 
     <artifactId>plugin</artifactId>
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/Challenges.java b/plugin/src/main/java/net/codingarea/challenges/plugin/Challenges.java
@@ -24,6 +24,7 @@
 import net.codingarea.challenges.plugin.utils.bukkit.command.ForwardingCommand;
 
 import javax.annotation.Nonnull;
+import java.io.File;
 
 /**
  * @author anweisen | https://github.com/anweisen
@@ -218,5 +219,4 @@ protected void handleDisable() {
 			challengeManager.clearChallengeCache();
 		}
 	}
-
 }
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/ConsumeItemTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/ConsumeItemTrigger.java
@@ -22,7 +22,7 @@ public ConsumeItemTrigger(String name) {
 		super(name, SubSettingsBuilder.createChooseMultipleItem(SubSettingsHelper.ITEM).fill(builder -> {
 			for (Material material : ExperimentalUtils.getMaterials()) {
 				if (material.isEdible()) {
-					builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemName(material).toPlainText()).build());
+					builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemComponent(material).toPlainText()).build());
 				}
 			}
 		}));
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceItemChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceItemChallenge.java
@@ -1,5 +1,6 @@
 package net.codingarea.challenges.plugin.challenges.implementation.challenge.force;
 
+import net.codingarea.challenges.plugin.utils.bukkit.misc.BukkitStringUtils;
 import net.codingarea.challenges.plugin.utils.item.ItemUtils;
 import net.anweisen.utilities.common.annotations.Since;
 import net.anweisen.utilities.common.config.Document;
@@ -78,7 +79,7 @@ protected BiConsumer<BossBarInstance, Player> setupBossbar() {
 
 			bossbar.setColor(BarColor.GREEN);
 			bossbar.setProgress(getProgress());
-			bossbar.setTitle(Message.forName("bossbar-force-item-instruction").asComponent(item, ChallengeAPI.formatTime(getSecondsLeftUntilNextActivation())));
+			bossbar.setTitle(Message.forName("bossbar-force-item-instruction").asComponent(BukkitStringUtils.getServerSideItemComponent(item), ChallengeAPI.formatTime(getSecondsLeftUntilNextActivation())));
 		};
 	}
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectAllItemsGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectAllItemsGoal.java
@@ -1,6 +1,7 @@
 package net.codingarea.challenges.plugin.challenges.implementation.goal;
 
 import net.anweisen.utilities.bukkit.utils.animation.SoundSample;
+import net.codingarea.challenges.plugin.utils.bukkit.misc.BukkitStringUtils;
 import net.codingarea.challenges.plugin.utils.item.ItemUtils;
 import net.anweisen.utilities.common.annotations.Since;
 import net.anweisen.utilities.common.collection.SeededRandomWrapper;
@@ -84,8 +85,8 @@ protected void onEnable() {
 				bossbar.setTitle(Message.forName("bossbar-all-items-finished").asString());
 				return;
 			}
-      
-			bossbar.setTitle(Message.forName("bossbar-all-items-current-max").asComponent(currentItem, totalItemsCount - itemsToFind.size() + 1, totalItemsCount));
+
+			bossbar.setTitle(Message.forName("bossbar-all-items-current-max").asComponent(BukkitStringUtils.getServerSideItemComponent(currentItem), totalItemsCount - itemsToFind.size() + 1, totalItemsCount));
 		});
 		bossbar.show();
 	}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/BlockTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/BlockTarget.java
@@ -41,7 +41,7 @@ public Object toMessage() {
 
     @Override
     public String getName() {
-        return BukkitStringUtils.getItemName(target).toPlainText();
+        return BukkitStringUtils.getItemComponent(target).toPlainText();
     }
 
     @Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ItemTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ItemTarget.java
@@ -41,7 +41,7 @@ public Object toMessage() {
 
     @Override
     public String getName() {
-        return BukkitStringUtils.getItemName(target).toPlainText();
+        return BukkitStringUtils.getServerSideItemComponent(target).toPlainText();
     }
 
     @Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/SubSettingsHelper.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/SubSettingsHelper.java
@@ -61,7 +61,7 @@ public static ChooseMultipleItemSubSettingBuilder createBlockSettingsBuilder() {
 			builder.addSetting(ANY, new ItemBuilder(Material.NETHER_STAR, Message.forName("item-custom-setting-block-any")).build());
 			for (Material material : ExperimentalUtils.getMaterials()) {
 				if (material.isBlock() && material.isItem() && !BukkitReflectionUtils.isAir(material)) {
-					builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemName(material).toPlainText()).build());
+					builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemComponent(material).toPlainText()).build());
 				}
 			}
 		});
@@ -72,7 +72,7 @@ public static ChooseMultipleItemSubSettingBuilder createItemSettingsBuilder() {
 			builder.addSetting(ANY, new ItemBuilder(Material.NETHER_STAR, Message.forName("item-custom-setting-item-any")).build());
 			for (Material material : ExperimentalUtils.getMaterials()) {
 				if (material.isItem() && !BukkitReflectionUtils.isAir(material)) {
-					builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemName(material).toPlainText()).build());
+					builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemComponent(material).toPlainText()).build());
 				}
 			}
 		});
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/InfoMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/InfoMenuGenerator.java
@@ -133,7 +133,7 @@ public void updateItems() {
 
 		// Display Item
 		inventory.setItem(MATERIAL_SLOT, new ItemBuilder(material == null ? Material.BARRIER : material, Message.forName("item-custom-info-material"))
-				.appendLore(currently + (material != null ? BukkitStringUtils.getItemName(material).toPlainText() : none)).build());
+				.appendLore(currently + (material != null ? BukkitStringUtils.getItemComponent(material).toPlainText() : none)).build());
 
 		// Name Item
 		inventory.setItem(NAME_SLOT, new ItemBuilder(Material.NAME_TAG, Message.forName("item-custom-info-name"))
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/PlayerConnectionListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/PlayerConnectionListener.java
@@ -1,6 +1,9 @@
 package net.codingarea.challenges.plugin.spigot.listener;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.UUID;
 import javax.annotation.Nonnull;
 import net.anweisen.utilities.common.config.Document;
 import net.codingarea.challenges.plugin.ChallengeAPI;
@@ -32,6 +35,10 @@ public class PlayerConnectionListener implements Listener {
 	private final boolean resetOnLastQuit;
 	private final boolean pauseOnLastQuit;
 	private final boolean restoreDefaultsOnLastQuit;
+	private final boolean permissionInfo;
+
+	private final Set<UUID> playersJoinedAlready = new HashSet<>();
+	boolean playerWithPermissionJoinedBefore = false;
 
 	public PlayerConnectionListener() {
 		Document config = Challenges.getInstance().getConfigDocument();
@@ -41,6 +48,7 @@ public PlayerConnectionListener() {
 		resetOnLastQuit = config.getBoolean("reset-on-last-leave");
 		pauseOnLastQuit = config.getBoolean("pause-on-last-leave");
 		restoreDefaultsOnLastQuit = config.getBoolean("restore-defaults-on-last-leave");
+		permissionInfo = config.getBoolean("permission-info");
 	}
 
 	@EventHandler(priority = EventPriority.HIGH)
@@ -53,18 +61,31 @@ public void onJoin(@Nonnull PlayerJoinEvent event) {
 			MinecraftNameWrapper.ENTITY_EFFECT, 17, 1, 2);
 		Challenges.getInstance().getScoreboardManager().handleJoin(player);
 
-		if (player.hasPermission("challenges.gui")) {
+		if (!playersJoinedAlready.contains(player.getUniqueId())) {
+			playersJoinedAlready.add(player.getUniqueId());
 			if (Challenges.getInstance().isFirstInstall()) {
 				player.sendMessage("");
 				player.sendMessage(Prefix.CHALLENGES + "§7Thanks for downloading §e§lChallenges§7!");
 				player.sendMessage(Prefix.CHALLENGES + "§7You can change the language in the §econfig.yml");
 				player.sendMessage(Prefix.CHALLENGES + "§7For more join our discord §ediscord.gg/74Ay5zF");
+				player.sendMessage("");
 			}
+		}
 
-			if (timerPausedInfo && !startTimerOnJoin && ChallengeAPI.isPaused()) {
+		if (!player.hasPermission("challenges.gui")) {
+			if (permissionInfo && !playerWithPermissionJoinedBefore) {
+				player.sendMessage("");
+				player.sendMessage(Prefix.CHALLENGES + "§7To configure the settings you need operator permissions. Type '§e/op " + player.getName() + "§7' in the console.");
 				player.sendMessage("");
-				Message.forName("timer-paused-message").send(player, Prefix.CHALLENGES);
 			}
+		} else {
+			playerWithPermissionJoinedBefore = true;
+		}
+
+		if (timerPausedInfo && !startTimerOnJoin && ChallengeAPI.isPaused()) {
+			player.sendMessage("");
+			Message.forName("timer-paused-message").send(player, Prefix.CHALLENGES);
+			player.sendMessage("");
 		}
 
 		if (Challenges.getInstance().getStatsManager().isNoStatsAfterCheating() && Challenges.getInstance().getServerManager().hasCheated()) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java
@@ -182,17 +182,34 @@ public static Object[] replaceArguments(Object[] args, boolean toStrings) {
 		return args;
 	}
 
-	public static TranslatableComponent getItemName(@Nonnull Material material) {
+	private static TranslatableComponent getItemName(@Nonnull Material material) {
 		NamespacedKey key = material.getKey();
 		return new TranslatableComponent((material.isBlock() ? "block" : "item") + "." + key.getNamespace() + "." + key.getKey());
 	}
 
-	public static @Nullable BaseComponent getMusicDiscName(@Nonnull Material material) {
+	private static @Nullable BaseComponent getMusicDiscName(@Nonnull Material material) {
 		if (!material.name().startsWith("MUSIC_DISC")) return null;
 		String key = "item.minecraft." + material.name().toLowerCase() + ".desc";
 		return new TranslatableComponent(key);
 	}
 
+	public static @Nullable BaseComponent getSmithingTemplateName(@Nonnull Material material) {
+		if (!material.name().contains("SMITHING_TEMPLATE")) {
+			return null;
+		}
+
+		String name = material.name().toLowerCase();
+		if (name.contains("armor_trim")) {
+			String pattern = name.replace("_armor_trim_smithing_template", "");
+			return new TranslatableComponent("trim_pattern.minecraft." + pattern);
+		} else if (name.contains("upgrade")) {
+			String type = name.replace("_upgrade_smithing_template", "");
+			return new TranslatableComponent("upgrade.minecraft." + type + "_upgrade");
+		}
+
+		return null;
+	}
+
 	public static BaseComponent getItemComponent(@Nonnull Material material) {
 		BaseComponent component = getItemName(material);
 		BaseComponent musicDiscName = getMusicDiscName(material);
@@ -204,6 +221,16 @@ public static BaseComponent getItemComponent(@Nonnull Material material) {
 		return component;
 	}
 
+	public static BaseComponent getServerSideItemComponent(@Nonnull Material material) {
+		BaseComponent component = getItemComponent(material);
+		BaseComponent smithingTemplateName = getSmithingTemplateName(material);
+		if (smithingTemplateName != null) {
+			component.addExtra(" (");
+			component.addExtra(smithingTemplateName);
+			component.addExtra(")");
+		}
+		return component;
+	}
 
 	public static TranslatableComponent getEntityName(@Nonnull EntityType type) {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemUtils.java
@@ -2,6 +2,7 @@
 
 import net.anweisen.utilities.bukkit.utils.misc.BukkitReflectionUtils;
 import net.anweisen.utilities.bukkit.utils.misc.MinecraftVersion;
+import net.anweisen.utilities.common.version.VersionInfo;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Damageable;
@@ -24,11 +25,10 @@ public static Material convertFoodToCookedFood(@Nonnull Material material) {
         }
     }
 
-    public static boolean isObtainableInSurvival(@Nonnull Material material) {
+    public static boolean isMaterialObtainable(@Nonnull Material material) {
         String name = material.name();
         if (BukkitReflectionUtils.isAir(material)) return false;
         if (name.endsWith("_SPAWN_EGG")) return false;
-        if (name.startsWith("INFESTED_")) return false;
         if (name.startsWith("LEGACY_")) return false; // Legacy items should not be obtainable
         switch (name) { // Use name instead of enum its self, to prevent NoSuchFieldErrors in older versions where this specific enum does not exist
             case "CHAIN_COMMAND_BLOCK":
@@ -58,12 +58,14 @@ public static boolean isObtainableInSurvival(@Nonnull Material material) {
             case "PLAYER_HEAD":
             case "GLOBE_BANNER_PATTERN":
             case "SPAWNER":
+            case "VAULT":
             case "AMETHYST_CLUSTER":
             case "BUDDING_AMETHYST":
             case "POWDER_SNOW":
             case "LIGHT":
             case "BUNDLE":
             case "REINFORCED_DEEPSLATE":
+            case "TEST":
             case "FROGSPAWN":
                 return false;
         }
@@ -74,36 +76,24 @@ public static boolean isObtainableInSurvival(@Nonnull Material material) {
             }
         }
 
+        if (MinecraftVersion.current().isNewerOrEqualThan(new VersionInfo(1, 21, 2))) {
+            if (name.contains("BUNDLE")) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean isObtainableInSurvival(@Nonnull Material material) {
+        if (!isMaterialObtainable(material)) return false;
+        if (material.name().startsWith("INFESTED_")) return false;
         return true;
     }
 
     public static boolean blockIsAvailableInSurvival(@Nonnull Material material) {
+        if (!isMaterialObtainable(material)) return false;
         if (!material.isBlock()) return false;
-        String name = material.name();
-        if (BukkitReflectionUtils.isAir(material)) return false;
-        if (name.startsWith("LEGACY_")) return false; // Legacy items should not be obtainable
-        switch (name) { // Use name instead of enum its self, to prevent NoSuchFieldErrors in older versions where this specific enum does not exist
-            case "CHAIN_COMMAND_BLOCK":
-            case "REPEATING_COMMAND_BLOCK":
-            case "COMMAND_BLOCK":
-            case "COMMAND_BLOCK_MINECART":
-            case "JIGSAW":
-            case "STRUCTURE_BLOCK":
-            case "STRUCTURE_VOID":
-            case "BARRIER":
-            case "KNOWLEDGE_BOOK":
-            case "DEBUG_STICK":
-            case "END_PORTAL":
-            case "NETHER_PORTAL":
-            case "END_GATEWAY":
-            case "PETRIFIED_OAK_SLAB":
-            case "PLAYER_HEAD":
-            case "GLOBE_BANNER_PATTERN":
-            case "LIGHT":
-            case "BUNDLE":
-                return false;
-        }
-
         return true;
     }
 
diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml
@@ -22,7 +22,7 @@
 # The config-version is even with the version of the default config.
 # You will be notified, when this version is older than the of the default in the plugin jar.
 # We recommend regenerating the config to get access to new features / settings.
-config-version: "2.2.0"
+config-version: "2.3.3"
 
 # Currently supported by default
 # - en (English)
@@ -81,6 +81,9 @@ design:
 # These can be edited in the corresponding language file
 join-quit-messages: true
 
+# Send players a permission info message when they join the server when noone with the permission 'challenges.gui' has joined before
+permission-info: true
+
 # Players with the permission 'challenges.gui' will get a message if the timer is paused when they join
 timer-is-paused-info: true
 
diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Challenges
-version: 2.3.2
+version: 2.3.3
 author: CodingArea
 authors:
   - anweisen
@@ -224,4 +224,4 @@ commands:
     description: "Disable damage for a player"
     permission: "challenges.godmode"
     aliases:
-      - "god"
+      - "god"
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.codingarea.challenges</groupId>
     <artifactId>root</artifactId>
-    <version>2.3.2</version>
+    <version>2.3.3</version>
     <packaging>pom</packaging>
     <name>root</name>
     <url>https://github.com/anweisen/Challenges</url>

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`import net.codingarea.challenges.plugin.utils.bukkit.command.ForwardingCommand;`
`25`	`25`
`26`	`26`	`import javax.annotation.Nonnull;`
	`27`	`+import java.io.File;`
`27`	`28`
`28`	`29`	`/**`
`29`	`30`	`* @author anweisen \| https://github.com/anweisen`
`@@ -218,5 +219,4 @@ protected void handleDisable() {`
`218`	`219`	`challengeManager.clearChallengeCache();`
`219`	`220`	`}`
`220`	`221`	`}`
`221`		`-`
`222`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public ConsumeItemTrigger(String name) {`
`22`	`22`	`super(name, SubSettingsBuilder.createChooseMultipleItem(SubSettingsHelper.ITEM).fill(builder -> {`
`23`	`23`	`for (Material material : ExperimentalUtils.getMaterials()) {`
`24`	`24`	`if (material.isEdible()) {`
`25`		`- builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemName(material).toPlainText()).build());`
	`25`	`+ builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemComponent(material).toPlainText()).build());`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}));`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public Object toMessage() {`
`41`	`41`
`42`	`42`	`@Override`
`43`	`43`	`public String getName() {`
`44`		`- return BukkitStringUtils.getItemName(target).toPlainText();`
	`44`	`+ return BukkitStringUtils.getItemComponent(target).toPlainText();`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static ChooseMultipleItemSubSettingBuilder createBlockSettingsBuilder() {`
`61`	`61`	`builder.addSetting(ANY, new ItemBuilder(Material.NETHER_STAR, Message.forName("item-custom-setting-block-any")).build());`
`62`	`62`	`for (Material material : ExperimentalUtils.getMaterials()) {`
`63`	`63`	`if (material.isBlock() && material.isItem() && !BukkitReflectionUtils.isAir(material)) {`
`64`		`- builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemName(material).toPlainText()).build());`
	`64`	`+ builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemComponent(material).toPlainText()).build());`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`});`
`@@ -72,7 +72,7 @@ public static ChooseMultipleItemSubSettingBuilder createItemSettingsBuilder() {`
`72`	`72`	`builder.addSetting(ANY, new ItemBuilder(Material.NETHER_STAR, Message.forName("item-custom-setting-item-any")).build());`
`73`	`73`	`for (Material material : ExperimentalUtils.getMaterials()) {`
`74`	`74`	`if (material.isItem() && !BukkitReflectionUtils.isAir(material)) {`
`75`		`- builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemName(material).toPlainText()).build());`
	`75`	`+ builder.addSetting(material.name(), new ItemBuilder(material, DefaultItem.getItemPrefix() + BukkitStringUtils.getItemComponent(material).toPlainText()).build());`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`});`