Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mattcarter11 committed Jul 18, 2024
1 parent 6f20200 commit 2f14b65
Show file tree
Hide file tree
Showing 15 changed files with 59 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -340,5 +340,5 @@ These blocks listed below are supported in is datapack. Please post an issue if
* v2.7.2
* Fixes
* Fixed entity_bullet example not fully working
* trapdoors, wall_torches not working
* trapdoors, wall_torches, wall_coral, pointed_dripstone[tip_up], fire, bell[single_wall] not working
</details>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Complex blocks

# Simple blocks
execute if entity @s[tag=!mrcd_block_collision_done] if block ~ ~ ~ #mrcd:wall_coral_like run function mrcd:private/types/1_13/wall_coral
execute if entity @s[tag=!mrcd_block_collision_done] if block ~ ~ ~ #mrcd:wall_coral_like run function mrcd:private/types/1_13/wall_coral/main
execute if entity @s[tag=!mrcd_block_collision_done] if block ~ ~ ~ #mrcd:coral_plant_like run function mrcd:private/types/1_13/coral_plant
execute if entity @s[tag=!mrcd_block_collision_done] if block ~ ~ ~ #mrcd:coral_fan_like run function mrcd:private/types/1_13/coral_fan
execute if entity @s[tag=!mrcd_block_collision_done] if block ~ ~ ~ kelp run function mrcd:private/types/1_13/kelp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
execute if entity @s[tag=!mrcd_block_collision_done] if block ~ ~ ~ redstone_wire run function mrcd:private/types/redstone_wire/main

# Simple blocks
execute if entity @s[tag=!mrcd_block_collision_done] if block ~ ~ ~ fire run function mrcd:private/types/fire/main
execute if entity @s[tag=!mrcd_block_collision_done] if block ~ ~ ~ beetroots run function mrcd:private/types/beetroots
execute if entity @s[tag=!mrcd_block_collision_done] if block ~ ~ ~ nether_wart run function mrcd:private/types/nether_wart
execute if entity @s[tag=!mrcd_block_collision_done] if block ~ ~ ~ lever run function mrcd:private/types/lever/main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ execute unless block ~ ~ ~ bell[attachment=floor] run function mrcd:private/type

execute if block ~ ~ ~ bell[attachment=ceiling] run function mrcd:private/types/1_14/bell/ceiling
execute if block ~ ~ ~ bell[attachment=double_wall] run function mrcd:private/types/1_14/bell/double_wall/main
execute if block ~ ~ ~ bell[attachment=single_wall] run function mrcd:private/types/1_14/bell/double_wall/main
execute if block ~ ~ ~ bell[attachment=single_wall] run function mrcd:private/types/1_14/bell/single_wall/main

execute if entity @e[tag=mrcd_touch_mark] run tag @s add mrcd_touch_edge
execute if entity @e[tag=mrcd_touch_mark] run tag @s add mrcd_touch_edge_complex
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ execute if block ~ ~ ~ pointed_dripstone[thickness=base] run function mrcd:priva
execute if block ~ ~ ~ pointed_dripstone[thickness=middle] run function mrcd:private/types/1_17/pointed_dripstone/middle
execute if block ~ ~ ~ pointed_dripstone[thickness=frustum] run function mrcd:private/types/1_17/pointed_dripstone/frustum
execute if block ~ ~ ~ pointed_dripstone[thickness=tip_merge] run function mrcd:private/types/1_17/pointed_dripstone/tip_merge
execute if block ~ ~ ~ pointed_dripstone[thickness=tip,vertical_direction=up] run function mrcd:private/1_17/types/pointed_dripstone/tip_up
execute if block ~ ~ ~ pointed_dripstone[thickness=tip,vertical_direction=up] run function mrcd:private/types/1_17/pointed_dripstone/tip_up
execute if block ~ ~ ~ pointed_dripstone[thickness=tip,vertical_direction=down] run function mrcd:private/types/1_17/pointed_dripstone/tip_down

scoreboard players operation #var0 mrcd_system = #block_corner_x mrcd_system
Expand Down
8 changes: 0 additions & 8 deletions data/mrcd/functions/private/types/fire.mcfunction

This file was deleted.

7 changes: 7 additions & 0 deletions data/mrcd/functions/private/types/fire/down.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
scoreboard players set #box_x0 mrcd_system 0
scoreboard players set #box_y0 mrcd_system 0
scoreboard players set #box_z0 mrcd_system 0
scoreboard players set #box_x1 mrcd_system 1000
scoreboard players set #box_y1 mrcd_system 63
scoreboard players set #box_z1 mrcd_system 1000
function mrcd:private/complex_cube/main
7 changes: 7 additions & 0 deletions data/mrcd/functions/private/types/fire/east.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
scoreboard players set #box_x0 mrcd_system 937
scoreboard players set #box_y0 mrcd_system 0
scoreboard players set #box_z0 mrcd_system 0
scoreboard players set #box_x1 mrcd_system 1000
scoreboard players set #box_y1 mrcd_system 1000
scoreboard players set #box_z1 mrcd_system 1000
function mrcd:private/complex_cube/main
11 changes: 11 additions & 0 deletions data/mrcd/functions/private/types/fire/main.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
execute if block ~ ~ ~ fire[up=false,north=false,south=false,east=false,west=false] run function mrcd:private/types/fire/down
execute if block ~ ~ ~ fire[south=true] run function mrcd:private/types/fire/south
execute if block ~ ~ ~ fire[north=true] run function mrcd:private/types/fire/north
execute if block ~ ~ ~ fire[east=true] run function mrcd:private/types/fire/east
execute if block ~ ~ ~ fire[west=true] run function mrcd:private/types/fire/west
execute if block ~ ~ ~ fire[up=true] run function mrcd:private/types/fire/up

execute if entity @e[tag=mrcd_touch_mark] run tag @s add mrcd_touch_edge
execute if entity @e[tag=mrcd_touch_mark] run tag @s add mrcd_touch_edge_complex

tag @s add mrcd_block_collision_done
7 changes: 7 additions & 0 deletions data/mrcd/functions/private/types/fire/north.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
scoreboard players set #box_x0 mrcd_system 0
scoreboard players set #box_y0 mrcd_system 0
scoreboard players set #box_z0 mrcd_system 0
scoreboard players set #box_x1 mrcd_system 1000
scoreboard players set #box_y1 mrcd_system 1000
scoreboard players set #box_z1 mrcd_system 63
function mrcd:private/complex_cube/main
7 changes: 7 additions & 0 deletions data/mrcd/functions/private/types/fire/south.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
scoreboard players set #box_x0 mrcd_system 0
scoreboard players set #box_y0 mrcd_system 0
scoreboard players set #box_z0 mrcd_system 937
scoreboard players set #box_x1 mrcd_system 1000
scoreboard players set #box_y1 mrcd_system 1000
scoreboard players set #box_z1 mrcd_system 1000
function mrcd:private/complex_cube/main
7 changes: 7 additions & 0 deletions data/mrcd/functions/private/types/fire/up.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
scoreboard players set #box_x0 mrcd_system 0
scoreboard players set #box_y0 mrcd_system 937
scoreboard players set #box_z0 mrcd_system 0
scoreboard players set #box_x1 mrcd_system 1000
scoreboard players set #box_y1 mrcd_system 1000
scoreboard players set #box_z1 mrcd_system 1000
function mrcd:private/complex_cube/main
7 changes: 7 additions & 0 deletions data/mrcd/functions/private/types/fire/west.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
scoreboard players set #box_x0 mrcd_system 0
scoreboard players set #box_y0 mrcd_system 0
scoreboard players set #box_z0 mrcd_system 0
scoreboard players set #box_x1 mrcd_system 63
scoreboard players set #box_y1 mrcd_system 1000
scoreboard players set #box_z1 mrcd_system 1000
function mrcd:private/complex_cube/main
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"values": [
"redstone_wire",

"fire",
"beetroots",
"nether_wart",
"lever",
Expand Down
1 change: 0 additions & 1 deletion data/mrcd/tags/blocks/vine_like.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"values":[
"vine",
"fire",
{"id": "glow_lichen", "required": false},
{"id": "sculk_vein", "required": false}
]
Expand Down

0 comments on commit 2f14b65

Please sign in to comment.