Skip to content

Commit

Permalink
Add 0.4.0 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@LyricLy
LyricLy committed Jan 6, 2023
1 parent 108abe3 commit 2ae3066
Show file tree
Hide file tree
Showing 103 changed files with 2,521 additions and 1,613 deletions.
68 changes: 47 additions & 21 deletions data/carminite/functions/block/blockmain.mcfunction
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions data/carminite/functions/block/break/carminitecharger.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
kill @s
data merge entity @e[limit=1,type=item,distance=..2,nbt={PickupDelay:10s,Item:{id:"minecraft:redstone_lamp"}}] {Item:{id:"minecraft:dropper",Count:1b,tag:{display:{Name:'{"translate":"block.carminite.carminite_charger","italic":"false"}'},CustomModelData:552000,CustomItemId:"carminite:carminite_charger",BlockEntityTag:{Items:[{id:"minecraft:barrier",Count:1b,tag:{carminite:{placed_block:1b,type:"carminite:carminite_charger"}}}]}}}}
data merge entity @e[limit=1,type=item,distance=..2,nbt={PickupDelay:9s,Item:{id:"minecraft:redstone_lamp"}}] {Item:{id:"minecraft:dropper",Count:1b,tag:{display:{Name:'{"translate":"block.carminite.carminite_charger","italic":"false"}'},CustomModelData:552000,CustomItemId:"carminite:carminite_charger",BlockEntityTag:{Items:[{id:"minecraft:barrier",Count:1b,tag:{carminite:{placed_block:1b,type:"carminite:carminite_charger"}}}]}}}}
3 changes: 3 additions & 0 deletions data/carminite/functions/block/break/entangloporter.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
kill @s
data merge entity @e[limit=1,type=item,distance=..2,nbt={PickupDelay:10s,Item:{id:"minecraft:iron_block"}}] {Item:{id:"minecraft:dropper",Count:1b,tag:{display:{Name:'{"translate":"block.carminite.carminite_entangloporter","italic":"false"}'},CustomModelData:552100,CustomItemId:"carminite:carminite_entangloporter",BlockEntityTag:{Items:[{id:"minecraft:barrier",Count:1b,tag:{carminite:{placed_block:1b,type:"carminite:carminite_entangloporter"}}}]}}}}
data merge entity @e[limit=1,type=item,distance=..2,nbt={PickupDelay:9s,Item:{id:"minecraft:iron_block"}}] {Item:{id:"minecraft:dropper",Count:1b,tag:{display:{Name:'{"translate":"block.carminite.carminite_entangloporter","italic":"false"}'},CustomModelData:552100,CustomItemId:"carminite:carminite_entangloporter",BlockEntityTag:{Items:[{id:"minecraft:barrier",Count:1b,tag:{carminite:{placed_block:1b,type:"carminite:carminite_entangloporter"}}}]}}}}
3 changes: 3 additions & 0 deletions data/carminite/functions/block/break/itemvacuum.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
kill @s
data merge entity @e[limit=1,type=item,distance=..2,nbt={PickupDelay:10s,Item:{id:"minecraft:redstone_lamp"}}] {Item:{id:"minecraft:dropper",Count:1b,tag:{display:{Name:'{"translate":"block.carminite.item_vacuum","italic":"false"}'},CustomModelData:551900,CustomItemId:"carminite:item_vacuum",BlockEntityTag:{Items:[{id:"minecraft:barrier",Count:1b,tag:{carminite:{placed_block:1b,type:"carminite:item_vacuum"}}}]}}}}
data merge entity @e[limit=1,type=item,distance=..2,nbt={PickupDelay:9s,Item:{id:"minecraft:redstone_lamp"}}] {Item:{id:"minecraft:dropper",Count:1b,tag:{display:{Name:'{"translate":"block.carminite.item_vacuum","italic":"false"}'},CustomModelData:551900,CustomItemId:"carminite:item_vacuum",BlockEntityTag:{Items:[{id:"minecraft:barrier",Count:1b,tag:{carminite:{placed_block:1b,type:"carminite:item_vacuum"}}}]}}}}
2 changes: 1 addition & 1 deletion data/carminite/functions/block/place/antibuilder.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
setblock ~ ~ ~ minecraft:oak_planks
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550700}}],Tags:["CarminiteBlock","Type_Anti_Builder"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b}
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550700}}],Tags:["CarminiteBlock","Type_Anti_Builder"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
execute positioned ~ ~-0.5 ~ as @e[tag=Type_Anti_Builder,limit=1,sort=nearest,distance=..0.5] positioned ~ ~0.5 ~ run function carminite:block/place/antibuilderscanning
2 changes: 1 addition & 1 deletion data/carminite/functions/block/place/antibuilt.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
playsound minecraft:block.stone.place block @a ~ ~ ~ 1 0.9
setblock ~ ~ ~ minecraft:basalt
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550701}}],Tags:["CarminiteBlock","Type_Anti_Built"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b}
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550701}}],Tags:["CarminiteBlock","Type_Anti_Built"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 1 addition & 1 deletion data/carminite/functions/block/place/carminiteblock.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
setblock ~ ~ ~ iron_block
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550200}}],Tags:["CarminiteBlock","Type_Carminite_Block"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b}
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550200}}],Tags:["CarminiteBlock","Type_Carminite_Block"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 1 addition & 1 deletion data/carminite/functions/block/place/carminitebuilder.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
setblock ~ ~ ~ minecraft:redstone_lamp
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550800,CursorPos:[0,0,0],UUIDCompare:[0,0,0,0]}}],Tags:["CarminiteBlock","Type_Carminite_Builder","STATE_UP","STATE2_COOLDOWN_OFF"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b}
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550800,CursorPos:[0,0,0],UUIDCompare:[0,0,0,0]}}],Tags:["CarminiteBlock","Type_Carminite_Builder","STATE_UP","STATE2_COOLDOWN_OFF"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 2 additions & 0 deletions data/carminite/functions/block/place/carminitecharger.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
setblock ~ ~ ~ minecraft:iron_block
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:552000}}],Tags:["CarminiteBlock","Type_Carminite_Charger"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 1 addition & 1 deletion data/carminite/functions/block/place/encasedfirejet.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
setblock ~ ~ ~ minecraft:redstone_lamp
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550600}}],Tags:["CarminiteBlock","Type_Encased_Fire_Jet"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b}
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550600}}],Tags:["CarminiteBlock","Type_Encased_Fire_Jet"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 1 addition & 1 deletion data/carminite/functions/block/place/encasedplanks.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
setblock ~ ~ ~ oak_planks
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550400}}],Tags:["CarminiteBlock","Type_Encased_Planks"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b}
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550400}}],Tags:["CarminiteBlock","Type_Encased_Planks"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 1 addition & 1 deletion data/carminite/functions/block/place/encasedsmoker.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
setblock ~ ~ ~ minecraft:redstone_lamp
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550500}}],Tags:["CarminiteBlock","Type_Encased_Smoker"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b}
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550500}}],Tags:["CarminiteBlock","Type_Encased_Smoker"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 2 additions & 0 deletions data/carminite/functions/block/place/entangloporter.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
setblock ~ ~ ~ minecraft:iron_block
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:552100}}],Tags:["CarminiteBlock","Type_Carminite_Entangloporter"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 1 addition & 1 deletion data/carminite/functions/block/place/ghasttrap.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
setblock ~ ~ ~ minecraft:redstone_lamp
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:551100}}],Tags:["CarminiteBlock","Type_Ghast_Trap"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b}
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:551100}}],Tags:["CarminiteBlock","Type_Ghast_Trap"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 2 additions & 0 deletions data/carminite/functions/block/place/itemvacuum.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
setblock ~ ~ ~ minecraft:redstone_lamp
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:551900}}],Tags:["CarminiteBlock","Type_Item_Vacuum"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 1 addition & 1 deletion data/carminite/functions/block/place/reappearingblock.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
setblock ~ ~ ~ oak_planks
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550900}}],Tags:["CarminiteBlock","Type_Reappearing_Block","STATE_OFF_SOLID"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b}
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550900}}],Tags:["CarminiteBlock","Type_Reappearing_Block","STATE_OFF_SOLID"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 1 addition & 1 deletion data/carminite/functions/block/place/reappearingcontroller.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
setblock ~ ~ ~ redstone_lamp
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:551000}}],Tags:["CarminiteBlock","Type_Reappearing_Controller"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b}
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:551000}}],Tags:["CarminiteBlock","Type_Reappearing_Controller"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
2 changes: 1 addition & 1 deletion data/carminite/functions/block/place/towerplanks.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
setblock ~ ~ ~ oak_planks
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550300}}],Tags:["CarminiteBlock","Type_Tower_Planks"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b}
summon armor_stand ~ ~-0.5 ~ {Fire:32767s,ArmorItems:[{},{},{},{id:"minecraft:dropper",Count:1b,tag:{CustomModelData:550300}}],Tags:["CarminiteBlock","Type_Tower_Planks"],NoGravity:1b,Invisible:1b,Marker:1b,Small:1b,Silent:1b}
Loading

0 comments on commit 2ae3066

Please sign in to comment.