Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-19 15:09:15 +00:00
Code Issues Releases Activity

Merge branch 'Xiao-MoMi:dev' into dev

Browse Source
This commit is contained in:
jhqwqmc
2025-10-07 05:42:26 +08:00
committed by GitHub
parent 2ae4d46d6e 2571fb776e
commit 05a5271963
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/LiquidCollisionBlockItemBehavior.java
View File

@@ -13,6 +13,7 @@ import net.momirealms.craftengine.core.item.behavior.ItemBehavior;
import net.momirealms.craftengine.core.item.behavior.ItemBehaviorFactory;
import net.momirealms.craftengine.core.item.context.UseOnContext;
import net.momirealms.craftengine.core.pack.Pack;
import net.momirealms.craftengine.core.pack.PendingConfigSection;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException;
import net.momirealms.craftengine.core.util.Direction;
@@ -77,12 +78,7 @@ public class LiquidCollisionBlockItemBehavior extends BlockItemBehavior {
}
int offset = ResourceConfigUtils.getAsInt(arguments.getOrDefault("y-offset", 1), "y-offset");
if (id instanceof Map<?, ?> map) {
if (map.containsKey(key.toString())) {
// 防呆
BukkitBlockManager.instance().blockParser().parseSection(pack, path, node, key, MiscUtils.castToMap(map.get(key.toString()), false));
} else {
BukkitBlockManager.instance().blockParser().parseSection(pack, path, node, key, MiscUtils.castToMap(map, false));
}
addPendingSection(pack, path, node, key, map);
return new LiquidCollisionBlockItemBehavior(key, offset);
} else {
return new LiquidCollisionBlockItemBehavior(Key.of(id.toString()), offset);

10
common-files/src/main/resources/resources/default/configuration/blocks/palm_tree.yml
View File

@@ -193,11 +193,6 @@ items:
parent: minecraft:block/cross
textures:
cross: minecraft:block/custom/palm_sapling
variants:
stage=0:
appearance: default
stage=1:
appearance: default
default:palm_leaves:
material: oak_leaves
data:
@@ -230,8 +225,6 @@ items:
states:
template: default:block_state/leaves
arguments:
default_state: oak_leaves[distance=1,persistent=false,waterlogged=false]
waterlogged_state: oak_leaves[distance=1,persistent=false,waterlogged=true]
model_path: minecraft:block/custom/palm_leaves
texture_path: minecraft:block/custom/palm_leaves
default:palm_trapdoor:
@@ -622,8 +615,7 @@ blocks#fence:
- minecraft:wooden_fences
behavior:
type: fence_block
self-tag: fences
connectable-tag: wooden_fences
connectable-block-tag: minecraft:wooden_fences
can-leash: true
states:
template: default:block_state/fence

2
core/build.gradle.kts
View File

@@ -21,7 +21,7 @@ dependencies {
implementation("net.momirealms:sparrow-nbt-codec:${rootProject.properties["sparrow_nbt_version"]}")
implementation("net.momirealms:sparrow-nbt-legacy-codec:${rootProject.properties["sparrow_nbt_version"]}")
// S3
implementation("net.momirealms:craft-engine-s3:0.6")
implementation("net.momirealms:craft-engine-s3:0.7")
// Util
compileOnly("net.momirealms:sparrow-util:${rootProject.properties["sparrow_util_version"]}")
// Adventure