diff --git a/src/main/java/org/maxgamer/QuickShop/QuickShop.java b/src/main/java/org/maxgamer/QuickShop/QuickShop.java index daa6267..0da3ffb 100644 --- a/src/main/java/org/maxgamer/QuickShop/QuickShop.java +++ b/src/main/java/org/maxgamer/QuickShop/QuickShop.java @@ -229,7 +229,7 @@ public class QuickShop extends JavaPlugin { fm.then("suggest").suggest("qs help"); fm.toJSONString(); getLogger().info("魔改库功能测试正常..."); - } catch (final Exception e) { + } catch (final NoClassDefFoundError | NoSuchMethodError | Exception e) { getLogger().info("启动魔改库失败 部分功能将被禁用..."); } diff --git a/src/main/resources/item.yml b/src/main/resources/item.yml index 093bfa5..4e4ab47 100644 --- a/src/main/resources/item.yml +++ b/src/main/resources/item.yml @@ -1,4 +1,4 @@ -Version: 1.2 +Version: 1.3 AIR_-1: 爪子 AIR: 爪子 @@ -103,6 +103,21 @@ DIODE_BLOCK_OFF: DIODE_BLOCK_OFF DIODE_BLOCK_ON: DIODE_BLOCK_ON LOCKED_CHEST: 上锁的箱子 STAINED_GLASS: 白色染色玻璃 +STAINED_GLASS_1: 橙色染色玻璃 +STAINED_GLASS_2: 品红色染色玻璃 +STAINED_GLASS_3: 淡蓝色染色玻璃 +STAINED_GLASS_4: 黄色染色玻璃 +STAINED_GLASS_5: 黄绿色染色玻璃 +STAINED_GLASS_6: 粉红色染色玻璃 +STAINED_GLASS_7: 灰色染色玻璃 +STAINED_GLASS_8: 淡灰色染色玻璃 +STAINED_GLASS_9: 青色染色玻璃 +STAINED_GLASS_10: 紫色染色玻璃 +STAINED_GLASS_11: 蓝色染色玻璃 +STAINED_GLASS_12: 棕色染色玻璃 +STAINED_GLASS_13: 绿色染色玻璃 +STAINED_GLASS_14: 红色染色玻璃 +STAINED_GLASS_15: 黑色染色玻璃 TRAP_DOOR: 活板门 MONSTER_EGGS: 石头刷怪蛋 SMOOTH_BRICK: 石砖 @@ -167,13 +182,58 @@ QUARTZ_STAIRS: 石英楼梯 ACTIVATOR_RAIL: 激活铁轨 DROPPER: 掉落物 STAINED_CLAY: 白色染色粘土 +STAINED_CLAY_1: 橙色染色粘土 +STAINED_CLAY_2: 品红色染色粘土 +STAINED_CLAY_3: 淡蓝色染色粘土 +STAINED_CLAY_4: 黄色染色粘土 +STAINED_CLAY_5: 黄绿色染色粘土 +STAINED_CLAY_6: 粉红色染色粘土 +STAINED_CLAY_7: 灰色染色粘土 +STAINED_CLAY_8: 淡灰色染色粘土 +STAINED_CLAY_9: 青色染色粘土 +STAINED_CLAY_10: 紫色染色粘土 +STAINED_CLAY_11: 蓝色染色粘土 +STAINED_CLAY_12: 棕色染色粘土 +STAINED_CLAY_13: 绿色染色粘土 +STAINED_CLAY_14: 红色染色粘土 +STAINED_CLAY_15: 黑色染色粘土 STAINED_GLASS_PANE: 白色染色玻璃板 +STAINED_GLASS_PANE_1: 橙色染色玻璃板 +STAINED_GLASS_PANE_2: 品红色染色玻璃板 +STAINED_GLASS_PANE_3: 淡蓝色染色玻璃板 +STAINED_GLASS_PANE_4: 黄色染色玻璃板 +STAINED_GLASS_PANE_5: 黄绿色染色玻璃板 +STAINED_GLASS_PANE_6: 粉红色染色玻璃板 +STAINED_GLASS_PANE_7: 灰色染色玻璃板 +STAINED_GLASS_PANE_8: 淡灰色染色玻璃板 +STAINED_GLASS_PANE_9: 青色染色玻璃板 +STAINED_GLASS_PANE_10: 紫色染色玻璃板 +STAINED_GLASS_PANE_11: 蓝色染色玻璃板 +STAINED_GLASS_PANE_12: 棕色染色玻璃板 +STAINED_GLASS_PANE_13: 绿色染色玻璃板 +STAINED_GLASS_PANE_14: 红色染色玻璃板 +STAINED_GLASS_PANE_15: 黑色染色玻璃板 LEAVES_2: 合金欢树叶 LOG_2: 合金欢木 ACACIA_STAIRS: 合金欢楼梯 DARK_OAK_STAIRS: 深色橡木楼梯 HAY_BLOCK: 干草快 CARPET: 白色地毯 +CARPET_1: 橙色地毯 +CARPET_2: 品红色地毯 +CARPET_3: 淡蓝色地毯 +CARPET_4: 黄色地毯 +CARPET_5: 黄绿色地毯 +CARPET_6: 粉红色地毯 +CARPET_7: 灰色地毯 +CARPET_8: 淡灰色地毯 +CARPET_9: 青色地毯 +CARPET_10: 紫色地毯 +CARPET_11: 蓝色地毯 +CARPET_12: 棕色地毯 +CARPET_13: 绿色地毯 +CARPET_14: 红色地毯 +CARPET_15: 黑色地毯 HARD_CLAY: 硬化粘土 COAL_BLOCK: 煤炭快 PACKED_ICE: 浮冰 @@ -274,6 +334,21 @@ GLOWSTONE_DUST: 萤石粉 RAW_FISH: 生鱼 COOKED_FISH: 熟鱼 INK_SACK: 墨囊 +INK_SACK_1: 玫瑰红 +INK_SACK_2: 仙人掌绿 +INK_SACK_3: 可可豆 +INK_SACK_4: 青金石 +INK_SACK_5: 紫色染料 +INK_SACK_6: 青色染料 +INK_SACK_7: 淡灰色染料 +INK_SACK_8: 灰色染料 +INK_SACK_9: 粉色染料 +INK_SACK_10: 黄绿色染料 +INK_SACK_11: 蒲公英黄染料 +INK_SACK_12: 淡蓝色染料 +INK_SACK_13: 品红色染料 +INK_SACK_14: 橙色染料 +INK_SACK_15: 骨粉 BONE: 骨粉 SUGAR: 糖 CAKE: 蛋糕 @@ -303,8 +378,6 @@ BLAZE_POWDER: 烈焰粉 MAGMA_CREAM: 岩浆膏 BREWING_STAND_ITEM: 酿造台 CAULDRON_ITEM: 炼药锅 -BREWING_STAND: 酿造台 -CAULDRON: 炼药锅 EYE_OF_ENDER: 末影之眼 SPECKLED_MELON: 闪烁的西瓜 MONSTER_EGG: 刷怪蛋 @@ -320,7 +393,7 @@ POTATO_ITEM: 马铃薯 BAKED_POTATO: 烤马铃薯 POISONOUS_POTATO: 毒马铃薯 EMPTY_MAP: 空地图 -GOLDEN_CARROT: 金萝卜 +GOLDEN_CARROT: 金萝卜 SKULL_ITEM: 头颅 CARROT_STICK: 胡萝卜 NETHER_STAR: 下界之星