-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Massive Optimizations and more fixes
- Loading branch information
Showing
61 changed files
with
104 additions
and
98 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
ExperimentalAI/data/expai_glacier_players/functions/body_alias/loop.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
execute at @s[tag=!expai_glacier_players.knockbacked] as @e[tag=GlacierPlayer.Alias_Selected,limit=1] run function expai_glacier_players:body_alias/not_knockbacked | ||
execute if entity @s[tag=expai_glacier_players.knockbacked] at @e[tag=GlacierPlayer.Alias_Selected,limit=1] run function expai_glacier_players:player/move/damaged/receive_knockback with storage expai_glacier_players.macro | ||
execute at @s[tag=!expai_glacier_players.knockbacked] as @e[limit=1,tag=GlacierPlayer.Alias_Selected] run function expai_glacier_players:body_alias/not_knockbacked | ||
execute if entity @s[tag=expai_glacier_players.knockbacked] at @e[limit=1,tag=GlacierPlayer.Alias_Selected] run function expai_glacier_players:player/move/damaged/receive_knockback with storage expai_glacier_players.macro |
2 changes: 1 addition & 1 deletion
2
ExperimentalAI/data/expai_glacier_players/functions/body_alias/not_knockbacked.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
#effect give @s invisibility infinite 1 true | ||
effect give @s invisibility infinite 1 true | ||
tp @s ~ ~ ~ ~ ~ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
ExperimentalAI/data/expai_glacier_players/functions/player/brain/damagecheck.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
ExperimentalAI/data/expai_glacier_players/functions/player/connect/connect.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
$summon armor_stand ~ ~ ~ {CustomName:'{"text":"$(connecting_name)"}',CustomNameVisible:true,PersistenceRequired:true,Tags:["GlacierPlayer","GP.Connecting"],Silent:true,Invulnerable:true,ShowArms:true} | ||
|
||
execute as @e[tag=GP.Connecting] run function expai_glacier_players:player/connect/init with storage expai_glacier_players.macro | ||
execute as @e[limit=1,tag=GP.Connecting] run function expai_glacier_players:player/connect/init with storage expai_glacier_players.macro |
2 changes: 1 addition & 1 deletion
2
ExperimentalAI/data/expai_glacier_players/functions/player/connect/init_body.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
$summon piglin_brute ~ ~ ~ {Attributes:[{Name:"generic.scale",Base:1.025},{Name:"generic.max_health",Base:20},{Name:"generic.attack_damage",Base:0},{Name:"generic.movement_speed",Base:0},{Name:"generic.jump_strength",Base:0}],Silent:true,Tags:["$(pid_num)","GlacierPlayers.Alias","expai_ai_changes_disabled"],PersistenceRequired:true,Health:20,IsImmuneToZombification:true,Team:GlacierPlayersTeam} | ||
|
||
$summon donkey ~ ~ ~ {Invulnerable:true,Silent:true,Tags:["GP.$(pid_num).InvSection1","GP_Inv.$(pid_num)","expai_ai_changes_disabled","GP.Invs","GP.Invs_Fill"],NoAI:true,ChestedHorse:true,Attributes:[{Name:"generic.scale",Base:0.1}],DeathLootTable:"minecraft:empty",PersistenceRequired:true} | ||
$summon donkey ~ ~ ~ {Invulnerable:true,Silent:true,Tags:["GP.$(pid_num).InvSection1","GP_Inv.$(pid_num)","expai_ai_changes_disabled","GP.Invs","GP.Invs_Fill",],NoAI:true,ChestedHorse:true,Attributes:[{Name:"generic.scale",Base:0.1}],DeathLootTable:"minecraft:empty",PersistenceRequired:true} | ||
|
||
execute as @e[tag=GP.Invs_Fill] run function expai_glacier_players:player/inventory/inventory_initalize |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
ExperimentalAI/data/expai_glacier_players/functions/player/disconnect/disconnect.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
$tellraw @a ["",{"text":$(disconnecting_name),"color": "yellow"},{"text": " left the game","color": "yellow"}] | ||
|
||
kill @e[tag=GlacierPlayer.Abnormal_Selected] | ||
kill @e[type=item,nbt={Age:0s,Item:{id:"minecraft:chest"}}] | ||
kill @e[limit=1,type=item,nbt={Age:0s,Item:{id:"minecraft:chest"}}] | ||
kill @e[type=item,nbt={Age:0s,Item:{id:"minecraft:debug_stick"}}] |
4 changes: 2 additions & 2 deletions
4
...imentalAI/data/expai_glacier_players/functions/player/inventory/entites/summon.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
say optimization summoner inv function ran | ||
execute unless entity @s[tag=GlacierPlayer.Second_Inventory_Summoned] as @e[tag=GP.Inventory_Selected.InvSection1,limit=1] unless items entity @s horse.7 debug_stick run function expai_glacier_players:player/inventory/entites/summon_second with storage expai_glacier_players.macro | ||
execute unless entity @s[tag=GlacierPlayer.Third_Inventory_Summoned] as @e[tag=GP.Inventory_Selected.InvSection2,limit=1] unless items entity @s horse.12 debug_stick run function expai_glacier_players:player/inventory/entites/summon_third with storage expai_glacier_players.macro | ||
execute unless entity @s[tag=GlacierPlayer.Second_Inventory_Summoned] as @e[limit=1,tag=GP.Inventory_Selected.InvSection1] unless items entity @s horse.7 debug_stick run function expai_glacier_players:player/inventory/entites/summon_second with storage expai_glacier_players.macro | ||
execute unless entity @s[tag=GlacierPlayer.Third_Inventory_Summoned] as @e[limit=1,tag=GP.Inventory_Selected.InvSection2] unless items entity @s horse.12 debug_stick run function expai_glacier_players:player/inventory/entites/summon_third with storage expai_glacier_players.macro |
4 changes: 2 additions & 2 deletions
4
...AI/data/expai_glacier_players/functions/player/inventory/entites/summon_second.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
tag @e[tag=GlacierPlayer.Player_Selected,limit=1] add GlacierPlayer.Second_Inventory_Summoned | ||
tag @e[limit=1,tag=GlacierPlayer.Player_Selected] add GlacierPlayer.Second_Inventory_Summoned | ||
$summon donkey ~ ~ ~ {Invulnerable:true,Silent:true,Tags:["GP.$(pid_num).InvSection2","GP_Inv.$(pid_num)","expai_ai_changes_disabled","GP.Invs","GP.Invs_Fill"],NoAI:true,ChestedHorse:true,Attributes:[{Name:"generic.scale",Base:0.1}],DeathLootTable:"minecraft:empty",PersistenceRequired:true} | ||
execute as @e[tag=GP.Invs_Fill,limit=1] run function expai_glacier_players:player/inventory/inventory_initalize | ||
execute as @e[limit=1,tag=GP.Invs_Fill] run function expai_glacier_players:player/inventory/inventory_initalize | ||
say second inventory initalized! |
6 changes: 3 additions & 3 deletions
6
...lAI/data/expai_glacier_players/functions/player/inventory/entites/summon_third.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
tag @e[tag=GlacierPlayer.Player_Selected,limit=1] add GlacierPlayer.Third_Inventory_Summoned | ||
tag @e[tag=GlacierPlayer.Player_Selected,limit=1] add GlacierPlayer.Full_Inventory_Summoned | ||
tag @e[limit=1,tag=GlacierPlayer.Player_Selected] add GlacierPlayer.Third_Inventory_Summoned | ||
tag @e[limit=1,tag=GlacierPlayer.Player_Selected] add GlacierPlayer.Full_Inventory_Summoned | ||
$summon donkey ~ ~ ~ {Invulnerable:true,Silent:true,Tags:["GP.$(pid_num).InvSection3","GP_Inv.$(pid_num)","expai_ai_changes_disabled","GP.Invs","GP.Invs_Fill"],NoAI:true,ChestedHorse:true,Attributes:[{Name:"generic.scale",Base:0.1}],DeathLootTable:"minecraft:empty",PersistenceRequired:true} | ||
execute as @e[tag=GP.Invs_Fill,limit=1] run function expai_glacier_players:player/inventory/inventory_initalize | ||
execute as @e[limit=1,tag=GP.Invs_Fill] run function expai_glacier_players:player/inventory/inventory_initalize | ||
say third inventory initalized! |
2 changes: 1 addition & 1 deletion
2
...I/data/expai_glacier_players/functions/player/inventory/hands/select_main_hand.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
$execute unless items entity @e[tag=GP.Inventory_Selected.InvSection1,limit=1] horse.$(item_select_hand) minecraft:debug_stick run data modify entity @s HandItems[0] set from entity @e[tag=GP.Inventory_Selected.InvSection1,limit=1] Items[$(item_select_hand)] | ||
$execute unless items entity @e[limit=1,tag=GP.Inventory_Selected.InvSection1] horse.$(item_select_hand) minecraft:debug_stick run data modify entity @s HandItems[0] set from entity @e[limit=1,tag=GP.Inventory_Selected.InvSection1] Items[$(item_select_hand)] | ||
msg @a[tag=expai.debug] main hand select |
2 changes: 1 addition & 1 deletion
2
...AI/data/expai_glacier_players/functions/player/inventory/hands/select_off_hand.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
$execute unless items entity @e[tag=GP.Inventory_Selected.InvSection1,limit=1] horse.$(item_select_hand) minecraft:debug_stick run data modify entity @s HandItems[1] set from entity @e[tag=GP.Inventory_Selected.InvSection1,limit=1] Items[$(item_select_hand)] | ||
$execute unless items entity @e[limit=1,tag=GP.Inventory_Selected.InvSection1] horse.$(item_select_hand) minecraft:debug_stick run data modify entity @s HandItems[1] set from entity @e[limit=1,tag=GP.Inventory_Selected.InvSection1] Items[$(item_select_hand)] | ||
msg @a[tag=expai.debug] off hand select |
4 changes: 2 additions & 2 deletions
4
...entalAI/data/expai_glacier_players/functions/player/inventory/inventory_gather.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
function expai_glacier_players:player/recurring_functions/set_macros_inventory with storage expai_glacier_players.macro | ||
function expai_glacier_players:player/inventory/item/reset_storages | ||
function expai_glacier_players:player/inventory/item/item_process | ||
#msg @a[tag=expai.debug] item picked | ||
execute as @e[type=item,distance=0..2,limit=1] run function expai_glacier_players:player/inventory/item/item_process | ||
msg @a[tag=expai.debug] item picked | ||
function expai_glacier_players:player/inventory/item/store |
2 changes: 1 addition & 1 deletion
2
.../data/expai_glacier_players/functions/player/inventory/inventory_gather_search.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
execute if entity @e[type=item,distance=0..2,limit=1] run function expai_glacier_players:player/inventory/inventory_gather | ||
execute if entity @e[limit=1,type=item,distance=0..2] run function expai_glacier_players:player/inventory/inventory_gather |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
ExperimentalAI/data/expai_glacier_players/functions/player/inventory/inventory_tp.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
tp @e[tag=GlacierPlayer.Inventory_Selected,limit=1] @s | ||
tp @e[limit=1,tag=GlacierPlayer.Inventory_Selected] @s |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...imentalAI/data/expai_glacier_players/functions/player/modes/idle/idle_alias_tp.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
tp @e[tag=GlacierPlayer.Alias_Selected,limit=1] @s | ||
tp @e[limit=1,tag=GlacierPlayer.Alias_Selected] @s |
2 changes: 1 addition & 1 deletion
2
ExperimentalAI/data/expai_glacier_players/functions/player/motion/inwater/swim.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
tp @s ^ ^ ^0.08 facing entity @e[tag=GlacierPlayer.DMarker_Selected,limit=1] eyes | ||
tp @s ^ ^ ^0.08 facing entity @e[limit=1,tag=GlacierPlayer.DMarker_Selected] eyes | ||
data modify storage expai_glacier_players:motion Motion_Swim set from entity @s Pos | ||
kill @s |
2 changes: 1 addition & 1 deletion
2
...entalAI/data/expai_glacier_players/functions/player/motion/inwater/swim_sprint.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
tp @s ^ ^ ^0.261 facing entity @e[tag=GlacierPlayer.DMarker_Selected,limit=1] eyes | ||
tp @s ^ ^ ^0.261 facing entity @e[limit=1,tag=GlacierPlayer.DMarker_Selected] eyes | ||
data modify storage expai_glacier_players:motion Motion_Swim_Sprint set from entity @s Pos | ||
kill @s |
2 changes: 1 addition & 1 deletion
2
...AI/data/expai_glacier_players/functions/player/move/destination_marker/reached.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
kill @e[tag=GlacierPlayer.DMarker_Selected,limit=1] | ||
kill @e[limit=1,tag=GlacierPlayer.DMarker_Selected] | ||
scoreboard players set @s expai_glacier_players.sub_mode 0 | ||
tag @s remove expai_glacier_players.summoned_dmarker |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.