Merge pull request Sefiraat#158 from balugaq/master

fix
LobbyTech-MC · Nov 2, 2024 · 16ed09e · 16ed09e
2 parents 7854723 + 11e61c5
commit 16ed09e
Show file tree

Hide file tree

Showing 8 changed files with 3,116 additions and 3,126 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ytdd9527.networksexpansion</groupId>
     <artifactId>NetworksExpansion</artifactId>
-    <version>2.1-Alpha-2</version>
+    <version>2.1-Alpha-3</version>
 
     <distributionManagement>
         <repository>

diff --git a/src/main/java/com/balugaq/netex/api/helpers/ItemStackHelper.java b/src/main/java/com/balugaq/netex/api/helpers/ItemStackHelper.java
@@ -37,6 +37,6 @@ public static String getName(@Nonnull ItemStack item) {
     private static String getPlayerSkullName(@Nonnull ItemStack skull) {
         Preconditions.checkArgument(skull != null, "物品不能为空");
         SkullMeta meta = (SkullMeta) skull.getItemMeta();
-        return meta != null && meta.hasOwner() ? String.format(LanguageHelper.getLangOrKey("block.minecraft.player_head.named"), meta.getOwningPlayer().getName()) : LanguageHelper.getLangOrKey("block.minecraft.player_head");
+        return meta != null && meta.hasOwner() ? String.format(LanguageHelper.getLangOrKey("block_minecraft_player_head_named"), meta.getOwningPlayer().getName()) : LanguageHelper.getLangOrKey("block.minecraft.player_head");
     }
 }
diff --git a/src/main/java/com/balugaq/netex/api/helpers/LanguageHelper.java b/src/main/java/com/balugaq/netex/api/helpers/LanguageHelper.java
@@ -21,14 +21,6 @@ public final class LanguageHelper {
     private static final Gson GSON = new Gson();
     private static Map<String, String> lang = new HashMap<>();
 
-    static {
-        String lang = Networks.getConfigManager().getLanguage();
-        InputStream stream = Networks.getInstance().getResource("mc_lang_" + lang + ".json");
-        if (stream != null) {
-            loadFromStream(stream);
-        }
-    }
-
     public static void loadFromStream(@Nonnull InputStream stream) {
         Preconditions.checkArgument(stream != null, "输入流不能为空");
         BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8));

diff --git a/src/main/java/com/balugaq/netex/api/helpers/MaterialHelper.java b/src/main/java/com/balugaq/netex/api/helpers/MaterialHelper.java
@@ -18,7 +18,7 @@ public static String getName(@Nonnull Material mat) {
     public static String getKey(@Nonnull Material mat) {
         Preconditions.checkArgument(mat != null, "材料不能为空");
         String type = mat.isBlock() ? "block" : "item";
-        return type + "." + mat.getKey().getNamespace() + "." + mat.getKey().getKey();
+        return type + "_" + mat.getKey().getNamespace() + "_" + mat.getKey().getKey();
     }
 
     @Nonnull

diff --git a/src/main/java/com/ytdd9527/networksexpansion/core/listener/NetworksGuideListener.java b/src/main/java/com/ytdd9527/networksexpansion/core/listener/NetworksGuideListener.java
@@ -23,10 +23,6 @@ public class NetworksGuideListener implements Listener {
     public void onInteract(PlayerRightClickEvent e) {
         ItemStack item = e.getItem();
         if (item != null && item.getType() != Material.AIR) {
-            if (!e.getPlayer().isOp()) {
-                return;
-            }
-
             if (Objects.equals(ItemStackHelper.getDisplayName(item), ExpansionItemStacks.NETWORKS_EXPANSION_SURVIVAL_GUIDE.getDisplayName())) {
                 NetworksExpansionGuideOpenEvent event = new NetworksExpansionGuideOpenEvent(e.getPlayer(), SlimefunGuideMode.SURVIVAL_MODE);
                 Bukkit.getPluginManager().callEvent(event);

diff --git a/src/main/java/com/ytdd9527/networksexpansion/implementation/tools/ItemMover.java b/src/main/java/com/ytdd9527/networksexpansion/implementation/tools/ItemMover.java
@@ -399,7 +399,7 @@ private static void tryDepositIntoMover(Player player, ItemStack mover, Location
         String name = ItemStackHelper.getDisplayName(fetched);
         depositItem(mover, fetched);
         int after = fetched.getAmount();
-        player.sendMessage(Networks.getLocalizationService().getString("messages.completed-operation.item_mover.deposit_success", name, before - after));
+        player.sendMessage(String.format(Networks.getLocalizationService().getString("messages.completed-operation.item_mover.deposit_success"), name, before - after));
         updateLore(mover);
     }
 
@@ -426,10 +426,11 @@ private static void tryWithdrawFromMover(Player player, ItemStack mover, Locatio
 
         ItemStack clone = StackUtils.getAsQuantity(storedItemStack, storedAmount);
         String name = ItemStackHelper.getDisplayName(clone);
+        int before = clone.getAmount();
         barrel.depositItemStack(clone);
         int after = clone.getAmount();
         setStoredAmount(mover, clone.getAmount());
-        player.sendMessage(Networks.getLocalizationService().getString("messages.completed-operation.item_mover.withdraw_success", name, after));
+        player.sendMessage(String.format(Networks.getLocalizationService().getString("messages.completed-operation.item_mover.withdraw_success"), name, before - after));
         updateLore(mover);
     }
 

diff --git a/src/main/java/io/github/sefiraat/networks/Networks.java b/src/main/java/io/github/sefiraat/networks/Networks.java
@@ -36,6 +36,7 @@
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.yaml.snakeyaml.error.YAMLException;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -118,14 +119,14 @@ public static long getSlimefunTickCount() {
     public void onEnable() {
         instance = this;
 
-        getLogger().info("loading language");
+        getLogger().info("Loading language");
         this.configManager = new ConfigManager();
         localizationService = new LocalizationService(this);
         String language = configManager.getLanguage();
         try {
             localizationService.addLanguage(language);
             getLogger().info("Language " + language + " loaded successfully.");
-        } catch (Exception e) {
+        } catch (ClassCastException | IllegalArgumentException | YAMLException e) {
             getLogger().log(Level.WARNING, "Failed to load language " + language, e);
         }