diff --git a/.github/pull.yml b/.github/pull.yml index 33bbdc0..4bc4d41 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -5,6 +5,7 @@ rules: mergeMethod: merge assignees: - ybw0014 + - haiman233 conflictReviewers: - ybw0014 diff --git a/src/main/java/dev/sefiraat/netheopoiesis/implementation/Stacks.java b/src/main/java/dev/sefiraat/netheopoiesis/implementation/Stacks.java index 4b6ffbb..0bbb4bb 100644 --- a/src/main/java/dev/sefiraat/netheopoiesis/implementation/Stacks.java +++ b/src/main/java/dev/sefiraat/netheopoiesis/implementation/Stacks.java @@ -113,12 +113,12 @@ private Stacks() { "NPS_MIXING_QUARTZ_1", Material.QUARTZ, Theme.TOOL, - "Mixing Quartz", - "Drop 3 Netheo Paste on the ground", - "and right click with this mixing", - "quartz to form a Netheo Ball", - "The type and flavour depends on the", - "pastes dropped." + "混合石英", + "在地上丢出3种下界浆糊,", + "手持混合石英右键点击", + "将它们混合成为下界丸子.", + "丸子的类型与风味值取决于", + "下界浆糊的类型." ); public static final SlimefunItemStack ENDER_CAKE = Theme.themedSlimefunItemStack( diff --git a/src/main/java/dev/sefiraat/netheopoiesis/implementation/groups/TradesFlexGroup.java b/src/main/java/dev/sefiraat/netheopoiesis/implementation/groups/TradesFlexGroup.java index f177883..93b2fb8 100644 --- a/src/main/java/dev/sefiraat/netheopoiesis/implementation/groups/TradesFlexGroup.java +++ b/src/main/java/dev/sefiraat/netheopoiesis/implementation/groups/TradesFlexGroup.java @@ -14,8 +14,10 @@ import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; +import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; +import org.bukkit.Sound; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -55,12 +57,12 @@ public class TradesFlexGroup extends FlexItemGroup { private static final ItemStack TRADE_ITEM_INFO = new CustomItemStack( Material.LIGHT_BLUE_STAINED_GLASS_PANE, - Theme.PASSIVE + "The Item Given to the Trader" + Theme.PASSIVE + "你提供的物品" ); private static final ItemStack DROPPED_ITEM_INFO = new CustomItemStack( Material.LIGHT_BLUE_STAINED_GLASS_PANE, - Theme.PASSIVE + "The Item you receive" + Theme.PASSIVE + "你获得的物品" ); private static final ItemStack HELD_SLOT = new CustomItemStack( @@ -115,12 +117,16 @@ private void setupPage(Player player, PlayerProfile profile, SlimefunGuideMode m reapplyFooter(player, profile, mode, menu, page, totalPages); + // Sound + menu.addMenuOpeningHandler((p) -> p.playSound(p.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.0F, 1.0F)); + // Back menu.replaceExistingItem( GUIDE_BACK, ChestMenuUtils.getBackButton( player, - Slimefun.getLocalization().getMessage("guide.back.guide") + "", + ChatColor.GRAY + Slimefun.getLocalization().getMessage(player, "guide.back.guide") ) ); menu.addMenuClickHandler(GUIDE_BACK, (player1, slot, itemStack, clickAction) -> { @@ -161,16 +167,21 @@ private void displayDetail(Player p, int returnPage, Trade trade ) { - // Back Button + // Sound + p.playSound(p.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.0F, 1.0F); + + // Back menu.replaceExistingItem( GUIDE_BACK, ChestMenuUtils.getBackButton( p, - Slimefun.getLocalization().getMessage("guide.back.guide") + "", + ChatColor.GRAY + Slimefun.getLocalization().getMessage(p, "guide.back.guide") ) ); menu.addMenuClickHandler(GUIDE_BACK, (player1, slot, itemStack, clickAction) -> { setupPage(player1, profile, mode, menu, returnPage); + p.playSound(p.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.0F, 1.0F); return false; }); diff --git a/src/main/java/dev/sefiraat/netheopoiesis/implementation/tools/MixingQuartz.java b/src/main/java/dev/sefiraat/netheopoiesis/implementation/tools/MixingQuartz.java index 3bb761a..bc56e1c 100644 --- a/src/main/java/dev/sefiraat/netheopoiesis/implementation/tools/MixingQuartz.java +++ b/src/main/java/dev/sefiraat/netheopoiesis/implementation/tools/MixingQuartz.java @@ -35,7 +35,7 @@ public class MixingQuartz extends LimitedUseItem { private static final NamespacedKey KEY = Keys.newKey("uses"); - private static final Pattern LORE_FLAVOUR = Pattern.compile(Theme.CLICK_INFO + "Flavour: [0-9]+"); + private static final Pattern LORE_FLAVOUR = Pattern.compile(Theme.CLICK_INFO + "风味值: [0-9]+"); public MixingQuartz(ItemGroup group, SlimefunItemStack item, @@ -100,7 +100,7 @@ private void onUse(@Nonnull PlayerRightClickEvent event) { for (int i = 0; i < lore.size(); i++) { final String string = lore.get(i); if (LORE_FLAVOUR.matcher(string).matches()) { - lore.set(i, Theme.CLICK_INFO.asTitle("Flavour", volume)); + lore.set(i, Theme.CLICK_INFO.asTitle("风味值", volume)); } } // Set meta and drop item diff --git a/src/main/java/dev/sefiraat/netheopoiesis/managers/ConfigManager.java b/src/main/java/dev/sefiraat/netheopoiesis/managers/ConfigManager.java index 22e1575..7528c4c 100644 --- a/src/main/java/dev/sefiraat/netheopoiesis/managers/ConfigManager.java +++ b/src/main/java/dev/sefiraat/netheopoiesis/managers/ConfigManager.java @@ -82,7 +82,7 @@ private FileConfiguration getConfig(@Nonnull String fileName) { } public void saveAll() { - Netheopoiesis.getInstance().getLogger().info("Netheopoiesis saving data."); + Netheopoiesis.getInstance().getLogger().info("正在保存下界乌托邦数据."); saveDiscoveries(); } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index cbfa8ac..c01c590 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,5 +1,8 @@ +# 开启自动更新 auto-update: true +# 开启调试 debug-messages: false +# 生物生成 spawning: player-cap-water-ambient: 15 player-cap-water-animal: 5 @@ -10,6 +13,7 @@ spawning: player-cap-villager: 5 player-cap-piglin-trader: 1 player-cap-wandering-trader: 1 +# 速率 speed: speed-multiplier-crux-spread: 1 speed-crystalline-crux-spread: 1