Fixed rotation of blocks like pumkins and repeaters

SIsilicon · Feb 6, 2024 · 333401a · 333401a
1 parent 0c25541
commit 333401a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/server/modules/region_buffer.ts b/src/server/modules/region_buffer.ts
@@ -171,16 +171,16 @@ export class RegionBuffer {
           } else if (attachement != null && direction != null) {
             const states = (this.transformMapping(mappings.bellMap, `${attachement}_${direction}`, ...rotFlip) as string).split("_");
             block = withProperties({ "attachement": states[0], "direction": parseInt(states[1]) });
+          } else if (cardinalDir != null) {
+            const state = this.transformMapping(mappings.cardinalDirectionMap, cardinalDir, ...rotFlip);
+            block = block.withState("minecraft:cardinal_direction", state);
           } else if (facingDir != null) {
             const state = this.transformMapping(mappings.facingDirectionMap, facingDir, ...rotFlip);
             block = block.withState("facing_direction", parseInt(state));
           } else if (direction != null) {
             const mapping = blockName.includes("powered_repeater") || blockName.includes("powered_comparator") ? mappings.redstoneMap : mappings.directionMap;
             const state = this.transformMapping(mapping, direction, ...rotFlip);
             block = block.withState("direction", parseInt(state));
-          } else if (cardinalDir != null) {
-            const state = this.transformMapping(mappings.cardinalDirectionMap, cardinalDir, ...rotFlip);
-            block = block.withState("minecraft:cardinal_direction", state);
           } else if (groundSignDir != null) {
             const state = this.transformMapping(mappings.groundSignDirectionMap, groundSignDir, ...rotFlip);
             block = block.withState("ground_sign_direction", parseInt(state));

diff --git a/src/server/util.ts b/src/server/util.ts
@@ -82,7 +82,8 @@ export function blockHasNBTData(block: Block) {
     "minecraft:skull",
     "minecraft:snow_layer",
     "minecraft:end_gateway", // TEST
-    "minecraft:beacon"
+    "minecraft:beacon",
+    "minecraft:bed"
   ];
   return components.some(component => !!block.getComponent(component)) || nbt_blocks.includes(block.typeId);
 }

diff --git a/tools/process_manifest.py b/tools/process_manifest.py
@@ -68,6 +68,13 @@ def process(key, value):
     'version': rp_manifest['header']['version']
 })
 
+if not 'dependencies' in rp_manifest:
+    rp_manifest['dependencies'] = []
+rp_manifest['dependencies'].append({
+    'uuid': bp_manifest['header']['uuid'],
+    'version': bp_manifest['header']['version']
+})
+
 if args.target == 'debug':
     bp_manifest['header']['name'] += ' [DEBUG]'
     rp_manifest['header']['name'] += ' [DEBUG]'