Merge pull request #1 from RIB-Lab/dev

2.0準備

build.gradle

@@ -44,6 +44,7 @@ dependencies {
     compileOnly 'com.comphenix.protocol:ProtocolLib:5.1.0'
     implementation 'dev.triumphteam:triumph-gui:3.1.4'
     compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.9'
+    implementation 'com.elmakers.mine.bukkit:EffectLib:9.4'
     implementation(fileTree(dir: 'libs', include: ['mobchip-bukkit-*.jar']))
     compileOnly(fileTree(dir: 'libs', include: ['UltimateAdvancementAPI-*.jar']))
 

run/plugins/TradeCore/items/misc.yml

@@ -19,7 +19,7 @@ walking_stick:
 
 map_stoneroom:
   mods:
-    dungeonmap: '"STONE_ROOM"'
+    dungeonmap: '"stoneroom"'
   material: STONE_BRICKS
   name: 石の部屋のマップ
   model: 0

run/plugins/TradeCore/items/weapons.yml

@@ -51,4 +51,13 @@ basic_bow:
     defaultmaxdurability: '"IRONAGE"'
   material: BOW
   name: 普通の弓
+  model: 0
+
+basic_wand:
+  mods:
+    defaultattackdamage: '{"baseDamage":2.0,"spread":"WOOD"}'
+    weaponattribute: '"WAND"'
+    defaultmaxdurability: '"IRONAGE"'
+  material: STICK
+  name: 普通の杖
   model: 0

run/plugins/TradeCore/loot-tables/general.yml

@@ -0,0 +1,136 @@
+GRASS:
+  materialset: grasses
+  harvestlevel: 0
+  dropchancelevel:
+    pebble: 0.2
+    drygrass: 1.0
+  tooltype: HAND
+
+LEAVES:
+  materialset: leaves
+  harvestlevel: 0
+  dropchancelevel:
+    stick: 0.2
+  tooltype: AXE
+
+LEAVES2:
+  materialset: leaves
+  harvestlevel: 1
+  dropchancelevel:
+    stick: 0.1
+  tooltype: AXE
+
+LOGS:
+  materialset: logs
+  harvestlevel: 1
+  dropchancelevel:
+    bark: 0.4
+    round_trunk: 0.2
+    twig: 0.8
+  tooltype: AXE
+
+LOGS2:
+  materialset: logs
+  harvestlevel: 2
+  dropchancelevel:
+    round_trunk: 0.2
+  tooltype: AXE
+
+LOGS3:
+  materialset: logs
+  harvestlevel: 3
+  dropchancelevel:
+    round_trunk: 0.1
+  tooltype: AXE
+
+DIRTS:
+  materialset: dirts
+  harvestlevel: 0
+  dropchancelevel:
+    dust: 0.2
+    mud: 0.1
+  tooltype: SHOVEL
+
+DIRTS2:
+  materialset: dirts
+  harvestlevel: 1
+  dropchancelevel:
+    dust: 0.1
+    mud: 0.05
+  tooltype: SHOVEL
+
+PRIMITIVE_STONES:
+  materialset: primitive_stones
+  harvestlevel: 0
+  dropchancelevel:
+    widestone: 0.2
+    tallstone: 0.2
+  tooltype: PICKAXE
+
+PRIMITIVE_STONES2:
+  materialset: primitive_stones
+  harvestlevel: 1
+  dropchancelevel:
+    round_stone: 0.1
+  tooltype: PICKAXE
+
+PRIMITIVE_PLANKS:
+  materialset: primitive_stones
+  harvestlevel: 2
+  dropchancelevel:
+    woodpulp: 1.0
+  tooltype: AXE
+
+MOSS:
+  materialset: farmland
+  harvestlevel: 0
+  dropchancelevel:
+    moss: 0.2
+    drygrass: 1.0
+  tooltype: HOE
+
+MOSS2:
+  materialset: farmland
+  harvestlevel: 0
+  dropchancelevel:
+    moss: 0.1
+    drygrass: 0.5
+  tooltype: HOE
+
+ANDESITE:
+  materialset: andesite
+  harvestlevel: 1
+  dropchancelevel:
+    andesite_stone: 0.2
+  tooltype: PICKAXE
+
+GRANITE:
+  materialset: granite
+  harvestlevel: 1
+  dropchancelevel:
+    granite_stone: 0.2
+  tooltype: PICKAXE
+
+DIORITE:
+  materialset: diorite
+  harvestlevel: 1
+  dropchancelevel:
+    diorite_stone: 0.2
+  tooltype: PICKAXE
+
+GRAVEL:
+  materialset: gravel
+  harvestlevel: 1
+  dropchancelevel:
+    gravel_dust: 0.2
+    meteoric_iron_ore: 0.02
+    flint: 0.02
+  tooltype: SHOVEL
+
+SAND:
+  materialset: sand
+  harvestlevel: 1
+  dropchancelevel:
+    sandgold: 0.02
+    sand_dust: 0.2
+  tooltype: SHOVEL

run/plugins/TradeCore/material-sets/forloottable.yml

@@ -0,0 +1,69 @@
+dirts:
+  - DIRT_PATH
+  - ROOTED_DIRT
+  - PODZOL
+  - DIRT
+  - COARSE_DIRT
+  - GRASS_BLOCK
+
+primitive_stones:
+  - COBBLESTONE_SLAB
+  - COBBLESTONE
+  - STONE
+  - STONE_SLAB
+
+logs:
+  - DARK_OAK_LOG
+  - ACACIA_LOG
+  - BIRCH_LOG
+  - JUNGLE_LOG
+  - OAK_LOG
+  - MANGROVE_LOG
+  - SPRUCE_LOG
+  - CHERRY_LOG
+
+primitive_planks:
+  - BAMBOO_PLANKS
+  - ACACIA_PLANKS
+  - JUNGLE_PLANKS
+  - SPRUCE_PLANKS
+  - OAK_PLANKS
+  - DARK_OAK_PLANKS
+  - CRIMSON_PLANKS
+  - CHERRY_PLANKS
+  - BIRCH_PLANKS
+  - MANGROVE_PLANKS
+
+leaves:
+  - ACACIA_LEAVES
+  - CHERRY_LEAVES
+  - DARK_OAK_LEAVES
+  - FLOWERING_AZALEA_LEAVES
+  - SPRUCE_LEAVES
+  - AZALEA_LEAVES
+  - MANGROVE_LEAVES
+  - OAK_LEAVES
+  - JUNGLE_LEAVES
+  - BIRCH_LEAVES
+
+grasses:
+  - GRASS
+  - TALL_GRASS
+
+farmland:
+  - FARMLAND
+
+andesite:
+  - ANDESITE
+
+granite:
+  - GRANITE
+
+diorite:
+  - DIORITE
+
+gravel:
+  - GRAVEL
+
+sand:
+  - SAND

run/plugins/TradeCore/material-sets/general.yml

@@ -0,0 +1,89 @@
+unbreakable:
+  - BARRIER
+  - END_PORTAL_FRAME
+  - NETHER_PORTAL
+  - LIGHT
+  - STRUCTURE_BLOCK
+  - END_PORTAL
+  - BEDROCK
+  - COMMAND_BLOCK
+  - REPEATING_COMMAND_BLOCK
+  - CHAIN_COMMAND_BLOCK
+
+transparent:
+  - WATER
+  - LAVA
+  - AIR
+
+banned_from_shop:
+  - COAL_ORE
+  - RED_SHULKER_BOX
+  - BLAST_FURNACE
+  - CARTOGRAPHY_TABLE
+  - PURPLE_SHULKER_BOX
+  - DIAMOND_ORE
+  - CHEST
+  - IRON_ORE
+  - ANCIENT_DEBRIS
+  - CAULDRON
+  - BLUE_SHULKER_BOX
+  - MAGENTA_SHULKER_BOX
+  - SMITHING_TABLE
+  - ENCHANTING_TABLE
+  - COMPOSTER
+  - SMOKER
+  - FLETCHING_TABLE
+  - DEEPSLATE_EMERALD_ORE
+  - SHULKER_BOX
+  - YELLOW_SHULKER_BOX
+  - LIGHT_BLUE_SHULKER_BOX
+  - BLACK_SHULKER_BOX
+  - DEEPSLATE_COPPER_ORE
+  - GRAY_SHULKER_BOX
+  - ENDER_CHEST
+  - REPEATER
+  - CRAFTING_TABLE
+  - DEEPSLATE_GOLD_ORE
+  - LAPIS_ORE
+  - STRUCTURE_VOID
+  - BREWING_STAND
+  - WHITE_SHULKER_BOX
+  - DEEPSLATE_LAPIS_ORE
+  - BARREL
+  - FURNACE
+  - STONECUTTER
+  - DEEPSLATE_DIAMOND_ORE
+  - BEACON
+  - PINK_SHULKER_BOX
+  - JIGSAW
+  - NETHER_GOLD_ORE
+  - SPAWNER
+  - LADDER
+  - ORANGE_SHULKER_BOX
+  - TORCH
+  - GREEN_SHULKER_BOX
+  - CYAN_SHULKER_BOX
+  - DRAGON_EGG
+  - DEEPSLATE_IRON_ORE
+  - REDSTONE_ORE
+  - DEEPSLATE_REDSTONE_ORE
+  - DISPENSER
+  - CAKE
+  - EMERALD_ORE
+  - GRINDSTONE
+  - TNT
+  - NETHER_QUARTZ_ORE
+  - DEEPSLATE_COAL_ORE
+  - OBSERVER
+  - COMPARATOR
+  - PISTON
+  - HOPPER
+  - TRAPPED_CHEST
+  - DROPPER
+  - LIME_SHULKER_BOX
+  - STICKY_PISTON
+  - BROWN_SHULKER_BOX
+  - LIGHT_GRAY_SHULKER_BOX
+  - GOLD_ORE
+  - LOOM
+  - COPPER_ORE