From 10dbf3d590a6c583397249ded179c2533e16ecaf Mon Sep 17 00:00:00 2001 From: jhqwqmc Date: Wed, 24 Sep 2025 16:02:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common-files/src/main/resources/mappings.yml | 24 +-- .../configuration/blocks/hami_melon.yml | 104 ------------ .../default/configuration/blocks/mushroom.yml | 155 ------------------ .../default/configuration/categories.yml | 6 +- .../core/pack/AbstractPackManager.java | 5 - 5 files changed, 13 insertions(+), 281 deletions(-) delete mode 100644 common-files/src/main/resources/resources/default/configuration/blocks/mushroom.yml diff --git a/common-files/src/main/resources/mappings.yml b/common-files/src/main/resources/mappings.yml index a3a0b28b1..d3f9f58f2 100644 --- a/common-files/src/main/resources/mappings.yml +++ b/common-files/src/main/resources/mappings.yml @@ -4340,10 +4340,10 @@ minecraft:heavy_weighted_pressure_plate[power=15]: minecraft:heavy_weighted_pres # minecraft:dead_bubble_coral[waterlogged=true]: minecraft:bubble_coral[waterlogged=true] # minecraft:dead_bubble_coral_fan[waterlogged=false]: minecraft:bubble_coral_fan[waterlogged=false] # minecraft:dead_bubble_coral_fan[waterlogged=true]: minecraft:bubble_coral_fan[waterlogged=true] -minecraft:dead_bubble_coral_wall_fan[waterlogged=false,facing=east]: minecraft:bubble_coral_wall_fan[waterlogged=false,facing=east] -minecraft:dead_bubble_coral_wall_fan[waterlogged=false,facing=north]: minecraft:bubble_coral_wall_fan[waterlogged=false,facing=north] -minecraft:dead_bubble_coral_wall_fan[waterlogged=false,facing=south]: minecraft:bubble_coral_wall_fan[waterlogged=false,facing=south] -minecraft:dead_bubble_coral_wall_fan[waterlogged=false,facing=west]: minecraft:bubble_coral_wall_fan[waterlogged=false,facing=west] +# minecraft:dead_bubble_coral_wall_fan[waterlogged=false,facing=east]: minecraft:bubble_coral_wall_fan[waterlogged=false,facing=east] +# minecraft:dead_bubble_coral_wall_fan[waterlogged=false,facing=north]: minecraft:bubble_coral_wall_fan[waterlogged=false,facing=north] +# minecraft:dead_bubble_coral_wall_fan[waterlogged=false,facing=south]: minecraft:bubble_coral_wall_fan[waterlogged=false,facing=south] +# minecraft:dead_bubble_coral_wall_fan[waterlogged=false,facing=west]: minecraft:bubble_coral_wall_fan[waterlogged=false,facing=west] # minecraft:dead_bubble_coral_wall_fan[waterlogged=true,facing=east]: minecraft:bubble_coral_wall_fan[waterlogged=true,facing=east] # minecraft:dead_bubble_coral_wall_fan[waterlogged=true,facing=north]: minecraft:bubble_coral_wall_fan[waterlogged=true,facing=north] # minecraft:dead_bubble_coral_wall_fan[waterlogged=true,facing=south]: minecraft:bubble_coral_wall_fan[waterlogged=true,facing=south] @@ -4352,10 +4352,10 @@ minecraft:dead_bubble_coral_wall_fan[waterlogged=false,facing=west]: minecraft:b # minecraft:dead_fire_coral[waterlogged=true]: minecraft:fire_coral[waterlogged=true] # minecraft:dead_fire_coral_fan[waterlogged=false]: minecraft:fire_coral_fan[waterlogged=false] # minecraft:dead_fire_coral_fan[waterlogged=true]: minecraft:fire_coral_fan[waterlogged=true] -minecraft:dead_fire_coral_wall_fan[waterlogged=false,facing=east]: minecraft:fire_coral_wall_fan[waterlogged=false,facing=east] -minecraft:dead_fire_coral_wall_fan[waterlogged=false,facing=north]: minecraft:fire_coral_wall_fan[waterlogged=false,facing=north] -minecraft:dead_fire_coral_wall_fan[waterlogged=false,facing=south]: minecraft:fire_coral_wall_fan[waterlogged=false,facing=south] -minecraft:dead_fire_coral_wall_fan[waterlogged=false,facing=west]: minecraft:fire_coral_wall_fan[waterlogged=false,facing=west] +# minecraft:dead_fire_coral_wall_fan[waterlogged=false,facing=east]: minecraft:fire_coral_wall_fan[waterlogged=false,facing=east] +# minecraft:dead_fire_coral_wall_fan[waterlogged=false,facing=north]: minecraft:fire_coral_wall_fan[waterlogged=false,facing=north] +# minecraft:dead_fire_coral_wall_fan[waterlogged=false,facing=south]: minecraft:fire_coral_wall_fan[waterlogged=false,facing=south] +# minecraft:dead_fire_coral_wall_fan[waterlogged=false,facing=west]: minecraft:fire_coral_wall_fan[waterlogged=false,facing=west] # minecraft:dead_fire_coral_wall_fan[waterlogged=true,facing=east]: minecraft:fire_coral_wall_fan[waterlogged=true,facing=east] # minecraft:dead_fire_coral_wall_fan[waterlogged=true,facing=north]: minecraft:fire_coral_wall_fan[waterlogged=true,facing=north] # minecraft:dead_fire_coral_wall_fan[waterlogged=true,facing=south]: minecraft:fire_coral_wall_fan[waterlogged=true,facing=south] @@ -4364,10 +4364,10 @@ minecraft:dead_fire_coral_wall_fan[waterlogged=false,facing=west]: minecraft:fir # minecraft:dead_horn_coral[waterlogged=true]: minecraft:horn_coral[waterlogged=true] # minecraft:dead_horn_coral_fan[waterlogged=false]: minecraft:horn_coral_fan[waterlogged=false] # minecraft:dead_horn_coral_fan[waterlogged=true]: minecraft:horn_coral_fan[waterlogged=true] -minecraft:dead_horn_coral_wall_fan[waterlogged=false,facing=east]: minecraft:horn_coral_wall_fan[waterlogged=false,facing=east] -minecraft:dead_horn_coral_wall_fan[waterlogged=false,facing=north]: minecraft:horn_coral_wall_fan[waterlogged=false,facing=north] -minecraft:dead_horn_coral_wall_fan[waterlogged=false,facing=south]: minecraft:horn_coral_wall_fan[waterlogged=false,facing=south] -minecraft:dead_horn_coral_wall_fan[waterlogged=false,facing=west]: minecraft:horn_coral_wall_fan[waterlogged=false,facing=west] +# minecraft:dead_horn_coral_wall_fan[waterlogged=false,facing=east]: minecraft:horn_coral_wall_fan[waterlogged=false,facing=east] +# minecraft:dead_horn_coral_wall_fan[waterlogged=false,facing=north]: minecraft:horn_coral_wall_fan[waterlogged=false,facing=north] +# minecraft:dead_horn_coral_wall_fan[waterlogged=false,facing=south]: minecraft:horn_coral_wall_fan[waterlogged=false,facing=south] +# minecraft:dead_horn_coral_wall_fan[waterlogged=false,facing=west]: minecraft:horn_coral_wall_fan[waterlogged=false,facing=west] # minecraft:dead_horn_coral_wall_fan[waterlogged=true,facing=east]: minecraft:horn_coral_wall_fan[waterlogged=true,facing=east] # minecraft:dead_horn_coral_wall_fan[waterlogged=true,facing=north]: minecraft:horn_coral_wall_fan[waterlogged=true,facing=north] # minecraft:dead_horn_coral_wall_fan[waterlogged=true,facing=south]: minecraft:horn_coral_wall_fan[waterlogged=true,facing=south] 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 356d62b63..f9407d1f2 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 @@ -96,95 +96,6 @@ blocks: south_texture: minecraft:block/custom/hami_melon west_texture: minecraft:block/custom/hami_melon default:hami_melon_stem: - loot: - pools: - - rolls: 1 - entries: - - type: item - item: default:hami_melon_seeds - functions: - - type: set_count - add: false - conditions: - - type: match_block_property - properties: - age: 0 - count: - type: binomial - extra: 3 - probability: 0.06666667 - - type: set_count - add: false - conditions: - - type: match_block_property - properties: - age: 1 - count: - type: binomial - extra: 3 - probability: 0.13333334 - - type: set_count - add: false - conditions: - - type: match_block_property - properties: - age: 2 - count: - type: binomial - extra: 3 - probability: 0.2 - - type: set_count - add: false - conditions: - - type: match_block_property - properties: - age: 3 - count: - type: binomial - extra: 3 - probability: 0.26666668 - - type: set_count - add: false - conditions: - - type: match_block_property - properties: - age: 4 - count: - type: binomial - extra: 3 - probability: 0.33333334 - - type: set_count - add: false - conditions: - - type: match_block_property - properties: - age: 5 - count: - type: binomial - extra: 3 - probability: 0.4 - - type: set_count - add: false - conditions: - - type: match_block_property - properties: - age: 6 - count: - type: binomial - extra: 3 - probability: 0.46666667 - - type: set_count - add: false - conditions: - - type: match_block_property - properties: - age: 7 - count: - type: binomial - extra: 3 - probability: 0.53333336 - functions: - - type: explosion_decay settings: template: - default:sound/stem_crop @@ -256,21 +167,6 @@ blocks: appearance: age=7 id: 7 default:attached_hami_melon_stem: - loot: - pools: - - rolls: 1 - entries: - - type: item - item: default:hami_melon_seeds - functions: - - type: set_count - add: false - count: - type: binomial - extra: 3 - probability: 0.53333336 - functions: - - type: explosion_decay settings: template: - default:sound/stem_crop diff --git a/common-files/src/main/resources/resources/default/configuration/blocks/mushroom.yml b/common-files/src/main/resources/resources/default/configuration/blocks/mushroom.yml deleted file mode 100644 index 436b71872..000000000 --- a/common-files/src/main/resources/resources/default/configuration/blocks/mushroom.yml +++ /dev/null @@ -1,155 +0,0 @@ -items: - default:infected_palm_log: - material: nether_brick - custom-model-data: 3025 - settings: - fuel-time: 300 - tags: - - default:palm_logs - - minecraft:logs - - minecraft:logs_that_burn - data: - item-name: - model: - type: minecraft:model - path: minecraft:item/custom/palm_log - generation: - parent: minecraft:block/custom/palm_log - behavior: - type: block_item - block: default:infected_palm_log - default:small_mushroom: - material: nether_brick - custom-model-data: 3026 - data: - item-name: - model: - type: minecraft:model - path: minecraft:item/custom/small_mushroom - generation: - parent: minecraft:block/custom/small_mushroom - behavior: - type: block_item - block: default:small_mushroom - default:medium_mushroom: - material: nether_brick - custom-model-data: 3027 - data: - item-name: - model: - type: minecraft:model - path: minecraft:item/custom/medium_mushroom - generation: - parent: minecraft:block/custom/medium_mushroom - behavior: - type: block_item - block: default:medium_mushroom - default:large_mushroom: - material: nether_brick - custom-model-data: 3028 - data: - item-name: - model: - type: minecraft:model - path: minecraft:item/custom/large_mushroom - generation: - parent: minecraft:block/custom/large_mushroom - behavior: - type: block_item - block: default:large_mushroom - -blocks: - default:infected_palm_log: - behavior: - - type: strippable_block - stripped: default:stripped_palm_log - - type: budding_block - growth-chance: 5 - blocks: - - default:small_mushroom - - default:medium_mushroom - - default:large_mushroom - loot: - template: default:loot_table/self - settings: - template: default:settings/wood - overrides: - is-randomly-ticking: true - map-color: 2 - states: - template: default:block_state/pillar - arguments: - base_block: note_block - texture_top_path: minecraft:block/custom/palm_log_top - texture_side_path: minecraft:block/custom/palm_log - model_vertical_path: minecraft:block/custom/palm_log - model_horizontal_path: minecraft:block/custom/palm_log_horizontal - vanilla_id: - type: self_increase_int - from: 31 - to: 33 - internal_id: - type: self_increase_int - from: 31 - to: 33 - default:small_mushroom: - settings: - template: - - default:sound/crop - - default:hardness/none - overrides: - push-reaction: destroy - map-color: 26 - luminance: 1 - tags: - - minecraft:enderman_holdable - - minecraft:replaceable_by_mushrooms - behavior: - type: directional_attached_block - states: - template: default:block_state/mushroom - arguments: - base_block: dead_bubble_coral_wall_fan - model_path: minecraft:block/custom/small_mushroom - default:medium_mushroom: - behavior: - type: directional_attached_block - settings: - template: - - default:sound/crop - - default:hardness/none - overrides: - push-reaction: destroy - map-color: 26 - luminance: 1 - tags: - - minecraft:enderman_holdable - - minecraft:replaceable_by_mushrooms - states: - template: default:block_state/mushroom - arguments: - base_block: dead_horn_coral_wall_fan - model_path: minecraft:block/custom/medium_mushroom - default:large_mushroom: - loot: - template: default:loot_table/basic - arguments: - item: minecraft:brown_mushroom - behavior: - type: directional_attached_block - settings: - template: - - default:sound/crop - - default:hardness/none - overrides: - push-reaction: destroy - map-color: 26 - luminance: 1 - tags: - - minecraft:enderman_holdable - - minecraft:replaceable_by_mushrooms - states: - template: default:block_state/mushroom - arguments: - base_block: dead_fire_coral_wall_fan - model_path: minecraft:block/custom/large_mushroom 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 f73618373..2d911abe4 100644 --- a/common-files/src/main/resources/resources/default/configuration/categories.yml +++ b/common-files/src/main/resources/resources/default/configuration/categories.yml @@ -29,7 +29,6 @@ categories: - default:palm_pressure_plate - default:palm_button - default:palm_fence - - default:infected_palm_log default:topaz: name: <#FF8C00> hidden: true @@ -84,7 +83,4 @@ categories: - default:amethyst_torch - default:hami_melon_seeds - default:hami_melon_slice - - default:hami_melon - - default:small_mushroom - - default:medium_mushroom - - default:large_mushroom \ No newline at end of file + - default:hami_melon \ 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 91b25f19c..2777d7c88 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 @@ -432,7 +432,6 @@ 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/mushroom.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"); @@ -545,10 +544,6 @@ 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/textures/block/custom/mushroom.png"); - plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/block/custom/small_mushroom.json"); - plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/block/custom/medium_mushroom.json"); - plugin.saveResource("resources/default/resourcepack/assets/minecraft/models/block/custom/large_mushroom.json"); } private TreeMap> updateCachedConfigFiles() {