Skip to content

Commit

Permalink
2.0.4b
Browse files Browse the repository at this point in the history
  • Loading branch information
@ICY105
ICY105 committed Aug 18, 2018
1 parent 278aac3 commit 4541142
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 17 deletions.
8 changes: 4 additions & 4 deletions data/mechanization/functions/machines/machines/place_object.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ execute if score @s mech_data matches 2002 if entity @s[tag=mech_rot_0] run summ
execute if score @s mech_data matches 2002 if entity @s[tag=mech_rot_1] run summon armor_stand ~ ~ ~ {Tags:["mech_tree_feller","mech_reciever","mech_rotatable"],Marker:1b,Invisible:1,Invulnerable:1,NoGravity:1,DisabledSlots:2039583,Rotation:[180f,0.0f],ArmorItems:[{},{},{},{id:diamond_shovel,Count:1b,tag:{mech_power:0,mech_gridid:0,mech_data:0,Unbreakable:1,Damage:52}}]}
execute if score @s mech_data matches 2002 if entity @s[tag=mech_rot_2] run summon armor_stand ~ ~ ~ {Tags:["mech_tree_feller","mech_reciever","mech_rotatable"],Marker:1b,Invisible:1,Invulnerable:1,NoGravity:1,DisabledSlots:2039583,Rotation:[270f,0.0f],ArmorItems:[{},{},{},{id:diamond_shovel,Count:1b,tag:{mech_power:0,mech_gridid:0,mech_data:0,Unbreakable:1,Damage:52}}]}
execute if score @s mech_data matches 2002 if entity @s[tag=mech_rot_3] run summon armor_stand ~ ~ ~ {Tags:["mech_tree_feller","mech_reciever","mech_rotatable"],Marker:1b,Invisible:1,Invulnerable:1,NoGravity:1,DisabledSlots:2039583,Rotation:[0.01f,0.0f],ArmorItems:[{},{},{},{id:diamond_shovel,Count:1b,tag:{mech_power:0,mech_gridid:0,mech_data:0,Unbreakable:1,Damage:52}}]}
execute if score @s mech_data matches 2002 positioned ~ ~-0.5 ~0.23 if entity @s[tag=mech_rot_0] run summon armor_stand ~ ~ ~ {Tags:["mech_tree_feller_model","mech_rotatable"],Marker:1b,Invisible:1,Invulnerable:1,NoGravity:1,DisabledSlots:2039583,Small:1,Rotation:[0.01f,0.0f],Pose:{Head:[90f,0f,90f]},ArmorItems:[{},{},{},{id:diamond_shovel,Count:1b,tag:{Unbreakable:1,Damage:53}}]}
execute if score @s mech_data matches 2002 positioned ~-0.23 ~-0.5 ~ if entity @s[tag=mech_rot_1] run summon armor_stand ~ ~ ~ {Tags:["mech_tree_feller_model","mech_rotatable"],Marker:1b,Invisible:1,Invulnerable:1,NoGravity:1,DisabledSlots:2039583,Small:1,Rotation:[90f,0.0f],Pose:{Head:[90f,0f,90f]},ArmorItems:[{},{},{},{id:diamond_shovel,Count:1b,tag:{Unbreakable:1,Damage:53}}]}
execute if score @s mech_data matches 2002 positioned ~ ~-0.5 ~-0.23 if entity @s[tag=mech_rot_2] run summon armor_stand ~ ~ ~ {Tags:["mech_tree_feller_model","mech_rotatable"],Marker:1b,Invisible:1,Invulnerable:1,NoGravity:1,DisabledSlots:2039583,Small:1,Rotation:[180f,0.0f],Pose:{Head:[90f,0f,90f]},ArmorItems:[{},{},{},{id:diamond_shovel,Count:1b,tag:{Unbreakable:1,Damage:53}}]}
execute if score @s mech_data matches 2002 positioned ~0.23 ~-0.5 ~ if entity @s[tag=mech_rot_3] run summon armor_stand ~ ~ ~ {Tags:["mech_tree_feller_model","mech_rotatable"],Marker:1b,Invisible:1,Invulnerable:1,NoGravity:1,DisabledSlots:2039583,Small:1,Rotation:[270f,0.0f],Pose:{Head:[90f,0f,90f]},ArmorItems:[{},{},{},{id:diamond_shovel,Count:1b,tag:{Unbreakable:1,Damage:53}}]}
execute if score @s mech_data matches 2002 positioned ~ ~-0.5 ~0.23 if entity @s[tag=mech_rot_0] run summon armor_stand ~ ~ ~ {Tags:["mech_tree_feller_model"],Marker:1b,Invisible:1,Invulnerable:1,NoGravity:1,DisabledSlots:2039583,Small:1,Rotation:[0.01f,0.0f],Pose:{Head:[90f,0f,90f]},ArmorItems:[{},{},{},{id:diamond_shovel,Count:1b,tag:{Unbreakable:1,Damage:53}}]}
execute if score @s mech_data matches 2002 positioned ~-0.23 ~-0.5 ~ if entity @s[tag=mech_rot_1] run summon armor_stand ~ ~ ~ {Tags:["mech_tree_feller_model"],Marker:1b,Invisible:1,Invulnerable:1,NoGravity:1,DisabledSlots:2039583,Small:1,Rotation:[90f,0.0f],Pose:{Head:[90f,0f,90f]},ArmorItems:[{},{},{},{id:diamond_shovel,Count:1b,tag:{Unbreakable:1,Damage:53}}]}
execute if score @s mech_data matches 2002 positioned ~ ~-0.5 ~-0.23 if entity @s[tag=mech_rot_2] run summon armor_stand ~ ~ ~ {Tags:["mech_tree_feller_model"],Marker:1b,Invisible:1,Invulnerable:1,NoGravity:1,DisabledSlots:2039583,Small:1,Rotation:[180f,0.0f],Pose:{Head:[90f,0f,90f]},ArmorItems:[{},{},{},{id:diamond_shovel,Count:1b,tag:{Unbreakable:1,Damage:53}}]}
execute if score @s mech_data matches 2002 positioned ~0.23 ~-0.5 ~ if entity @s[tag=mech_rot_3] run summon armor_stand ~ ~ ~ {Tags:["mech_tree_feller_model"],Marker:1b,Invisible:1,Invulnerable:1,NoGravity:1,DisabledSlots:2039583,Small:1,Rotation:[270f,0.0f],Pose:{Head:[90f,0f,90f]},ArmorItems:[{},{},{},{id:diamond_shovel,Count:1b,tag:{Unbreakable:1,Damage:53}}]}
execute if score @s mech_data matches 2002 run scoreboard players set @e[tag=mech_tree_feller,distance=..0.25] mech_power 0
execute if score @s mech_data matches 2002 run setblock ~ ~ ~ minecraft:barrier

Expand Down
2 changes: 2 additions & 0 deletions data/mechanization/functions/machines/recipes/main.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ execute if block ~ ~ ~ trapped_chest{Items:[{tag:{OreDict:["blockMachineFrame1"]
execute if block ~ ~ ~ trapped_chest{Items:[{tag:{OreDict:["blockMachineFrame2"]}}]} run function mechanization:machines/recipes/recipes_t2
execute if block ~ ~ ~ trapped_chest{Items:[{tag:{OreDict:["blockMachineFrame3"]}}]} run function mechanization:machines/recipes/recipes_t3

#Spawner Mover
execute if score in_0 du_data matches 4.. if score in_2 du_data matches 4.. if score in_6 du_data matches 4.. if score in_8 du_data matches 4.. if block ~ ~ ~ trapped_chest{Items:[{Slot:2b, id:"minecraft:iron_bars"},{Slot:3b, id:"minecraft:shulker_shell"},{Slot:4b, id:"minecraft:iron_bars"},{Slot:11b, tag:{OreDict:["ingotEnder"]}},{Slot:12b, tag:{OreDict:["ingotNether"]}},{Slot:13b, tag:{OreDict:["ingotEnder"]}},{Slot:20b, id:"minecraft:iron_bars"},{Slot:21b, id:"minecraft:shulker_shell"},{Slot:22b, id:"minecraft:iron_bars"}]} run function mechanization:machines/recipes/spawner_mover



Expand Down
5 changes: 1 addition & 4 deletions data/mechanization/functions/machines/recipes/recipes_t3.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ execute if score in_0 du_data matches 4.. if score in_1 du_data matches 2.. if s
execute if score in_0 du_data matches 2.. if score in_1 du_data matches 2.. if score in_2 du_data matches 2.. if score in_3 du_data matches 2.. if score in_5 du_data matches 2.. if score in_6 du_data matches 2.. if score in_7 du_data matches 2.. if score in_8 du_data matches 2.. if block ~ ~ ~ trapped_chest{Items:[{Slot:2b, tag:{OreDict:["ingotEnder"]}},{Slot:3b, tag:{OreDict:["gemCrystalComposite"]}},{Slot:4b, tag:{OreDict:["ingotEnder"]}},{Slot:11b, tag:{OreDict:["ingotSuperConductive"]}},{Slot:12b, tag:{OreDict:["blockMachineFrame3"]}},{Slot:13b, tag:{OreDict:["ingotSuperConductive"]}},{Slot:20b, tag:{OreDict:["ingotEnder"]}},{Slot:21b, tag:{OreDict:["gemCrystalComposite"]}},{Slot:22b, tag:{OreDict:["ingotEnder"]}}]} run function mechanization:machines/recipes/chunk_loader

#Teleporter
execute if score in_0 du_data matches 2.. if score in_1 du_data matches 2.. if score in_2 du_data matches 2.. if score in_3 du_data matches 2.. if score in_5 du_data matches 2.. if score in_6 du_data matches 2.. if score in_7 du_data matches 2.. if score in_8 du_data matches 2.. if block ~ ~ ~ trapped_chest{Items:[{Slot:2b, id:"minecraft:gray_concrete"},{Slot:3b, tag:{OreDict:["gemCrystalComposite"]}},{Slot:4b, id:"minecraft:gray_concrete"},{Slot:11b, tag:{OreDict:["ingotSuperConductive"]}},{Slot:12b, tag:{OreDict:["blockMachineFrame3"]}},{Slot:13b, tag:{OreDict:["ingotSuperConductive"]}},{Slot:20b, id:"minecraft:gray_concrete"},{Slot:21b, tag:{OreDict:["gemCrystalComposite"]}},{Slot:22b, id:"minecraft:gray_concrete"}]} run function mechanization:machines/recipes/teleporter
execute if score in_0 du_data matches 2.. if score in_1 du_data matches 2.. if score in_2 du_data matches 2.. if score in_3 du_data matches 2.. if score in_5 du_data matches 2.. if score in_6 du_data matches 2.. if score in_7 du_data matches 2.. if score in_8 du_data matches 2.. if block ~ ~ ~ trapped_chest{Items:[{Slot:2b, id:"minecraft:gray_concrete"},{Slot:3b, tag:{OreDict:["gemCrystalComposite"]}},{Slot:4b, id:"minecraft:gray_concrete"},{Slot:11b, tag:{OreDict:["ingotSuperConductive"]}},{Slot:12b, tag:{OreDict:["blockMachineFrame3"]}},{Slot:13b, tag:{OreDict:["ingotSuperConductive"]}},{Slot:20b, id:"minecraft:gray_concrete"},{Slot:21b, tag:{OreDict:["ingotEnder"]}},{Slot:22b, id:"minecraft:gray_concrete"}]} run function mechanization:machines/recipes/teleporter

#Spawner Controller
execute if score in_3 du_data matches 2.. if score in_5 du_data matches 2.. if block ~ ~ ~ trapped_chest{Items:[{Slot:2b, id:"minecraft:wither_skeleton_skull"},{Slot:3b, tag:{OreDict:["ingotNether"]}},{Slot:4b, id:"minecraft:wither_skeleton_skull"},{Slot:11b, tag:{OreDict:["ingotSuperConductive"]}},{Slot:12b, tag:{OreDict:["blockMachineFrame3"]}},{Slot:13b, tag:{OreDict:["ingotSuperConductive"]}},{Slot:20b, id:"minecraft:wither_skeleton_skull"},{Slot:21b, tag:{OreDict:["ingotNether"]}},{Slot:22b, id:"minecraft:wither_skeleton_skull"}]} run function mechanization:machines/recipes/spawner_controller
Expand All @@ -21,6 +21,3 @@ execute if score in_0 du_data matches 2.. if score in_1 du_data matches 4.. if s

#Ender Generator
execute if score in_0 du_data matches 2.. if score in_2 du_data matches 2.. if score in_3 du_data matches 2.. if score in_5 du_data matches 2.. if score in_6 du_data matches 2.. if score in_8 du_data matches 2.. if block ~ ~ ~ trapped_chest{Items:[{Slot:2b, id:"minecraft:purpur_block"},{Slot:3b, tag:{OreDict:["ingotEnder"]}},{Slot:4b, id:"minecraft:purpur_block"},{Slot:11b, tag:{OreDict:["ingotSuperConductive"]}},{Slot:12b, tag:{OreDict:["blockMachineFrame3"]}},{Slot:13b, tag:{OreDict:["ingotSuperConductive"]}},{Slot:20b, id:"minecraft:purpur_block"},{Slot:21b, id:"minecraft:furnace"},{Slot:22b, id:"minecraft:purpur_block"}]} run function mechanization:machines/recipes/ender_generator

#Spawner Mover
execute if score in_0 du_data matches 4.. if score in_2 du_data matches 4.. if score in_6 du_data matches 4.. if score in_8 du_data matches 4.. if block ~ ~ ~ trapped_chest{Items:[{Slot:2b, id:"minecraft:iron_bars"},{Slot:3b, id:"minecraft:shulker_shell"},{Slot:4b, id:"minecraft:iron_bars"},{Slot:11b, tag:{OreDict:["ingotEnder"]}},{Slot:12b, tag:{OreDict:["ingotNether"]}},{Slot:13b, tag:{OreDict:["ingotEnder"]}},{Slot:20b, id:"minecraft:iron_bars"},{Slot:21b, id:"minecraft:shulker_shell"},{Slot:22b, id:"minecraft:iron_bars"}]} run function mechanization:machines/recipes/spawner_mover
19 changes: 19 additions & 0 deletions data/mechanization/functions/machines/tools/rotate_tree_feller_model.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

execute as @s[nbt={Rotation:[-90f,0f]}] run data merge entity @s {Rotation:[270f,0f]}
execute as @s[nbt={Rotation:[-180f,0f]}] run data merge entity @s {Rotation:[180f,0f]}
execute as @s[nbt={Rotation:[-270f,0f]}] run data merge entity @s {Rotation:[90f,0f]}
execute as @s[nbt={Rotation:[-359.99f,0f]}] run data merge entity @s {Rotation:[0.01f,0f]}

execute as @s[nbt={Rotation:[270f,0f]}] run data merge entity @s {Rotation:[-0.01f,0f]}
execute as @s[nbt={Rotation:[180f,0f]}] run data merge entity @s {Rotation:[270f,0f]}
execute as @s[nbt={Rotation:[90f,0f]}] run data merge entity @s {Rotation:[180f,0f]}
execute as @s[nbt={Rotation:[0.01f,0f]}] run data merge entity @s {Rotation:[90f,0f]}
execute as @s[nbt={Rotation:[-0.01f,0f]}] run data merge entity @s {Rotation:[0.01f,0f]}

execute if entity @s[nbt={Rotation:[270f,0f]}] align xyz positioned ~0.5 ~ ~0.5 run tp @s ~0.2 ~ ~
execute if entity @s[nbt={Rotation:[180f,0f]}] align xyz positioned ~0.5 ~ ~0.5 run tp @s ~ ~ ~-0.2
execute if entity @s[nbt={Rotation:[90f,0f]}] align xyz positioned ~0.5 ~ ~0.5 run tp @s ~-0.2 ~ ~
execute if entity @s[nbt={Rotation:[0.01f,0f]}] align xyz positioned ~0.5 ~ ~0.5 run tp @s ~ ~ ~0.2

execute if entity @s[nbt={Rotation:[-180f,0f]}] run data merge entity @s {Rotation:[180f,0f]}
execute if entity @s[nbt={Rotation:[-90f,0f]}] run data merge entity @s {Rotation:[270f,0f]}
9 changes: 1 addition & 8 deletions data/mechanization/functions/machines/tools/wrench_function.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
#Tree Feller
execute as @e[tag=mech_tree_feller_model,nbt={Rotation:[270f,0f]},distance=..0.75] at @s run tp @s ~0.23 ~ ~0.23
execute as @e[tag=mech_tree_feller_model,nbt={Rotation:[180f,0f]},distance=..0.75] at @s run tp @s ~0.23 ~ ~-0.23
execute as @e[tag=mech_tree_feller_model,nbt={Rotation:[90f,0f]},distance=..0.75] at @s run tp @s ~-0.23 ~ ~-0.23
execute as @e[tag=mech_tree_feller_model,nbt={Rotation:[0.01f,0f]},distance=..0.75] at @s run tp @s ~-0.23 ~ ~0.23

execute as @e[tag=mech_tree_feller_model,nbt={Rotation:[-180f,0f]},distance=..0.75] at @s run data merge entity @s {Rotation:[180f,0f]}
execute as @e[tag=mech_tree_feller_model,nbt={Rotation:[-90f,0f]},distance=..0.75] at @s run data merge entity @s {Rotation:[270f,0f]}
execute as @e[tag=mech_tree_feller_model,distance=..0.75] at @s run function mechanization:machines/tools/rotate_tree_feller_model
3 changes: 2 additions & 1 deletion data/mechanization/functions/start.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ team modify mech_nopush collisionRule never
#scoreboard values setup
scoreboard players set con_10 mech_data 10

#marks spawn chunks
#set up ore gen
scoreboard objectives add du_data dummy
scoreboard players set worldgen du_data 1

#sets up dimensional chunk loading
Expand Down

0 comments on commit 4541142

Please sign in to comment.