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 new file mode 100644 index 000000000..bb6b3cd31 --- /dev/null +++ b/common-files/src/main/resources/resources/default/configuration/blocks/magma_plant.yml @@ -0,0 +1,153 @@ +items: + default:magma_fruit: + material: carrot + model: + template: default:model/simplified_generated + arguments: + path: minecraft:item/custom/magma_fruit + data: + item-name: + $$>=1.20.5: + food: + nutrition: 3 + saturation: 0.5 + can-always-eat: true + settings: + invulnerable: + - lava + - fire_tick + $$<1.20.5: + food: + nutrition: 3 + saturation: 0.5 + events: + - on: consume + functions: + - type: damage + target: self + amount: 1.0 + damage-type: lava + - type: potion_effect + duration: 200 + amplifier: 0 + particles: true + potion-effect: minecraft:fire_resistance + behavior: + type: liquid_collision_block_item + block: default:magma_plant +blocks: + default:magma_plant: + settings: + template: + - default:hardness/none + - default:sound/grass + overrides: + item: default:magma_fruit + push-reaction: destroy + map-color: 24 + is-randomly-ticking: true + behavior: + - type: crop_block + grow-speed: 0.25 + light-requirement: 10 + is-bone-meal-target: true + bone-meal-age-bonus: + type: uniform + min: 1 + max: 2 + - type: on_liquid_block + stackable: false + liquid-type: + - lava + states: + properties: + age: + type: int + default: 0 + range: 0~3 + appearances: + age=0: + auto-state: lower_tripwire + model: minecraft:block/custom/magma_plant_stage_0 + age=1: + auto-state: higher_tripwire + model: minecraft:block/custom/magma_plant_stage_1 + age=2: + auto-state: sugar_cane + model: minecraft:block/custom/magma_plant_stage_2 + age=3: + auto-state: sugar_cane + models: + - path: minecraft:block/custom/magma_plant_stage_3 + weight: 1 + - path: minecraft:block/custom/magma_plant_stage_3 + y: 90 + weight: 1 + - path: minecraft:block/custom/magma_plant_stage_3 + y: 180 + weight: 1 + - path: minecraft:block/custom/magma_plant_stage_3 + y: 270 + weight: 1 + variants: + age=0: + appearance: age=0 + age=1: + appearance: age=1 + age=2: + appearance: age=2 + age=3: + appearance: age=3 + settings: + is-randomly-ticking: false + loot: + template: default:loot_table/crop + arguments: + crop_item: default:magma_fruit + ripe_age: 3 + events: + - on: break + conditions: + - type: match_block_property + properties: + age: 3 + functions: + - type: particle + x: + 0.5 + y: + 0.5 + z: + 0.5 + particle: minecraft:lava + count: 10 + offset-x: 0.05 + offset-y: 0.02 + offset-z: 0.05 + speed: 0.08 + - type: play_sound + sound: minecraft:entity.firework_rocket.blast + x: + 0.5 + y: + 0.5 + z: + 0.5 + - on: right_click + conditions: + - type: match_block_property + properties: + age: 3 + - type: 'is_null' + argument: item_in_hand + - type: hand + hand: main_hand + functions: + - type: break_block + x: + y: + z: + - type: place_block + x: + y: + z: + block-state: default:magma_plant[age=0] + - type: swing_hand + - type: damage + target: self + amount: 1.0 + damage-type: lava \ No newline at end of file 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 a1a9a71c8..e86e20116 100644 --- a/common-files/src/main/resources/resources/default/configuration/categories.yml +++ b/common-files/src/main/resources/resources/default/configuration/categories.yml @@ -83,4 +83,5 @@ categories: - default:amethyst_torch - default:hami_melon_seeds - default:hami_melon_slice - - default:hami_melon \ No newline at end of file + - default:hami_melon + - default:magma_fruit \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/configuration/i18n.yml b/common-files/src/main/resources/resources/default/configuration/i18n.yml index a0c7eea40..a25218f41 100644 --- a/common-files/src/main/resources/resources/default/configuration/i18n.yml +++ b/common-files/src/main/resources/resources/default/configuration/i18n.yml @@ -37,6 +37,8 @@ i18n: 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 @@ -52,8 +54,7 @@ i18n: item.hami_melon_slice: Hami Melon Slice item.hami_melon: Hami Melon item.hami_melon_seeds: Hami Melon Seeds - item.palm_button: Palm Button - item.palm_fence: Palm Fence + item.magma_fruit: Magma Fruit category.default.name: Default Assets category.default.lore: Contains the default configuration of CraftEngine category.palm_tree: Palm Tree @@ -100,6 +101,8 @@ i18n: 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: 凝固火药块 @@ -115,8 +118,7 @@ i18n: item.hami_melon_slice: 哈密瓜片 item.hami_melon: 哈密瓜 item.hami_melon_seeds: 哈密瓜种子 - item.palm_button: 棕榈木按钮 - item.palm_fence: 棕榈木栅栏 + item.magma_fruit: 岩浆果实 category.default.name: 默认资产 category.default.lore: 包含了CraftEngine的默认配置 category.palm_tree: 棕榈树 @@ -146,6 +148,8 @@ lang: block_name:default:palm_fence_gate: Palm Fence Gate block_name:default:palm_slab: Palm Slab block_name:default:palm_stairs: Palm Stairs + block_name:default:palm_button: Palm Button + block_name:default:palm_fence: Palm Fence block_name:default:fairy_flower: Fairy Flower block_name:default:reed: Reed block_name:default:flame_cane: Flame Cane @@ -162,8 +166,7 @@ lang: block_name:default:hami_melon: Hami Melon block_name:default:hami_melon_stem: Hami Melon Stem block_name:default:attached_hami_melon_stem: Hami Melon Stem - block_name:default:palm_button: Palm Button - block_name:default:palm_fence: Palm Fence + block_name:default:magma_plant: Magma Plant zh_cn: block_name:default:chinese_lantern: 灯笼 block_name:default:netherite_anvil: 下界合金砧 @@ -181,6 +184,8 @@ lang: block_name:default:palm_fence_gate: 棕榈木栅栏门 block_name:default:palm_slab: 棕榈木台阶 block_name:default:palm_stairs: 棕榈木楼梯 + block_name:default:palm_button: 棕榈木按钮 + block_name:default:palm_fence: 棕榈木栅栏 block_name:default:fairy_flower: 仙灵花 block_name:default:reed: 芦苇 block_name:default:flame_cane: 烈焰甘蔗 @@ -197,5 +202,4 @@ lang: block_name:default:hami_melon: 哈密瓜 block_name:default:hami_melon_stem: 哈密瓜茎 block_name:default:attached_hami_melon_stem: 哈密瓜茎 - block_name:default:palm_button: 棕榈木按钮 - block_name:default:palm_fence: 棕榈木栅栏 + block_name:default:magma_plant: 岩浆植物 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 9673faee6..9649dcf23 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 @@ -441,6 +441,7 @@ public abstract class AbstractPackManager implements PackManager { plugin.saveResource("resources/default/configuration/blocks/netherite_anvil.yml"); plugin.saveResource("resources/default/configuration/blocks/amethyst_torch.yml"); plugin.saveResource("resources/default/configuration/blocks/hami_melon.yml"); + plugin.saveResource("resources/default/configuration/blocks/magma_plant.yml"); // assets plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/font/image/emojis.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png"); @@ -461,6 +462,10 @@ public abstract class AbstractPackManager implements PackManager { plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_side.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_front.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/safe_block_front_open.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/magma_plant.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/magma_plant.png.mcmeta"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/magma_fruit.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/magma_fruit.png.mcmeta"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow.png"); @@ -553,6 +558,10 @@ public abstract class AbstractPackManager implements PackManager { 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/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"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_2.json"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_3.json"); } private void updateCachedConfigFiles() {