Merge pull request #18 from Flubberschnub/indev

Indev jets to master

data/aestd.core/functions/storage/v1_setup.mcfunction

@@ -2,12 +2,12 @@
 # Version: 19w42a
 # Project: AESTD
 
-data merge storage aestd:core {Version: {aestd:{}, Functions: {"block/get_block_id": 1, "block/highlight_block": 1, "block/load": 1, "block/randomize_structure_block": 1, "block/save": 1, "block/set_skull_owner": 1, "context/get_biome": 1, "context/get_dimension": 1, "context/get_light_level": 1, "context/get_position": 1, "context/get_position_scale50": 1, "context/get_rotation": 1, "context/get_structure": 1, "context/load_chunk": 1, "entity/anger": 1, "entity/damage": 1, "entity/fake_damage": 1, "entity/get_direction": 1, "entity/get_direction_magnitude": 1, "entity/get_distance": 1, "entity/get_motion": 1, "entity/get_motion_magnitude": 1, "entity/get_position": 1, "entity/get_position_scale50": 1, "entity/get_rotation": 1, "entity/get_uuid": 1, "entity/knockback": 1, "entity/offset_position": 1, "entity/set_direction": 1, "entity/set_direction_from_position": 1, "entity/set_direction_from_rotation": 1, "entity/set_direction_magnitude": 1, "entity/set_head": 1, "entity/set_head_to_block": 1, "entity/set_motion": 1, "entity/set_motion_from_position": 1, "entity/set_motion_from_rotation": 1, "entity/set_motion_magnitude": 1, "entity/set_position": 1, "entity/set_position_scale50": 1, "entity/set_rotation": 1, "entity/shoot_arrow": 1, "entity/shoot_egg": 1, "entity/shoot_fireball": 1, "entity/shoot_snowball": 1, "entity/shoot_trident": 1, "entity/teleport_surface": 1, "entity/teleport_to_chunk_corner": 1, "entity/projectile/set_owner_uuid": 1, "entity/villager/zombify": 1, "entity/villager/resupply": 1, "entity/wandering_trader/set_wandertarget_position": 1, "entity/wolf/tame": 1, "entity/zombie/drown": 1, "entity/zombie_villager/cure": 1, "item/add_count": 1, "item/add_custom_model_data": 1, "item/add_damage": 1, "item/add_enchantment": 1, "item/add_lore": 1, "item/break": 1, "item/get_max_durability": 1, "item/load": 1, "item/merge_nbt": 1, "item/remove_attribute_modifiers": 1, "item/remove_data": 1, "item/remove_enchantments": 1, "item/remove_lore": 1, "item/save": 1, "item/set_block_id": 1, "item/set_count": 1, "item/set_custom_model_data": 1, "item/set_damage": 1, "item/set_nbt": 1, "item/swap": 1, "math/absolute": 1, "math/cos": 1, "math/get_vector_magnitude": 1, "math/linear_interpolation": 1, "math/perlin_noise": 1, "math/power": 1, "math/random": 1, "math/random_lcg": 1, "math/random_range": 1, "math/random_range_lcg": 1, "math/set_vector_magnitude": 1, "math/sin": 1, "math/smoothstep": 1, "math/square_root": 1, "math/ticks_to_time": 1, "player/get_block_looking_at": 1, "player/get_name": 1, "player/get_spawnpoint": 1, "player/get_uuid": 1, "player/set_experience_levels": 1, "player/set_head": 1, "player/set_position": 1, "player/set_position_scale50": 1, "player/set_rotation": 1, "player/teleport_surface": 1, "player/teleport_to_chunk_corner": 1, "world/add_marker": 1, "world/get_daytime": 1, "world/get_moon_phase": 1, "world/get_weather": 1, "world/remove_time": 1, "world/set_time": 1}}}
+data merge storage aestd:core {Version: {aestd:{}, Functions: {"block/get_block_id": 1, "block/highlight_block": 1, "block/load": 1, "block/randomize_structure_block": 1, "block/save": 1, "block/set_skull_owner": 1, "context/get_biome": 1, "context/get_dimension": 1, "context/get_light_level": 1, "context/get_position": 1, "context/get_position_scale50": 1, "context/get_rotation": 1, "context/get_structure": 1, "context/load_chunk": 1, "entity/anger": 1, "entity/damage": 1, "entity/fake_damage": 1, "entity/get_direction": 1, "entity/get_direction_magnitude": 1, "entity/get_distance": 1, "entity/get_motion": 1, "entity/get_motion_magnitude": 1, "entity/get_position": 1, "entity/get_position_scale50": 1, "entity/get_rotation": 1, "entity/get_uuid": 1, "entity/knockback": 1, "entity/offset_position": 1, "entity/set_direction": 1, "entity/set_direction_from_position": 1, "entity/set_direction_from_rotation": 1, "entity/set_direction_magnitude": 1, "entity/set_head": 1, "entity/set_head_to_block": 1, "entity/set_motion": 1, "entity/set_motion_from_position": 1, "entity/set_motion_from_position2d": 1, "entity/set_motion_from_rotation": 1, "entity/set_motion_from_rotation2d": 1, "entity/set_motion_magnitude": 1, "entity/set_position": 1, "entity/set_position_scale50": 1, "entity/set_rotation": 1, "entity/shoot_arrow": 1, "entity/shoot_egg": 1, "entity/shoot_fireball": 1, "entity/shoot_snowball": 1, "entity/shoot_trident": 1, "entity/teleport_surface": 1, "entity/teleport_to_chunk_corner": 1, "entity/projectile/set_owner_uuid": 1, "entity/villager/zombify": 1, "entity/villager/resupply": 1, "entity/wandering_trader/set_wandertarget_position": 1, "entity/wolf/tame": 1, "entity/zombie/drown": 1, "entity/zombie_villager/cure": 1, "item/add_count": 1, "item/add_custom_model_data": 1, "item/add_damage": 1, "item/add_enchantment": 1, "item/add_lore": 1, "item/break": 1, "item/get_max_durability": 1, "item/load": 1, "item/merge_nbt": 1, "item/remove_attribute_modifiers": 1, "item/remove_data": 1, "item/remove_enchantments": 1, "item/remove_lore": 1, "item/save": 1, "item/set_block_id": 1, "item/set_count": 1, "item/set_custom_model_data": 1, "item/set_damage": 1, "item/set_nbt": 1, "item/swap": 1, "math/absolute": 1, "math/cos": 1, "math/get_vector_magnitude": 1, "math/linear_interpolation": 1, "math/perlin_noise": 1, "math/power": 1, "math/random": 1, "math/random_lcg": 1, "math/random_range": 1, "math/random_range_lcg": 1, "math/set_vector_magnitude": 1, "math/sin": 1, "math/smoothstep": 1, "math/square_root": 1, "math/ticks_to_time": 1, "player/get_block_looking_at": 1, "player/get_name": 1, "player/get_spawnpoint": 1, "player/get_uuid": 1, "player/set_experience_levels": 1, "player/set_head": 1, "player/set_position": 1, "player/set_position_scale50": 1, "player/set_rotation": 1, "player/teleport_surface": 1, "player/teleport_to_chunk_corner": 1, "world/add_marker": 1, "world/get_daytime": 1, "world/get_moon_phase": 1, "world/get_weather": 1, "world/remove_time": 1, "world/set_time": 1}}}
 data merge storage aestd:data {UUID: {Least: 0L, Most: 0L, String: ""}, Item: {}, Inventory: [], PlayerName: ""}
 data merge storage aestd:input {String: "", nbt: {}}
 
 execute store result storage aestd:core Version.aestd.pack int 1 run scoreboard players get #aestd.version aestd.version
 execute store result storage aestd:core Version.aestd.storage int 1 run scoreboard players get #aestd.storage aestd.version
 execute store result storage aestd:core Version.aestd.scoreboard int 1 run scoreboard players get #aestd.scoreboard_version aestd.version
 execute store result storage aestd:core Version.aestd.save_chunk int 1 run scoreboard players get #aestd.save_chunk_version aestd.version
-execute store result storage aestd:core Version.aestd.function_library int 1 run scoreboard players get #aestd.function_library_version aestd.version
+execute store result storage aestd:core Version.aestd.function_library int 1 run scoreboard players get #aestd.function_library_version aestd.version

data/aestd.private/functions/lib1/entity/set_motion_from_position2d/check_v1.mcfunction

@@ -0,0 +1 @@
+execute if data storage aestd:core {Version:{Functions:{"entity/set_motion_from_position2d": 1}}} run function aestd.private:lib1/entity/set_motion_from_position2d/v1

data/aestd.private/functions/lib1/entity/set_motion_from_position2d/v1.mcfunction

@@ -0,0 +1,22 @@
+# Author: Aeldrion
+# Version: 19w42a
+# Project: AESTD
+
+# Get coordinates
+function aestd1:context/get_position_scale50
+function aestd1:entity/get_position_scale50
+
+# Calculate delta
+execute store result score @s aestd.math.var run scoreboard players operation #aestd aestd.pos.x -= @s aestd.pos.x
+execute store result score @s aestd.math.var2 run scoreboard players operation #aestd aestd.pos.y -= @s aestd.pos.y
+execute store result score @s aestd.math.var3 run scoreboard players operation #aestd aestd.pos.z -= @s aestd.pos.z
+
+# Truncate pos (Motion caps at 10 and resets values above 10 to 0)
+scoreboard players set @s[scores={aestd.math.var=2000..}] aestd.math.var 2000
+scoreboard players set @s[scores={aestd.math.var2=2000..}] aestd.math.var2 2000
+scoreboard players set @s[scores={aestd.math.var3=2000..}] aestd.math.var3 2000
+
+# Set motion
+execute store result entity @s Motion[0] double 0.005 run scoreboard players get @s aestd.math.var
+execute store result entity @s Motion[1] double 0.005 run scoreboard players get @s aestd.math.var2
+execute store result entity @s Motion[2] double 0.005 run scoreboard players get @s aestd.math.var3

data/aestd.private/functions/lib1/entity/set_motion_from_rotation2d/check_v1.mcfunction

@@ -0,0 +1 @@
+execute if data storage aestd:core {Version:{Functions:{"entity/set_motion_from_rotation2d": 1}}} run function aestd.private:lib1/entity/set_motion_from_rotation2d/v1

data/aestd.private/functions/lib1/entity/set_motion_from_rotation2d/v1.mcfunction

@@ -0,0 +1,5 @@
+# Author: Aeldrion
+# Version: 19w42a
+# Project: AESTD
+
+execute positioned as @s positioned ^ ^ ^5 run function aestd1:entity/set_motion_from_position2d

data/aestd.private/tags/functions/lib1/entity/set_motion_from_position2d.json

@@ -0,0 +1,5 @@
+{
+ "values": [
+     "aestd.private:lib1/entity/set_motion_from_position2d/check_v1"
+   ]
+}

data/aestd.private/tags/functions/lib1/entity/set_motion_from_rotation2d.json

@@ -0,0 +1,5 @@
+{
+ "values": [
+     "aestd.private:lib1/entity/set_motion_from_rotation2d/check_v1"
+   ]
+}

data/aestd1/functions/entity/set_motion_from_position2d.mcfunction

@@ -0,0 +1,10 @@
+# Author: Aeldrion
+# Version: 19w42a
+# Project: AESTD v1.0
+
+# Sets the motion of the executing entity towards the context position
+# The magnitude of the motion vector is defined by distance to context position
+# Further than 40 blocks away, direction is not guaranteed to be exact due to Motion resetting values above 10
+# WARNING: Does not work on players
+
+function #aestd.private:lib1/entity/set_motion_from_position2d

data/aestd1/functions/entity/set_motion_from_rotation2d.mcfunction

@@ -0,0 +1,8 @@
+# Author: Aeldrion
+# Version: 19w42a
+# Project: AESTD v1.0
+
+# Sets the motion of the executing entity following context rotation
+# WARNING: Does not work on players
+
+function #aestd.private:lib1/entity/set_motion_from_rotation2d

data/lc/functions/bikecontrols/give.mcfunction

@@ -1,2 +1,2 @@
-replaceitem entity @s[predicate=!lc:inventory/is_holding_item] weapon.mainhand minecraft:carrot_on_a_stick{display:{Name:'{"text":"Activator","color":"#A3CDDA","bold":false,"italic":false}',Lore:['{"text":"Light Cycle Activator Control","color":"dark_gray","italic":false}']},Unbreakable:1b,CustomModelData:787,Baton:1,Closed:0,Accelerator:1,BikeControl:1} 1
+replaceitem entity @s[predicate=!lc:inventory/is_holding_item] weapon.mainhand minecraft:carrot_on_a_stick{display:{Name:'{"text":"Activator","color":"#A3CDDA","bold":false,"italic":false}',Lore:['{"text":"Light Cycle Activator Control","color":"dark_gray","italic":false}']},Unbreakable:1b,CustomModelData:787,Baton:1,Closed:0,Accelerator:1,BikeControl:1,VehicleType:1} 1
 #replaceitem entity @s[predicate=!lc:inventory/is_holding_offhand_item] weapon.offhand minecraft:carrot_on_a_stick{display:{Name:'{"text":"Brake","color":"#a12e2e","bold":false,"italic":false}',Lore:['{"text":"Light Cycle Brake Control","color":"dark_gray","italic":false}']},Unbreakable:1b,CustomModelData:788,Baton:1,Closed:0,Brake:1,BikeControl:1} 1

data/lc/functions/main.mcfunction

@@ -12,15 +12,12 @@ execute as @a[predicate=lc:lc/holdingclosedbaton,predicate=!lc:lc/riding_cycle,t
 
 execute as @a[predicate=lc:lc/holdingclosedbaton,tag=!rezzedvehicle] store result score @s CycleID run data get entity @s SelectedItem.tag.CycleID 1
 
-##remove rezzedvehicle tag
-execute as @a[tag=rezzedvehicle] at @s run function lc:match/player/removerezzedtag
-
 ##player cycleType
 scoreboard players reset @a[tag=!rezzedvehicle] CycleType
 execute as @a[predicate=lc:lc/holdingclosedbaton,tag=!rezzedvehicle] store result score @s CycleType run data get entity @s SelectedItem.tag.CycleType 1
 
 ##player color
-execute as @a run function lc:color/batoncolor/tick
+#execute as @a run function lc:color/batoncolor/tick
 
 ##rez animations
 execute as @e[tag=rezzing,tag=cyclestand] at @s run function lc:rez/animate/tick
@@ -38,6 +35,3 @@ execute as @e[tag=playerfacing] run data merge entity @s {Age:0}
 
 ##rez and de-rez
 execute as @a[predicate=lc:lc/holdingclosedbaton,scores={clickbaton=1..},predicate=!lc:lc/riding_cycle,tag=!rezzedvehicle] at @s rotated ~ 0 anchored feet positioned ^ ^ ^2 run function lc:rez/rezzing
-
-##boost reset
-execute as @a[scores={clickbaton=1..}] run scoreboard players reset @s clickbaton

data/lc/functions/motion/collision/movingderez.mcfunction

@@ -7,6 +7,8 @@ execute at @s rotated ~90 ~ run particle flash ^ ^ ^2 0 0 0 0 1 force
 execute at @s rotated ~90 ~ run particle smoke ^ ^1 ^2 0 0 0 0.1 100 force
 execute at @s rotated ~90 ~ run particle firework ^ ^1 ^2 0 0 0 0.5 200 force
 execute at @s rotated ~90 ~ run particle explosion_emitter ^ ^1 ^2 0 0 0 0.1 1 force
+execute at @s unless score @s circuitcolor matches 2.. run particle item light_blue_dye{CustomModelData:4} ~ ~1 ~ 0.3 0.6 0.3 0.3 1000 force
+execute at @s if score @s circuitcolor matches 2 run particle item orange_dye{CustomModelData:4} ~ ~1 ~ 0.3 0.6 0.3 0.3 1000 force
 effect give @e[distance=..2] instant_damage 1 1 true
 kill @e[tag=matchedid,tag=cyclecart]
 tag @s add derezzing

data/lc/functions/motion/tick.mcfunction

@@ -32,3 +32,4 @@ execute as @e[tag=cyclestand,tag=matchedid] unless entity @a[tag=matchedid,predi
 ##fall discance derez
 
 execute as @e[tag=cyclestand,tag=matchedid] if score FallDistance Constant matches 50.. run function lc:derez/forcederez
+execute at @e[tag=jetcollider,tag=matchedid,tag=gunhit,tag=!derezzing] run function lj:motion/collision/movingderez

data/lc/functions/rez/batons/4.mcfunction

@@ -1,2 +1,2 @@
-execute unless score @s circuitcolor matches 2.. run summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"4th Generation Cycle","color":"dark_gray","italic":true}']},CustomModelData:4,Baton:1,CycleType:4,Closed:1}}}
-execute if score @s circuitcolor matches 2 run summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"4th Generation Cycle","color":"dark_gray","italic":true}']},CustomModelData:42,Baton:1,CycleType:4,Closed:1}}}
+execute unless score @s circuitcolor matches 2.. run summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"4th Generation Cycle","color":"dark_gray","italic":true}']},CustomModelData:4,Baton:1,CycleType:4,Closed:1,VehicleType:1}}}
+execute if score @s circuitcolor matches 2 run summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"4th Generation Cycle","color":"dark_gray","italic":true}']},CustomModelData:42,Baton:1,CycleType:4,Closed:1,VehicleType:1}}}

data/lc/functions/rez/batons/5.mcfunction

@@ -1,2 +1,2 @@
-execute unless score @s circuitcolor matches 2.. run summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"5th Generation Cycle","color":"dark_gray","italic":true}']},CustomModelData:5,Baton:1,CycleType:5,Closed:1}}}
-execute if score @s circuitcolor matches 2 run summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"5th Generation Cycle","color":"dark_gray","italic":true}']},CustomModelData:52,Baton:1,CycleType:5,Closed:1}}}
+execute unless score @s circuitcolor matches 2.. run summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"5th Generation Cycle","color":"dark_gray","italic":true}']},CustomModelData:5,Baton:1,CycleType:5,Closed:1,VehicleType:1}}}
+execute if score @s circuitcolor matches 2 run summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"5th Generation Cycle","color":"dark_gray","italic":true}']},CustomModelData:52,Baton:1,CycleType:5,Closed:1,VehicleType:1}}}

data/lc/functions/rez/batons/73.mcfunction

@@ -1 +1 @@
-summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"D-73","color":"dark_gray","italic":true}']},CustomModelData:4,Baton:1,CycleType:73,Closed:1}}}
+summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"D-73","color":"dark_gray","italic":true}']},CustomModelData:4,Baton:1,CycleType:73,Closed:1,VehicleType:1}}}

data/lc/functions/rez/batons/786.mcfunction

@@ -1 +1 @@
-summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"Encom 786","color":"dark_gray","italic":true}']},CustomModelData:786,Baton:1,CycleType:786,Closed:1}}}
+summon minecraft:item ~ ~ ~ {Item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{display:{Name:'{"text":"Light Baton","color":"gray","bold":true,"italic":false}',Lore:['{"text":"Encom 786","color":"dark_gray","italic":true}']},CustomModelData:786,Baton:1,CycleType:786,Closed:1,VehicleType:1}}}

data/lc/functions/rezzedcycle.mcfunction

@@ -1,10 +1,4 @@
 
-##rider effects
-effect give @a[predicate=lc:lc/riding_cycle] invisibility 1 0 true
-effect give @a[predicate=lc:lc/riding_cycle] jump_boost 1 20 true
-effect clear @a[tag=rezzedvehicle,predicate=!lc:lc/riding_cycle] invisibility
-effect clear @a[tag=rezzedvehicle,predicate=!lc:lc/riding_cycle] jump_boost
-#execute at @a[predicate=lc:lc/riding_cycle] run particle barrier ~ ~ ~ 0 0 0 0 1
 
 ##invisible minecart
 execute as @e[type=#minecraft:minecarts,tag=!invisible_minecart] run function lc:invisicarts
@@ -25,6 +19,7 @@ execute as @e[tag=cyclecollider,nbt={HurtTime:10s}] at @s run function lc:match/
 
 ##de-rez in water
 execute as @e[tag=cyclecollider,tag=!derezzing] at @s if block ~ ~ ~ minecraft:water run function lc:match/cyclecollider/forcederez
+execute as @e[tag=cyclecollider,tag=!derezzing] at @s if block ~ ~ ~ minecraft:lava run function lc:match/cyclecollider/forcederez
 
 execute as @e[tag=cyclestand,tag=derezzing] at @s run function lc:derez/animate/tick
 
@@ -35,7 +30,3 @@ execute as @a[tag=derezcycle,predicate=!lc:lc/riding_cycle] at @s run function l
 
 ##sounds
 execute as @e[tag=cyclestand] at @s run function lc:sounds/cycle
-
-##ribbon lifetimer
-execute as @e[tag=lightribbon] run scoreboard players add @s ribbontimer 1
-execute as @e[tag=lightribbon] if score @s ribbontimer >= maxtimer ribbontimer run kill @s

data/lc/predicates/lc/holdingbaton.json

@@ -5,7 +5,7 @@
     "equipment": {
       "mainhand": {
         "item": "carrot_on_a_stick",
-        "nbt": "{Baton:1}"
+        "nbt": "{Baton:1,VehicleType:1}"
       }
     }
   }

data/lc/predicates/lc/holdingclosedbaton.json

@@ -5,7 +5,7 @@
     "equipment": {
       "mainhand": {
         "item": "carrot_on_a_stick",
-        "nbt": "{Baton:1,Closed:1}"
+        "nbt": "{Baton:1,Closed:1,VehicleType:1}"
       }
     }
   }

data/lc/predicates/lc/holdingcontrols.json

@@ -5,7 +5,7 @@
     "equipment": {
       "mainhand": {
         "item": "carrot_on_a_stick",
-        "nbt": "{Baton:1,Closed:0,BikeControl:1}"
+        "nbt": "{Baton:1,Closed:0,BikeControl:1,VehicleType:1}"
       }
     }
   }

data/lc/predicates/lc/holdingopenbaton.json

@@ -5,7 +5,7 @@
     "equipment": {
       "mainhand": {
         "item": "carrot_on_a_stick",
-        "nbt": "{Baton:1,Closed:0}"
+        "nbt": "{Baton:1,Closed:0,VehicleType:1}"
       }
     }
   }

data/lc/tags/blocks/passthrough.json

@@ -36,6 +36,7 @@
     "minecraft:weeping_vines",
     "minecraft:twisting_vines",
     "minecraft:sugar_cane",
+		"minecraft:snow",
     "minecraft:kelp",
     "minecraft:torch",
     "minecraft:ladder",

data/lj/functions/color/batoncolor/4/blue.mcfunction

@@ -0,0 +1,5 @@
+##blue baton
+scoreboard players set @s aestd.item.cmd 4
+scoreboard players set @s aestd.item.slot -1
+function aestd1:item/set_custom_model_data
+tag @s add batoncolormatch

data/lj/functions/color/batoncolor/4/match.mcfunction

@@ -0,0 +1,3 @@
+##match color
+execute unless score @s circuitcolor matches 2.. run function lj:color/batoncolor/4/blue
+execute if score @s circuitcolor matches 2 run function lj:color/batoncolor/4/orange

data/lj/functions/color/batoncolor/4/orange.mcfunction

@@ -0,0 +1,5 @@
+##blue baton
+scoreboard players set @s aestd.item.cmd 42
+scoreboard players set @s aestd.item.slot -1
+function aestd1:item/set_custom_model_data
+tag @s add batoncolormatch

data/lj/functions/color/batoncolor/match.mcfunction

@@ -0,0 +1,2 @@
+##batoncolor match
+execute if score @s JetType matches 4 run function lj:color/batoncolor/4/match