From 0b41d1dc0156356a7026909b9471a8c45b4b6d46 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sat, 22 Mar 2025 04:56:51 +0800 Subject: [PATCH] fix on 1.20 --- .../resources/default/configuration/plants.yml | 4 ++-- .../models/block/custom/fairy_flower_1.json | 13 ++----------- .../assets/minecraft/models/block/custom/reed.json | 4 +++- .../assets/minecraft/models/item/custom/bench.json | 1 - .../minecraft/models/item/custom/table_lamp.json | 1 - .../minecraft/models/item/custom/wooden_chair.json | 1 - .../craftengine/bukkit/util/Reflections.java | 9 ++++++--- 7 files changed, 13 insertions(+), 20 deletions(-) diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/plants.yml b/bukkit-loader/src/main/resources/resources/default/configuration/plants.yml index ba5ac3ab2..05a25cdfd 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/plants.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/plants.yml @@ -39,7 +39,7 @@ blocks: item: default:fairy_flower state: id: 0 - state: tripwire:0 + state: sugar_cane:0 models: - path: "minecraft:block/custom/fairy_flower_1" weight: 100 @@ -77,6 +77,6 @@ blocks: item: default:reed state: id: 1 - state: tripwire:1 + state: sugar_cane:1 model: path: "minecraft:block/custom/reed" \ No newline at end of file diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/fairy_flower_1.json b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/fairy_flower_1.json index 44c9adbde..e79d4627e 100644 --- a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/fairy_flower_1.json +++ b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/fairy_flower_1.json @@ -34,6 +34,7 @@ "from": [7, 28, 7], "to": [9, 30, 9], "rotation": {"angle": 0, "axis": "y", "origin": [7, 28, 7]}, + "shade": false, "faces": { "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, "east": {"uv": [15, 0, 16, 1], "texture": "#0"}, @@ -43,15 +44,5 @@ "down": {"uv": [15, 0, 16, 1], "texture": "#0"} } } - ], - "display": { - "head": { - "translation": [0, 18.5, 0] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -15], - "scale": [2, 2, 2] - } - } + ] } \ No newline at end of file diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/reed.json b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/reed.json index 63af951fa..5f872fc80 100644 --- a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/reed.json +++ b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/reed.json @@ -1,5 +1,5 @@ { - "texture_size": [32, 32], + "ambientocclusion": false, "textures": { "0": "block/custom/reed", "particle": "block/custom/reed" @@ -8,6 +8,7 @@ { "from": [-0.5, -3, 0.25], "to": [19.5, 29, 0.25], + "shade": false, "rotation": {"angle": -45, "axis": "y", "origin": [-0.5, -3, 2.25]}, "faces": { "north": {"uv": [0, 0, 10, 16], "texture": "#0"}, @@ -21,6 +22,7 @@ { "from": [2, -3, 14.75], "to": [22, 29, 14.75], + "shade": false, "rotation": {"angle": 45, "axis": "y", "origin": [2, -3, 16.75]}, "faces": { "north": {"uv": [0, 0, 10, 16], "texture": "#0"}, diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/bench.json b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/bench.json index 21bb4288d..881f11a58 100644 --- a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/bench.json +++ b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/bench.json @@ -1,5 +1,4 @@ { - "texture_size": [64, 64], "textures": { "0": "item/custom/bench", "particle": "item/custom/bench" diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/table_lamp.json b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/table_lamp.json index 25ad38f50..32067b787 100644 --- a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/table_lamp.json +++ b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/table_lamp.json @@ -1,5 +1,4 @@ { - "texture_size": [32, 32], "textures": { "0": "item/custom/table_lamp", "particle": "item/custom/table_lamp" diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/wooden_chair.json b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/wooden_chair.json index f1ee8e866..81e73f921 100644 --- a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/wooden_chair.json +++ b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/wooden_chair.json @@ -1,5 +1,4 @@ { - "texture_size": [32, 32], "textures": { "0": "item/custom/wooden_chair", "particle": "item/custom/wooden_chair" diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java index 105899258..e8c696b66 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java @@ -5033,13 +5033,15 @@ public class Reflections { public static final Class clazz$BlockHitResult = requireNonNull( ReflectionUtils.getClazz( - BukkitReflectionUtils.assembleMCClass("world.phys.BlockHitResult") + BukkitReflectionUtils.assembleMCClass("world.phys.BlockHitResult"), + BukkitReflectionUtils.assembleMCClass("world.phys.MovingObjectPositionBlock") ) ); public static final Class clazz$ClipContext$Fluid = requireNonNull( ReflectionUtils.getClazz( - BukkitReflectionUtils.assembleMCClass("world.level.ClipContext$Fluid") + BukkitReflectionUtils.assembleMCClass("world.level.ClipContext$Fluid"), + BukkitReflectionUtils.assembleMCClass("world.level.RayTrace$FluidCollisionOption") ) ); @@ -5102,7 +5104,8 @@ public class Reflections { public static final Class clazz$HitResult = requireNonNull( ReflectionUtils.getClazz( - BukkitReflectionUtils.assembleMCClass("world.phys.HitResult") + BukkitReflectionUtils.assembleMCClass("world.phys.HitResult"), + BukkitReflectionUtils.assembleMCClass("world.phys.MovingObjectPosition") ) );