diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java index 3d32f683c..90d500e4a 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java @@ -177,12 +177,9 @@ public class BukkitFurniture extends Furniture { // 获取掉落物的位置,受到家具变种的影响 public Location getDropLocation() { - Optional dropOffset = this.getCurrentVariant().dropOffset(); - if (dropOffset.isEmpty()) { - return this.location; - } + Vector3f dropOffset = this.getCurrentVariant().dropOffset(); Quaternionf conjugated = QuaternionUtils.toQuaternionf(0, Math.toRadians(180 - this.location.getYaw()), 0).conjugate(); - Vector3f offset = conjugated.transform(new Vector3f(dropOffset.get())); + Vector3f offset = conjugated.transform(new Vector3f(dropOffset)); return new Location(this.location.getWorld(), this.location.getX() + offset.x, this.location.getY() + offset.y, this.location.getZ() - offset.z); } diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java index d487d1517..1edcb1308 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java @@ -845,7 +845,7 @@ public class BukkitServerPlayer extends Player { } } } catch (Throwable e) { - plugin.logger().warn("Failed to set attribute for player " + platformPlayer().getName(), e); + this.plugin.logger().warn("Failed to set attribute for player " + platformPlayer().getName(), e); } } diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/amethyst_torch.yml b/common-files/src/main/resources/resources/default/configuration/blocks/amethyst_torch.yml index a30d8cbac..1362aaa15 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/amethyst_torch.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/amethyst_torch.yml @@ -1,7 +1,7 @@ items: default:amethyst_torch: data: - item-name: + item-name: texture: minecraft:block/custom/amethyst_torch behavior: - type: wall_block_item @@ -12,7 +12,7 @@ items: block: default:amethyst_wall_torch default:amethyst_standing_torch: data: - item-name: + item-name: model: type: minecraft:model path: minecraft:block/custom/amethyst_torch @@ -22,7 +22,7 @@ items: torch: minecraft:block/custom/amethyst_torch default:amethyst_wall_torch: data: - item-name: + item-name: model: type: minecraft:model path: minecraft:block/custom/amethyst_wall_torch diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/chessboard_block.yml b/common-files/src/main/resources/resources/default/configuration/blocks/chessboard_block.yml index 5176765db..843136fe8 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/chessboard_block.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/chessboard_block.yml @@ -2,7 +2,7 @@ items: default:chessboard_block: material: nether_brick data: - item-name: + item-name: model: minecraft:block/custom/chessboard_block behavior: type: block_item diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/chinese_lantern.yml b/common-files/src/main/resources/resources/default/configuration/blocks/chinese_lantern.yml index 78a90a395..43eff67ed 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/chinese_lantern.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/chinese_lantern.yml @@ -2,7 +2,7 @@ items: default:chinese_lantern: material: nether_brick data: - item-name: + item-name: model: minecraft:block/custom/chinese_lantern behavior: type: block_item diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/copper_coil.yml b/common-files/src/main/resources/resources/default/configuration/blocks/copper_coil.yml index 2697254d2..18bb15742 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/copper_coil.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/copper_coil.yml @@ -2,7 +2,7 @@ items: default:copper_coil: material: nether_brick data: - item-name: + item-name: model: minecraft:block/custom/copper_coil behavior: type: block_item diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/ender_pearl_flower.yml b/common-files/src/main/resources/resources/default/configuration/blocks/ender_pearl_flower.yml index 2d5b218de..3add5dd25 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/ender_pearl_flower.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/ender_pearl_flower.yml @@ -2,7 +2,7 @@ items: default:ender_pearl_flower_seeds: material: nether_brick data: - item-name: + item-name: texture: minecraft:item/custom/ender_pearl_flower_seeds behavior: type: block_item diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/fairy_flower.yml b/common-files/src/main/resources/resources/default/configuration/blocks/fairy_flower.yml index 99c970515..0bc9edff7 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/fairy_flower.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/fairy_flower.yml @@ -2,7 +2,7 @@ items: default:fairy_flower: material: nether_brick data: - item-name: + item-name: texture: minecraft:item/custom/fairy_flower behavior: type: block_item diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/flame_cane.yml b/common-files/src/main/resources/resources/default/configuration/blocks/flame_cane.yml index 8b1e352ae..cbb0b024b 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/flame_cane.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/flame_cane.yml @@ -2,7 +2,7 @@ items: default:flame_cane: material: nether_brick data: - item-name: + item-name: texture: minecraft:item/custom/flame_cane behavior: type: block_item diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/gunpowder_block.yml b/common-files/src/main/resources/resources/default/configuration/blocks/gunpowder_block.yml index 0f55e56b9..0225ad100 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/gunpowder_block.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/gunpowder_block.yml @@ -2,7 +2,7 @@ items: default:gunpowder_block: material: nether_brick data: - item-name: + item-name: model: minecraft:block/custom/gunpowder_block behavior: type: block_item @@ -33,7 +33,7 @@ items: default:solid_gunpowder_block: material: nether_brick data: - item-name: + item-name: model: type: minecraft:model path: minecraft:item/custom/solid_gunpowder_block diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/hami_melon.yml b/common-files/src/main/resources/resources/default/configuration/blocks/hami_melon.yml index d4e657c49..c11153c78 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/hami_melon.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/hami_melon.yml @@ -3,7 +3,7 @@ items: material: melon_slice texture: minecraft:item/custom/hami_melon_slice data: - item-name: + item-name: $$>=1.20.5: food: nutrition: 2 @@ -17,7 +17,7 @@ items: default:hami_melon: material: nether_brick data: - item-name: + item-name: model: minecraft:block/custom/hami_melon behavior: type: block_item @@ -25,7 +25,7 @@ items: default:hami_melon_seeds: material: nether_brick data: - item-name: + item-name: texture: minecraft:item/custom/hami_melon_seeds behavior: type: block_item diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/magma_plant.yml b/common-files/src/main/resources/resources/default/configuration/blocks/magma_plant.yml index 7e5ed5a14..e2ddcc93c 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/magma_plant.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/magma_plant.yml @@ -3,7 +3,7 @@ items: material: carrot texture: minecraft:item/custom/magma_fruit data: - item-name: + item-name: $$>=1.20.5: food: nutrition: 3 diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/netherite_anvil.yml b/common-files/src/main/resources/resources/default/configuration/blocks/netherite_anvil.yml index 5e8e68c3e..34aa36b1d 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/netherite_anvil.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/netherite_anvil.yml @@ -1,7 +1,7 @@ items: default:netherite_anvil: data: - item-name: + item-name: model: minecraft:block/custom/netherite_anvil behavior: type: block_item diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml b/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml index b10df0501..1c7d55309 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml @@ -8,7 +8,7 @@ items: - minecraft:logs - minecraft:logs_that_burn data: - item-name: + item-name: model: minecraft:block/custom/palm_log behavior: type: block_item @@ -36,7 +36,7 @@ items: - minecraft:logs - minecraft:logs_that_burn data: - item-name: + item-name: model: minecraft:block/custom/stripped_palm_log behavior: type: block_item @@ -61,7 +61,7 @@ items: - minecraft:logs - minecraft:logs_that_burn data: - item-name: + item-name: model: minecraft:block/custom/palm_wood behavior: type: block_item @@ -89,7 +89,7 @@ items: - minecraft:logs - minecraft:logs_that_burn data: - item-name: + item-name: model: minecraft:block/custom/stripped_palm_wood behavior: type: block_item @@ -113,7 +113,7 @@ items: - minecraft:planks - minecraft:wooden_tool_materials data: - item-name: + item-name: model: minecraft:block/custom/palm_planks behavior: type: block_item @@ -133,7 +133,7 @@ items: settings: fuel-time: 100 data: - item-name: + item-name: lore: - "Requires the datapack tree configuration to function." - "If not configured, an oak tree will grow by default." @@ -173,7 +173,7 @@ items: default:palm_leaves: material: oak_leaves data: - item-name: + item-name: block-state: default:palm_leaves[persistent=true,waterlogged=false,distance=7] model: type: minecraft:model @@ -203,7 +203,7 @@ items: default:palm_trapdoor: material: nether_brick data: - item-name: + item-name: settings: fuel-time: 300 model: minecraft:block/custom/palm_trapdoor_bottom @@ -253,7 +253,7 @@ items: default:palm_door: material: nether_brick data: - item-name: + item-name: settings: fuel-time: 200 texture: minecraft:item/custom/palm_door @@ -324,7 +324,7 @@ items: default:palm_fence_gate: material: nether_brick data: - item-name: + item-name: settings: fuel-time: 300 model: minecraft:block/custom/palm_fence_gate @@ -376,7 +376,7 @@ items: default:palm_slab: material: nether_brick data: - item-name: + item-name: settings: fuel-time: 150 model: minecraft:block/custom/palm_slab @@ -419,7 +419,7 @@ items: material: nether_brick model: minecraft:block/custom/palm_stairs data: - item-name: + item-name: settings: fuel-time: 300 behavior: @@ -464,7 +464,7 @@ items: material: nether_brick model: minecraft:block/custom/palm_pressure_plate data: - item-name: + item-name: settings: fuel-time: 300 behavior: @@ -512,7 +512,7 @@ items: items#fence: default:palm_fence: material: nether_brick - data::item-name: + data::item-name: model: type: minecraft:model path: minecraft:item/custom/palm_fence_inventory @@ -525,7 +525,7 @@ items#fence: block: default:palm_fence default:palm_fence_post: material: nether_brick - data::item-name: + data::item-name: model: type: minecraft:model path: minecraft:block/custom/palm_fence_post @@ -535,7 +535,7 @@ items#fence: texture: minecraft:block/custom/palm_planks default:palm_fence_side: material: nether_brick - data::item-name: + data::item-name: model: type: minecraft:model path: minecraft:block/custom/palm_fence_side @@ -586,7 +586,7 @@ items#button: textures: texture: minecraft:block/custom/palm_planks data: - item-name: + item-name: settings: fuel-time: 100 behavior: @@ -594,7 +594,7 @@ items#button: block: default:palm_button default:palm_button_pressed: material: nether_brick - data::item-name: + data::item-name: model: type: minecraft:model path: minecraft:block/custom/palm_button_pressed @@ -604,7 +604,7 @@ items#button: texture: minecraft:block/custom/palm_planks default:palm_button_not_pressed: material: nether_brick - data::item-name: + data::item-name: model: type: minecraft:model path: minecraft:block/custom/palm_button_not_pressed diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/pebble.yml b/common-files/src/main/resources/resources/default/configuration/blocks/pebble.yml index 3710447a7..704af41d1 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/pebble.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/pebble.yml @@ -2,7 +2,7 @@ items: default:pebble: material: nether_brick data: - item-name: + item-name: texture: minecraft:item/custom/pebble behavior: - type: block_item diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/reed.yml b/common-files/src/main/resources/resources/default/configuration/blocks/reed.yml index 0fab82454..f577a1d6f 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/reed.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/reed.yml @@ -2,7 +2,7 @@ items: default:reed: material: nether_brick data: - item-name: + item-name: texture: minecraft:item/custom/reed behavior: type: liquid_collision_block_item diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/safe_block.yml b/common-files/src/main/resources/resources/default/configuration/blocks/safe_block.yml index 21514d055..1a635c582 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/safe_block.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/safe_block.yml @@ -2,7 +2,7 @@ items: default:safe_block: material: nether_brick data: - item-name: + item-name: model: minecraft:block/custom/safe_block behavior: type: block_item diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml b/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml index bdd8f8131..8b198cf7f 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/sofa.yml @@ -2,7 +2,7 @@ items: default:sleeper_sofa: material: nether_brick data: - item-name: + item-name: model: minecraft:item/custom/sleeper_sofa behavior: type: block_item @@ -46,7 +46,7 @@ items: default:sofa: material: nether_brick data: - item-name: + item-name: model: type: minecraft:model path: minecraft:item/custom/sofa diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/table_lamp.yml b/common-files/src/main/resources/resources/default/configuration/blocks/table_lamp.yml index 6623e00b7..4015210e6 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/table_lamp.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/table_lamp.yml @@ -2,7 +2,7 @@ items: default:table_lamp: material: nether_brick data: - item-name: + item-name: model: minecraft:item/custom/table_lamp behavior: type: block_item @@ -101,6 +101,8 @@ items: luminance: 15 default:table_lamp_on: material: nether_brick + data: + item-name: model: type: minecraft:model path: minecraft:item/custom/table_lamp_on diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/topaz_ore.yml b/common-files/src/main/resources/resources/default/configuration/blocks/topaz_ore.yml index 2435ae04e..198ab0528 100644 --- a/common-files/src/main/resources/resources/default/configuration/blocks/topaz_ore.yml +++ b/common-files/src/main/resources/resources/default/configuration/blocks/topaz_ore.yml @@ -2,7 +2,7 @@ items: default:topaz_ore: material: nether_brick data: - item-name: + item-name: model: minecraft:block/custom/topaz_ore behavior: type: block_item @@ -10,7 +10,7 @@ items: default:deepslate_topaz_ore: material: nether_brick data: - item-name: + item-name: model: minecraft:block/custom/deepslate_topaz_ore behavior: type: block_item @@ -23,7 +23,7 @@ items: - '#default:topaz_tools' percent: 0.25 data: - item-name: <#FF8C00> + item-name: <#FF8C00> texture: minecraft:item/custom/topaz blocks: default:topaz_ore: diff --git a/common-files/src/main/resources/resources/default/configuration/categories.yml b/common-files/src/main/resources/resources/default/configuration/categories.yml index 2f9c69cb6..da717eef1 100644 --- a/common-files/src/main/resources/resources/default/configuration/categories.yml +++ b/common-files/src/main/resources/resources/default/configuration/categories.yml @@ -84,4 +84,5 @@ categories: - default:hami_melon_seeds - default:hami_melon_slice - default:hami_melon - - default:magma_fruit \ No newline at end of file + - default:magma_fruit + - default:globe \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/furniture/bench.yml b/common-files/src/main/resources/resources/default/configuration/furniture/bench.yml index 595ed0f67..7414c0860 100644 --- a/common-files/src/main/resources/resources/default/configuration/furniture/bench.yml +++ b/common-files/src/main/resources/resources/default/configuration/furniture/bench.yml @@ -2,7 +2,7 @@ items: default:bench: material: nether_brick data: - item-name: + item-name: model: minecraft:item/custom/bench behavior: type: furniture_item diff --git a/common-files/src/main/resources/resources/default/configuration/furniture/flower_basket.yml b/common-files/src/main/resources/resources/default/configuration/furniture/flower_basket.yml index 010629735..09470fc33 100644 --- a/common-files/src/main/resources/resources/default/configuration/furniture/flower_basket.yml +++ b/common-files/src/main/resources/resources/default/configuration/furniture/flower_basket.yml @@ -2,7 +2,7 @@ items: default:flower_basket: material: nether_brick data: - item-name: + item-name: texture: minecraft:item/custom/flower_basket_2d behavior: type: furniture_item @@ -20,15 +20,15 @@ items: default:flower_basket_ground: material: nether_brick model: minecraft:item/custom/flower_basket_ground - data::item-name: + data::item-name: default:flower_basket_wall: material: nether_brick model: minecraft:item/custom/flower_basket_wall - data::item-name: + data::item-name: default:flower_basket_ceiling: material: nether_brick model: minecraft:item/custom/flower_basket_ceiling - data::item-name: + data::item-name: furniture: default:flower_basket: events: diff --git a/common-files/src/main/resources/resources/default/configuration/furniture/globe.yml b/common-files/src/main/resources/resources/default/configuration/furniture/globe.yml new file mode 100644 index 000000000..bb0f15291 --- /dev/null +++ b/common-files/src/main/resources/resources/default/configuration/furniture/globe.yml @@ -0,0 +1,46 @@ +items: + default:globe: + material: nether_brick + data: + item-name: + model: minecraft:item/custom/globe + behavior: + type: furniture_item + rules: + ground: + rotation: four + alignment: center + furniture: + settings: + item: default:globe + sounds: + break: minecraft:block.copper.break + place: minecraft:block.copper.place + variants: + ground: + loot-spawn-offset: 0,0.25,0 + elements: + - type: item + item: default:globe_earth + position: 0,0.4,0 + - type: item_display + item: default:globe_base + position: 0,0.5,0 + hitboxes: + - position: 0,0,0 + type: shulker + peek: 50 + scale: 0.8 + blocks-building: true + interactive: true + interaction-entity: true + loot: + template: default:loot_table/furniture + arguments: + item: default:bench + default:globe_earth: + data::item-name: + model: minecraft:item/custom/globe_earth + default:globe_base: + data::item-name: + model: minecraft:item/custom/globe_base \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/furniture/wooden_chair.yml b/common-files/src/main/resources/resources/default/configuration/furniture/wooden_chair.yml index 8fce322a6..863ed275a 100644 --- a/common-files/src/main/resources/resources/default/configuration/furniture/wooden_chair.yml +++ b/common-files/src/main/resources/resources/default/configuration/furniture/wooden_chair.yml @@ -2,7 +2,7 @@ items: default:wooden_chair: material: nether_brick data: - item-name: + item-name: model: minecraft:item/custom/wooden_chair behavior: type: furniture_item diff --git a/common-files/src/main/resources/resources/default/configuration/items/cap.yml b/common-files/src/main/resources/resources/default/configuration/items/cap.yml index 4f03b1dee..d3a565ad3 100644 --- a/common-files/src/main/resources/resources/default/configuration/items/cap.yml +++ b/common-files/src/main/resources/resources/default/configuration/items/cap.yml @@ -4,7 +4,7 @@ items: $$<=1.21.1: client-bound-material: leather_horse_armor data: - item-name: + item-name: unbreakable: true remove-components: - attribute_modifiers diff --git a/common-files/src/main/resources/resources/default/configuration/items/flame_elytra.yml b/common-files/src/main/resources/resources/default/configuration/items/flame_elytra.yml index 0fc952c5d..a3ec6e7de 100644 --- a/common-files/src/main/resources/resources/default/configuration/items/flame_elytra.yml +++ b/common-files/src/main/resources/resources/default/configuration/items/flame_elytra.yml @@ -8,7 +8,7 @@ items: asset-id: flame wings: flame_elytra data: - item-name: <#FF8C00> + item-name: <#FF8C00> textures: - minecraft:item/custom/flame_elytra - minecraft:item/custom/flame_elytra_broken \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/items/topaz_armor.yml b/common-files/src/main/resources/resources/default/configuration/items/topaz_armor.yml index ba9876611..977317070 100644 --- a/common-files/src/main/resources/resources/default/configuration/items/topaz_armor.yml +++ b/common-files/src/main/resources/resources/default/configuration/items/topaz_armor.yml @@ -2,7 +2,7 @@ templates: default:armor/topaz: material: chainmail_${part} data: - item-name: <#FF8C00> + item-name: <#FF8C00> tooltip-style: minecraft:topaz settings: tags: diff --git a/common-files/src/main/resources/resources/default/configuration/items/topaz_tool_weapon.yml b/common-files/src/main/resources/resources/default/configuration/items/topaz_tool_weapon.yml index 108d67358..31758de4c 100644 --- a/common-files/src/main/resources/resources/default/configuration/items/topaz_tool_weapon.yml +++ b/common-files/src/main/resources/resources/default/configuration/items/topaz_tool_weapon.yml @@ -5,7 +5,7 @@ items: tags: - default:topaz_tools data: - item-name: <#FF8C00> + item-name: <#FF8C00> tooltip-style: minecraft:topaz textures: - minecraft:item/custom/topaz_rod @@ -16,7 +16,7 @@ items: tags: - default:topaz_tools data: - item-name: <#FF8C00> + item-name: <#FF8C00> tooltip-style: minecraft:topaz textures: - minecraft:item/custom/topaz_bow @@ -29,7 +29,7 @@ items: tags: - default:topaz_tools data: - item-name: <#FF8C00> + item-name: <#FF8C00> tooltip-style: minecraft:topaz textures: - minecraft:item/custom/topaz_crossbow @@ -44,7 +44,7 @@ items: tags: - default:topaz_tools data: - item-name: <#FF8C00> + item-name: <#FF8C00> tooltip-style: minecraft:topaz max-damage: 64 texture: minecraft:item/custom/topaz_pickaxe @@ -54,7 +54,7 @@ items: tags: - default:topaz_tools data: - item-name: <#FF8C00> + item-name: <#FF8C00> tooltip-style: minecraft:topaz max-damage: 64 texture: minecraft:item/custom/topaz_axe @@ -64,7 +64,7 @@ items: tags: - default:topaz_tools data: - item-name: <#FF8C00> + item-name: <#FF8C00> tooltip-style: minecraft:topaz max-damage: 64 texture: minecraft:item/custom/topaz_hoe @@ -73,7 +73,7 @@ items: settings: tags: ["default:topaz_tools"] data: - item-name: <#FF8C00> + item-name: <#FF8C00> tooltip-style: minecraft:topaz max-damage: 64 texture: minecraft:item/custom/topaz_shovel @@ -82,7 +82,7 @@ items: settings: tags: ["default:topaz_tools"] data: - item-name: <#FF8C00> + item-name: <#FF8C00> tooltip-style: minecraft:topaz max-damage: 64 texture: minecraft:item/custom/topaz_sword @@ -99,7 +99,7 @@ items: tags: - default:topaz_tools data: - item-name: <#FF8C00> + item-name: <#FF8C00> tooltip-style: minecraft:topaz max-damage: 300 model: @@ -140,7 +140,7 @@ items: $$1.20.1~1.21.1: bow $$1.21.2~1.21.3: honey_bottle data: - item-name: <#FF8C00> + item-name: <#FF8C00> components: minecraft:max_damage: 300 $$>=1.21.2: diff --git a/common-files/src/main/resources/resources/default/configuration/translations.yml b/common-files/src/main/resources/resources/default/configuration/translations.yml index 60e1ff8df..896b73a40 100644 --- a/common-files/src/main/resources/resources/default/configuration/translations.yml +++ b/common-files/src/main/resources/resources/default/configuration/translations.yml @@ -1,60 +1,61 @@ translations: en: - item.chinese_lantern: Chinese Lantern - item.fairy_flower: Fairy Flower - item.reed: Reed - item.flame_cane: Flame Cane - item.ender_pearl_flower_seeds: Ender Pearl Flower Seeds - item.bench: Bench - item.table_lamp: Table Lamp - item.wooden_chair: Wooden Chair - item.topaz_rod: Topaz Rod - item.topaz_bow: Topaz Bow - item.topaz_crossbow: Topaz Crossbow - item.topaz_pickaxe: Topaz Pickaxe - item.topaz_axe: Topaz Axe - item.topaz_hoe: Topaz Hoe - item.topaz_shovel: Topaz Shovel - item.topaz_sword: Topaz Sword - item.topaz_helmet: Topaz Helmet - item.topaz_chestplate: Topaz Chestplate - item.topaz_leggings: Topaz Leggings - item.topaz_boots: Topaz Boots - item.topaz_trident: Topaz Trident - item.topaz_ore: Topaz Ore - item.deepslate_topaz_ore: Deepslate Topaz Ore - item.topaz: Topaz - item.palm_log: Palm Log - item.stripped_palm_log: Stripped Palm Log - item.palm_wood: Palm Wood - item.stripped_palm_wood: Stripped Palm Wood - item.palm_planks: Palm Planks - item.palm_sapling: Palm Sapling - item.palm_leaves: Palm Leaves - item.palm_trapdoor: Palm Trapdoor - item.palm_door: Palm Door - item.palm_fence_gate: Palm Fence Gate - item.palm_slab: Palm Slab - item.palm_stairs: Palm Stairs - item.palm_pressure_plate: Palm Pressure Plate - item.palm_button: Palm Button - item.palm_fence: Palm Fence - item.netherite_anvil: Netherite Anvil - item.gunpowder_block: GunPowder Block - item.solid_gunpowder_block: Solid GunPowder Block - item.copper_coil: Copper Coil - item.flame_elytra: Flame Elytra - item.pebble: Pebble - item.cap: Cap - item.flower_basket: Flower Basket - item.chessboard_block: Chessboard Block - item.safe_block: Safe Block - item.sofa: Sofa - item.amethyst_torch: Amethyst Torch - item.hami_melon_slice: Hami Melon Slice - item.hami_melon: Hami Melon - item.hami_melon_seeds: Hami Melon Seeds - item.magma_fruit: Magma Fruit + item.default.default.chinese_lantern: Chinese Lantern + item.default.fairy_flower: Fairy Flower + item.default.reed: Reed + item.default.flame_cane: Flame Cane + item.default.ender_pearl_flower_seeds: Ender Pearl Flower Seeds + item.default.bench: Bench + item.default.table_lamp: Table Lamp + item.default.wooden_chair: Wooden Chair + item.default.topaz_rod: Topaz Rod + item.default.topaz_bow: Topaz Bow + item.default.topaz_crossbow: Topaz Crossbow + item.default.topaz_pickaxe: Topaz Pickaxe + item.default.topaz_axe: Topaz Axe + item.default.topaz_hoe: Topaz Hoe + item.default.topaz_shovel: Topaz Shovel + item.default.topaz_sword: Topaz Sword + item.default.topaz_helmet: Topaz Helmet + item.default.topaz_chestplate: Topaz Chestplate + item.default.topaz_leggings: Topaz Leggings + item.default.topaz_boots: Topaz Boots + item.default.topaz_trident: Topaz Trident + item.default.topaz_ore: Topaz Ore + item.default.deepslate_topaz_ore: Deepslate Topaz Ore + item.default.topaz: Topaz + item.default.palm_log: Palm Log + item.default.stripped_palm_log: Stripped Palm Log + item.default.palm_wood: Palm Wood + item.default.stripped_palm_wood: Stripped Palm Wood + item.default.palm_planks: Palm Planks + item.default.palm_sapling: Palm Sapling + item.default.palm_leaves: Palm Leaves + item.default.palm_trapdoor: Palm Trapdoor + item.default.palm_door: Palm Door + item.default.palm_fence_gate: Palm Fence Gate + item.default.palm_slab: Palm Slab + item.default.palm_stairs: Palm Stairs + item.default.palm_pressure_plate: Palm Pressure Plate + item.default.palm_button: Palm Button + item.default.palm_fence: Palm Fence + item.default.netherite_anvil: Netherite Anvil + item.default.gunpowder_block: GunPowder Block + item.default.solid_gunpowder_block: Solid GunPowder Block + item.default.copper_coil: Copper Coil + item.default.flame_elytra: Flame Elytra + item.default.pebble: Pebble + item.default.cap: Cap + item.default.flower_basket: Flower Basket + item.default.chessboard_block: Chessboard Block + item.default.safe_block: Safe Block + item.default.sofa: Sofa + item.default.amethyst_torch: Amethyst Torch + item.default.hami_melon_slice: Hami Melon Slice + item.default.hami_melon: Hami Melon + item.default.hami_melon_seeds: Hami Melon Seeds + item.default.magma_fruit: Magma Fruit + item.default.globe: Globe category.default.name: Default Assets category.default.lore: Contains the default configuration of CraftEngine category.palm_tree: Palm Tree @@ -64,61 +65,62 @@ translations: emoji.time: 'Current time: ' emoji.location: 'Current coordinates: ,,' zh_cn: - item.chinese_lantern: 灯笼 - item.fairy_flower: 仙灵花 - item.reed: 芦苇 - item.flame_cane: 烈焰甘蔗 - item.ender_pearl_flower_seeds: 末影珍珠花种子 - item.bench: 长椅 - item.table_lamp: 台灯 - item.wooden_chair: 木椅 - item.topaz_rod: 黄玉钓竿 - item.topaz_bow: 黄玉弓 - item.topaz_crossbow: 黄玉弩 - item.topaz_pickaxe: 黄玉镐 - item.topaz_axe: 黄玉斧 - item.topaz_hoe: 黄玉锄 - item.topaz_shovel: 黄玉锹 - item.topaz_sword: 黄玉剑 - item.topaz_helmet: 黄玉头盔 - item.topaz_chestplate: 黄玉胸甲 - item.topaz_leggings: 黄玉护腿 - item.topaz_boots: 黄玉靴子 - item.topaz_trident: 黄玉三叉戟 - item.topaz_ore: 黄玉矿石 - item.deepslate_topaz_ore: 深层黄玉矿石 - item.topaz: 黄玉 - item.palm_log: 棕榈原木 - item.stripped_palm_log: 去皮棕榈原木 - item.palm_wood: 棕榈木 - item.stripped_palm_wood: 去皮棕榈木 - item.palm_planks: 棕榈木板 - item.palm_sapling: 棕榈树苗 - item.palm_leaves: 棕榈树叶 - item.palm_trapdoor: 棕榈木活板门 - item.palm_door: 棕榈木门 - item.palm_fence_gate: 棕榈木栅栏门 - item.palm_slab: 棕榈木台阶 - item.palm_stairs: 棕榈木楼梯 - item.palm_pressure_plate: 棕榈木压力板 - item.palm_button: 棕榈木按钮 - item.palm_fence: 棕榈木栅栏 - item.netherite_anvil: 下界合金砧 - item.gunpowder_block: 火药粉末 - item.solid_gunpowder_block: 凝固火药块 - item.copper_coil: 铜线圈 - item.flame_elytra: 烈焰鞘翅 - item.pebble: 石子 - item.cap: 鸭舌帽 - item.flower_basket: 花篮 - item.chessboard_block: 棋盘方块 - item.safe_block: 保险柜 - item.sofa: 沙发 - item.amethyst_torch: 紫水晶火把 - item.hami_melon_slice: 哈密瓜片 - item.hami_melon: 哈密瓜 - item.hami_melon_seeds: 哈密瓜种子 - item.magma_fruit: 岩浆果实 + item.default.chinese_lantern: 灯笼 + item.default.fairy_flower: 仙灵花 + item.default.reed: 芦苇 + item.default.flame_cane: 烈焰甘蔗 + item.default.ender_pearl_flower_seeds: 末影珍珠花种子 + item.default.bench: 长椅 + item.default.table_lamp: 台灯 + item.default.wooden_chair: 木椅 + item.default.topaz_rod: 黄玉钓竿 + item.default.topaz_bow: 黄玉弓 + item.default.topaz_crossbow: 黄玉弩 + item.default.topaz_pickaxe: 黄玉镐 + item.default.topaz_axe: 黄玉斧 + item.default.topaz_hoe: 黄玉锄 + item.default.topaz_shovel: 黄玉锹 + item.default.topaz_sword: 黄玉剑 + item.default.topaz_helmet: 黄玉头盔 + item.default.topaz_chestplate: 黄玉胸甲 + item.default.topaz_leggings: 黄玉护腿 + item.default.topaz_boots: 黄玉靴子 + item.default.topaz_trident: 黄玉三叉戟 + item.default.topaz_ore: 黄玉矿石 + item.default.deepslate_topaz_ore: 深层黄玉矿石 + item.default.topaz: 黄玉 + item.default.palm_log: 棕榈原木 + item.default.stripped_palm_log: 去皮棕榈原木 + item.default.palm_wood: 棕榈木 + item.default.stripped_palm_wood: 去皮棕榈木 + item.default.palm_planks: 棕榈木板 + item.default.palm_sapling: 棕榈树苗 + item.default.palm_leaves: 棕榈树叶 + item.default.palm_trapdoor: 棕榈木活板门 + item.default.palm_door: 棕榈木门 + item.default.palm_fence_gate: 棕榈木栅栏门 + item.default.palm_slab: 棕榈木台阶 + item.default.palm_stairs: 棕榈木楼梯 + item.default.palm_pressure_plate: 棕榈木压力板 + item.default.palm_button: 棕榈木按钮 + item.default.palm_fence: 棕榈木栅栏 + item.default.netherite_anvil: 下界合金砧 + item.default.gunpowder_block: 火药粉末 + item.default.solid_gunpowder_block: 凝固火药块 + item.default.copper_coil: 铜线圈 + item.default.flame_elytra: 烈焰鞘翅 + item.default.pebble: 石子 + item.default.cap: 鸭舌帽 + item.default.flower_basket: 花篮 + item.default.chessboard_block: 棋盘方块 + item.default.safe_block: 保险柜 + item.default.sofa: 沙发 + item.default.amethyst_torch: 紫水晶火把 + item.default.hami_melon_slice: 哈密瓜片 + item.default.hami_melon: 哈密瓜 + item.default.hami_melon_seeds: 哈密瓜种子 + item.default.magma_fruit: 岩浆果实 + item.default.globe: 地球仪 category.default.name: 默认资产 category.default.lore: 包含了CraftEngine的默认配置 category.palm_tree: 棕榈树 @@ -128,61 +130,62 @@ translations: emoji.time: '当前时间: ' emoji.location: '当前坐标: ,,' fr_fr: - item.chinese_lantern: Lanterne Chinoise - item.fairy_flower: Fleur Fée - item.reed: Roseau - item.flame_cane: Canne de Flamme - item.ender_pearl_flower_seeds: Graines de Fleur de Perle du Néant - item.bench: Banc - item.table_lamp: Lampe de Table - item.wooden_chair: Chaise en Bois - item.topaz_rod: Canne à Topaze - item.topaz_bow: Arc en Topaze - item.topaz_crossbow: Arbalète en Topaze - item.topaz_pickaxe: Pioche en Topaze - item.topaz_axe: Hache en Topaze - item.topaz_hoe: Houe en Topaze - item.topaz_shovel: Pelle en Topaze - item.topaz_sword: Épée en Topaze - item.topaz_helmet: Casque en Topaze - item.topaz_chestplate: Plastron en Topaze - item.topaz_leggings: Jambières en Topaze - item.topaz_boots: Bottes en Topaze - item.topaz_trident: Trident en Topaze - item.topaz_ore: Minerai de Topaze - item.deepslate_topaz_ore: Minerai de Topaze en Schiste Sombre - item.topaz: Topaze - item.palm_log: Bois de Palmier - item.stripped_palm_log: Bois de Palmier Écorcé - item.palm_wood: Bois de Palmier - item.stripped_palm_wood: Bois de Palmier Écorcé - item.palm_planks: Planches de Palmier - item.palm_sapling: Pousse de Palmier - item.palm_leaves: Feuilles de Palmier - item.palm_trapdoor: Trappe en Palmier - item.palm_door: Porte en Palmier - item.palm_fence_gate: Portail de Barrière en Palmier - item.palm_slab: Dalle en Palmier - item.palm_stairs: Escalier en Palmier - item.palm_pressure_plate: Plaque de Pression en Palmier - item.palm_button: Bouton en Palmier - item.palm_fence: Barrière en Palmier - item.netherite_anvil: Enclume en Netherite - item.gunpowder_block: Bloc de Poudre à Canon - item.solid_gunpowder_block: Bloc de Poudre à Canon Solide - item.copper_coil: Bobine de Cuivre - item.flame_elytra: Élytres de Flamme - item.pebble: Caillou - item.cap: Casquette - item.flower_basket: Panier de Fleurs - item.chessboard_block: Bloc Damier - item.safe_block: Coffre-Fort - item.sofa: Canapé - item.amethyst_torch: Torche en Améthyste - item.hami_melon_slice: Tranche de Melon de Hami - item.hami_melon: Melon de Hami - item.hami_melon_seeds: Graines de Melon de Hami - item.magma_fruit: Fruit de Magma + item.default.chinese_lantern: Lanterne Chinoise + item.default.fairy_flower: Fleur Fée + item.default.reed: Roseau + item.default.flame_cane: Canne de Flamme + item.default.ender_pearl_flower_seeds: Graines de Fleur de Perle du Néant + item.default.bench: Banc + item.default.table_lamp: Lampe de Table + item.default.wooden_chair: Chaise en Bois + item.default.topaz_rod: Canne à Topaze + item.default.topaz_bow: Arc en Topaze + item.default.topaz_crossbow: Arbalète en Topaze + item.default.topaz_pickaxe: Pioche en Topaze + item.default.topaz_axe: Hache en Topaze + item.default.topaz_hoe: Houe en Topaze + item.default.topaz_shovel: Pelle en Topaze + item.default.topaz_sword: Épée en Topaze + item.default.topaz_helmet: Casque en Topaze + item.default.topaz_chestplate: Plastron en Topaze + item.default.topaz_leggings: Jambières en Topaze + item.default.topaz_boots: Bottes en Topaze + item.default.topaz_trident: Trident en Topaze + item.default.topaz_ore: Minerai de Topaze + item.default.deepslate_topaz_ore: Minerai de Topaze en Schiste Sombre + item.default.topaz: Topaze + item.default.palm_log: Bois de Palmier + item.default.stripped_palm_log: Bois de Palmier Écorcé + item.default.palm_wood: Bois de Palmier + item.default.stripped_palm_wood: Bois de Palmier Écorcé + item.default.palm_planks: Planches de Palmier + item.default.palm_sapling: Pousse de Palmier + item.default.palm_leaves: Feuilles de Palmier + item.default.palm_trapdoor: Trappe en Palmier + item.default.palm_door: Porte en Palmier + item.default.palm_fence_gate: Portail de Barrière en Palmier + item.default.palm_slab: Dalle en Palmier + item.default.palm_stairs: Escalier en Palmier + item.default.palm_pressure_plate: Plaque de Pression en Palmier + item.default.palm_button: Bouton en Palmier + item.default.palm_fence: Barrière en Palmier + item.default.netherite_anvil: Enclume en Netherite + item.default.gunpowder_block: Bloc de Poudre à Canon + item.default.solid_gunpowder_block: Bloc de Poudre à Canon Solide + item.default.copper_coil: Bobine de Cuivre + item.default.flame_elytra: Élytres de Flamme + item.default.pebble: Caillou + item.default.cap: Casquette + item.default.flower_basket: Panier de Fleurs + item.default.chessboard_block: Bloc Damier + item.default.safe_block: Coffre-Fort + item.default.sofa: Canapé + item.default.amethyst_torch: Torche en Améthyste + item.default.hami_melon_slice: Tranche de Melon de Hami + item.default.hami_melon: Melon de Hami + item.default.hami_melon_seeds: Graines de Melon de Hami + item.default.magma_fruit: Fruit de Magma + item.default.globe: Globe category.default.name: Ressources par Défaut category.default.lore: Contient la configuration par défaut de CraftEngine category.palm_tree: Palmier diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/globe.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/globe.json new file mode 100644 index 000000000..34accc937 --- /dev/null +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/globe.json @@ -0,0 +1,162 @@ +{ + "textures": { + "0": "item/custom/globe", + "particle": "item/custom/globe" + }, + "elements": [ + { + "from": [3, 18, 3], + "to": [13, 8, 13], + "rotation": {"x": 0, "y": 0, "z": 0, "origin": [3, 8, 3]}, + "faces": { + "north": {"uv": [6, 5, 11, 0], "texture": "#0"}, + "east": {"uv": [6, 10, 11, 5], "texture": "#0"}, + "south": {"uv": [6, 15, 11, 10], "texture": "#0"}, + "west": {"uv": [11, 5, 16, 0], "texture": "#0"}, + "up": {"uv": [16, 15, 11, 10], "texture": "#0"}, + "down": {"uv": [16, 5, 11, 10], "texture": "#0"} + } + }, + { + "from": [2.99, 7.99, 2.99], + "to": [13.01, 18.01, 13.01], + "rotation": {"x": 0, "y": 0, "z": 0, "origin": [3, 8, 3]}, + "faces": { + "north": {"uv": [6, 0, 11, 5], "texture": "#0"}, + "east": {"uv": [6, 5, 11, 10], "texture": "#0"}, + "south": {"uv": [6, 10, 11, 15], "texture": "#0"}, + "west": {"uv": [11, 0, 16, 5], "texture": "#0"}, + "up": {"uv": [16, 10, 11, 5], "texture": "#0"}, + "down": {"uv": [16, 10, 11, 15], "texture": "#0"} + } + }, + { + "from": [13.25, 18.25, 13.25], + "to": [2.75, 7.75, 2.75], + "rotation": {"x": 0, "y": 0, "z": 0, "origin": [13, 18, 13]}, + "faces": { + "north": {"uv": [9, 15, 10, 16], "texture": "#0"}, + "east": {"uv": [9, 15, 10, 16], "texture": "#0"}, + "south": {"uv": [9, 15, 10, 16], "texture": "#0"}, + "west": {"uv": [9, 15, 10, 16], "texture": "#0"}, + "up": {"uv": [9, 15, 10, 16], "texture": "#0"}, + "down": {"uv": [9, 15, 10, 16], "texture": "#0"} + } + }, + { + "from": [13.5, 18.5, 13.5], + "to": [2.5, 7.5, 2.5], + "rotation": {"x": 0, "y": 0, "z": 0, "origin": [13, 18, 13]}, + "faces": { + "north": {"uv": [8, 15, 9, 16], "texture": "#0"}, + "east": {"uv": [8, 15, 9, 16], "texture": "#0"}, + "south": {"uv": [8, 15, 9, 16], "texture": "#0"}, + "west": {"uv": [8, 15, 9, 16], "texture": "#0"}, + "up": {"uv": [8, 15, 9, 16], "texture": "#0"}, + "down": {"uv": [8, 15, 9, 16], "texture": "#0"} + } + }, + { + "from": [11, 2, 2], + "to": [11, 6, 14], + "rotation": {"x": 0, "y": 0, "z": -45, "origin": [11, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "east": {"uv": [6, 12, 0, 14], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "west": {"uv": [0, 12, 6, 14], "texture": "#0"}, + "up": {"uv": [0, 12, 6, 12], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 12, 6, 12], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [5, 2, 2], + "to": [5, 6, 14], + "rotation": {"x": 0, "y": 0, "z": 45, "origin": [5, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "east": {"uv": [6, 12, 0, 14], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "west": {"uv": [0, 12, 6, 14], "texture": "#0"}, + "up": {"uv": [0, 12, 6, 12], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 12, 6, 12], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [2, 2, 11], + "to": [14, 6, 11], + "rotation": {"x": 45, "y": 0, "z": 0, "origin": [8, 2, 11]}, + "faces": { + "north": {"uv": [0, 12, 6, 14], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "south": {"uv": [6, 12, 0, 14], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "up": {"uv": [0, 12, 6, 12], "texture": "#0"}, + "down": {"uv": [0, 12, 6, 12], "texture": "#0"} + } + }, + { + "from": [2, 2, 5], + "to": [14, 6, 5], + "rotation": {"x": -45, "y": 0, "z": 0, "origin": [8, 2, 5]}, + "faces": { + "north": {"uv": [0, 12, 6, 14], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "south": {"uv": [6, 12, 0, 14], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "up": {"uv": [0, 12, 6, 12], "texture": "#0"}, + "down": {"uv": [0, 12, 6, 12], "texture": "#0"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 2, 14], + "rotation": {"x": 0, "y": 0, "z": 0, "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [10, 15, 16, 16], "texture": "#0"}, + "east": {"uv": [10, 15, 16, 16], "texture": "#0"}, + "south": {"uv": [10, 15, 16, 16], "texture": "#0"}, + "west": {"uv": [10, 15, 16, 16], "texture": "#0"}, + "up": {"uv": [6, 6, 0, 0], "texture": "#0"}, + "down": {"uv": [6, 6, 0, 12], "texture": "#0"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [60, -34, 0], + "translation": [-0.5, 3, 0.25], + "scale": [0.45, 0.45, 0.45] + }, + "thirdperson_lefthand": { + "rotation": [60, -34, 0], + "translation": [-0.5, 3, 0.25], + "scale": [0.45, 0.45, 0.45] + }, + "firstperson_righthand": { + "rotation": [0, -45, 0], + "translation": [0.5, 0.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, -45, 0], + "translation": [0.5, 0.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "translation": [0, 3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [25, -40, 0], + "translation": [0, -0.5, 0], + "scale": [0.6, 0.6, 0.6] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [2, 0, -16], + "scale": [2, 2, 2] + } + } +} \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/globe_base.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/globe_base.json new file mode 100644 index 000000000..d2ac210fb --- /dev/null +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/globe_base.json @@ -0,0 +1,109 @@ +{ + "textures": { + "0": "item/custom/globe", + "particle": "item/custom/globe" + }, + "elements": [ + { + "from": [11, 2, 2], + "to": [11, 6, 14], + "rotation": {"angle": -45, "axis": "z", "origin": [11, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "east": {"uv": [6, 12, 0, 14], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "west": {"uv": [0, 12, 6, 14], "texture": "#0"}, + "up": {"uv": [0, 12, 6, 12], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 12, 6, 12], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [5, 2, 2], + "to": [5, 6, 14], + "rotation": {"angle": 45, "axis": "z", "origin": [5, 2, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "east": {"uv": [6, 12, 0, 14], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "west": {"uv": [0, 12, 6, 14], "texture": "#0"}, + "up": {"uv": [0, 12, 6, 12], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 12, 6, 12], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [2, 2, 11], + "to": [14, 6, 11], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 2, 11]}, + "faces": { + "north": {"uv": [0, 12, 6, 14], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "south": {"uv": [6, 12, 0, 14], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "up": {"uv": [0, 12, 6, 12], "texture": "#0"}, + "down": {"uv": [0, 12, 6, 12], "texture": "#0"} + } + }, + { + "from": [2, 2, 5], + "to": [14, 6, 5], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 2, 5]}, + "faces": { + "north": {"uv": [0, 12, 6, 14], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "south": {"uv": [6, 12, 0, 14], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "up": {"uv": [0, 12, 6, 12], "texture": "#0"}, + "down": {"uv": [0, 12, 6, 12], "texture": "#0"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [10, 15, 16, 16], "texture": "#0"}, + "east": {"uv": [10, 15, 16, 16], "texture": "#0"}, + "south": {"uv": [10, 15, 16, 16], "texture": "#0"}, + "west": {"uv": [10, 15, 16, 16], "texture": "#0"}, + "up": {"uv": [6, 6, 0, 0], "texture": "#0"}, + "down": {"uv": [6, 6, 0, 12], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [60, -34, 0], + "translation": [-0.5, 3, 0.25], + "scale": [0.45, 0.45, 0.45] + }, + "thirdperson_lefthand": { + "rotation": [60, -34, 0], + "translation": [-0.5, 3, 0.25], + "scale": [0.45, 0.45, 0.45] + }, + "firstperson_righthand": { + "rotation": [0, -45, 0], + "translation": [0.5, 0.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, -45, 0], + "translation": [0.5, 0.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "translation": [0, 3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [25, -40, 0], + "translation": [0, 0.75, 0], + "scale": [0.6, 0.6, 0.6] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [2, 0, -16], + "scale": [2, 2, 2] + } + } +} \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/globe_earth.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/globe_earth.json new file mode 100644 index 000000000..ebc99be03 --- /dev/null +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/globe_earth.json @@ -0,0 +1,96 @@ +{ + "textures": { + "0": "item/custom/globe", + "particle": "item/custom/globe" + }, + "elements": [ + { + "from": [3, 18, 3], + "to": [13, 8, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 3]}, + "faces": { + "north": {"uv": [6, 5, 11, 0], "texture": "#0"}, + "east": {"uv": [6, 10, 11, 5], "texture": "#0"}, + "south": {"uv": [6, 15, 11, 10], "texture": "#0"}, + "west": {"uv": [11, 5, 16, 0], "texture": "#0"}, + "up": {"uv": [16, 15, 11, 10], "texture": "#0"}, + "down": {"uv": [16, 5, 11, 10], "texture": "#0"} + } + }, + { + "from": [2.99, 7.99, 2.99], + "to": [13.01, 18.01, 13.01], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 3]}, + "faces": { + "north": {"uv": [6, 0, 11, 5], "texture": "#0"}, + "east": {"uv": [6, 5, 11, 10], "texture": "#0"}, + "south": {"uv": [6, 10, 11, 15], "texture": "#0"}, + "west": {"uv": [11, 0, 16, 5], "texture": "#0"}, + "up": {"uv": [16, 10, 11, 5], "texture": "#0"}, + "down": {"uv": [16, 10, 11, 15], "texture": "#0"} + } + }, + { + "from": [13.25, 18.25, 13.25], + "to": [2.75, 7.75, 2.75], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 18, 13]}, + "faces": { + "north": {"uv": [9, 15, 10, 16], "texture": "#0"}, + "east": {"uv": [9, 15, 10, 16], "texture": "#0"}, + "south": {"uv": [9, 15, 10, 16], "texture": "#0"}, + "west": {"uv": [9, 15, 10, 16], "texture": "#0"}, + "up": {"uv": [9, 15, 10, 16], "texture": "#0"}, + "down": {"uv": [9, 15, 10, 16], "texture": "#0"} + } + }, + { + "from": [13.5, 18.5, 13.5], + "to": [2.5, 7.5, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 18, 13]}, + "faces": { + "north": {"uv": [8, 15, 9, 16], "texture": "#0"}, + "east": {"uv": [8, 15, 9, 16], "texture": "#0"}, + "south": {"uv": [8, 15, 9, 16], "texture": "#0"}, + "west": {"uv": [8, 15, 9, 16], "texture": "#0"}, + "up": {"uv": [8, 15, 9, 16], "texture": "#0"}, + "down": {"uv": [8, 15, 9, 16], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [60, -34, 0], + "translation": [-0.5, 3, 0.25], + "scale": [0.45, 0.45, 0.45] + }, + "thirdperson_lefthand": { + "rotation": [60, -34, 0], + "translation": [-0.5, 3, 0.25], + "scale": [0.45, 0.45, 0.45] + }, + "firstperson_righthand": { + "rotation": [0, -45, 0], + "translation": [0.5, 0.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [0, -45, 0], + "translation": [0.5, 0.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "translation": [0, 3.5, 0], + "scale": [1, 1, 1] + }, + "gui": { + "rotation": [25, -40, 0], + "translation": [0, -2.75, 0], + "scale": [0.6, 0.6, 0.6] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [2, 0, -16], + "scale": [2, 2, 2] + } + } +} \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/globe.png b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/globe.png new file mode 100644 index 000000000..d0124ae73 Binary files /dev/null and b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/globe.png differ diff --git a/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/AbstractFurnitureManager.java b/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/AbstractFurnitureManager.java index 3acd61221..da72f44bd 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/AbstractFurnitureManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/AbstractFurnitureManager.java @@ -241,7 +241,7 @@ public abstract class AbstractFurnitureManager implements FurnitureManager { elements.toArray(new FurnitureElementConfig[0]), hitboxes.toArray(new FurnitureHitBoxConfig[0]), externalModel, - optionalLootSpawnOffset + optionalLootSpawnOffset.orElse(new Vector3f(0, 0.5f,0)) )); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/FurnitureVariant.java b/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/FurnitureVariant.java index 206a5ddf7..82d9735f1 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/FurnitureVariant.java +++ b/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/FurnitureVariant.java @@ -13,5 +13,5 @@ public record FurnitureVariant(String name, FurnitureElementConfig[] elementConfigs, FurnitureHitBoxConfig[] hitBoxConfigs, Optional externalModel, - Optional dropOffset) { + Vector3f dropOffset) { } \ No newline at end of file diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java index 865addc5a..66065ddd6 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java @@ -503,6 +503,7 @@ public abstract class AbstractPackManager implements PackManager { plugin.saveResource("resources/default/configuration/furniture/bench.yml"); plugin.saveResource("resources/default/configuration/furniture/wooden_chair.yml"); plugin.saveResource("resources/default/configuration/furniture/flower_basket.yml"); + plugin.saveResource("resources/default/configuration/furniture/globe.yml"); plugin.saveResource("resources/default/configuration/blocks/chessboard_block.yml"); plugin.saveResource("resources/default/configuration/blocks/chinese_lantern.yml"); plugin.saveResource("resources/default/configuration/blocks/copper_coil.yml"); @@ -625,6 +626,9 @@ public abstract class AbstractPackManager implements PackManager { plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/item/custom/flower_basket_ceiling.json"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/item/custom/flower_basket_ground.json"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/item/custom/flower_basket_wall.json"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/item/custom/globe.json"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/item/custom/globe_base.json"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/item/custom/globe_earth.json"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/flower_basket.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/flower_basket_2d.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/gui/sprites/tooltip/topaz_background.png"); @@ -636,6 +640,7 @@ public abstract class AbstractPackManager implements PackManager { plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/hami_melon_top.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/hami_melon_slice.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/hami_melon_seeds.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/globe.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/block/custom/fence_side.json"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_0.json"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_1.json"); @@ -663,7 +668,9 @@ public abstract class AbstractPackManager implements PackManager { AbstractPackManager.this.cachedConfigFiles.put(path, cachedFile); } else { try (InputStreamReader inputStream = new InputStreamReader(Files.newInputStream(path), StandardCharsets.UTF_8)) { - Yaml yaml = new Yaml(new StringKeyConstructor(path, new LoaderOptions())); + LoaderOptions loaderOptions = new LoaderOptions(); + loaderOptions.setNestingDepthLimit(256); + Yaml yaml = new Yaml(new StringKeyConstructor(path, loaderOptions)); Map data = yaml.load(inputStream); if (data == null) return FileVisitResult.CONTINUE; cachedFile = new CachedConfigFile(data, pack, lastModifiedTime, size); diff --git a/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java b/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java index 41d306060..715c36a75 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java +++ b/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java @@ -75,8 +75,6 @@ public final class BuiltInRegistries { public static final Registry> ITEM_PROCESSOR_TYPE = createConstantBoundRegistry(Registries.ITEM_PROCESSOR_TYPE, 64); public static final Registry> ITEM_BEHAVIOR_TYPE = createConstantBoundRegistry(Registries.ITEM_BEHAVIOR_TYPE, 64); public static final Registry>> PROPERTY_TYPE = createConstantBoundRegistry(Registries.PROPERTY_TYPE, 16); - public static final Registry> LOOT_FUNCTION_TYPE = createConstantBoundRegistry(Registries.LOOT_FUNCTION_TYPE, 32); - public static final Registry> LOOT_ENTRY_CONTAINER_TYPE = createConstantBoundRegistry(Registries.LOOT_ENTRY_CONTAINER_TYPE, 16); public static final Registry> NUMBER_PROVIDER_TYPE = createConstantBoundRegistry(Registries.NUMBER_PROVIDER_TYPE, 16); public static final Registry> TEMPLATE_ARGUMENT_TYPE = createConstantBoundRegistry(Registries.TEMPLATE_ARGUMENT_TYPE, 16); public static final Registry> ITEM_MODEL_TYPE = createConstantBoundRegistry(Registries.ITEM_MODEL_TYPE, 16); @@ -93,7 +91,6 @@ public final class BuiltInRegistries { public static final Registry> RESOURCE_PACK_HOST_TYPE = createConstantBoundRegistry(Registries.RESOURCE_PACK_HOST_TYPE, 16); public static final Registry>> COMMON_FUNCTION_TYPE = createConstantBoundRegistry(Registries.COMMON_FUNCTION_TYPE, 128); public static final Registry>> COMMON_CONDITION_TYPE = createConstantBoundRegistry(Registries.COMMON_CONDITION_TYPE, 128); - public static final Registry> PLAYER_SELECTOR_TYPE = createConstantBoundRegistry(Registries.PLAYER_SELECTOR_TYPE, 16); public static final Registry> EQUIPMENT_TYPE = createConstantBoundRegistry(Registries.EQUIPMENT_TYPE, 8); public static final Registry> SLOT_DISPLAY_TYPE = createConstantBoundRegistry(Registries.SLOT_DISPLAY_TYPE, 16); public static final Registry> RECIPE_DISPLAY_TYPE = createConstantBoundRegistry(Registries.RECIPE_DISPLAY_TYPE, 16); @@ -107,6 +104,10 @@ public final class BuiltInRegistries { public static final Registry> FURNITURE_ELEMENT_TYPE = createConstantBoundRegistry(Registries.FURNITURE_ELEMENT_TYPE, 16); public static final Registry> FURNITURE_HITBOX_TYPE = createConstantBoundRegistry(Registries.FURNITURE_HITBOX_TYPE, 16); public static final Registry> FURNITURE_BEHAVIOR_TYPE = createConstantBoundRegistry(Registries.FURNITURE_BEHAVIOR_TYPE, 32); + // todo 修改 + public static final Registry> PLAYER_SELECTOR_TYPE = createConstantBoundRegistry(Registries.PLAYER_SELECTOR_TYPE, 16); + public static final Registry> LOOT_FUNCTION_TYPE = createConstantBoundRegistry(Registries.LOOT_FUNCTION_TYPE, 32); + public static final Registry> LOOT_ENTRY_CONTAINER_TYPE = createConstantBoundRegistry(Registries.LOOT_ENTRY_CONTAINER_TYPE, 16); private BuiltInRegistries() {}