Skip to content

Commit

Permalink
Massive Optimizations and more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Trunkis committed Apr 30, 2024
1 parent 994e135 commit 5ebaa93
Show file tree
Hide file tree
Showing 61 changed files with 104 additions and 98 deletions.
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
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 ~ ~ ~ ~ ~
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ scoreboard objectives add expai_glacier_players.mode dummy
scoreboard objectives add expai_glacier_players.sub_mode dummy
scoreboard objectives add expai_glacier_players.mode_time dummy
scoreboard objectives add expai_glacier_players.gamemode dummy
scoreboard objectives add expai_glacier_players.sprint_jump_delay dummy
scoreboard objectives add expai_glacier_players.poll_decision trigger
scoreboard objectives add expai_glacier_players.config dummy
scoreboard objectives add expai_glacier_players.quality_level dummy
scoreboard objectives add expai_glacier_players.config_backed dummy

scoreboard objectives add expai_glacier_players.pathfind_ray_steps dummy
Expand All @@ -41,6 +41,7 @@ scoreboard objectives add expai_glacier_players.difficulty dummy

scoreboard objectives add expai_glacier_players.tnt_fuse_timer dummy

team add GlacierPlayers.DMCanidates
team add GlacierPlayersTeam
team modify GlacierPlayersTeam collisionRule never
team modify GlacierPlayersTeam seeFriendlyInvisibles false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
##Get Health Info
execute store result score @s expai_glacier_players.previous_health run scoreboard players get @s expai_glacier_players.health
execute store result score @s expai_glacier_players.health run data get entity @e[tag=GlacierPlayer.Alias_Selected,limit=1] Health
execute store result score @s expai_glacier_players.health run data get entity @e[limit=1,tag=GlacierPlayer.Alias_Selected] Health
#If Entity on fire
execute if predicate expai_glacier_players:fire_detect run data merge entity @e[tag=GlacierPlayer.Alias_Selected,limit=1] {Fire:160s}
execute if predicate expai_glacier_players:fire_detect run data merge entity @e[limit=1,tag=GlacierPlayer.Alias_Selected] {Fire:160s}

##Previous Health > Health
execute if score @s expai_glacier_players.previous_health > @s expai_glacier_players.health run function expai_glacier_players:player/brain/damage_indicator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ function expai_glacier_players:body_alias/loop
##Get Pos
function expai_glacier_players:player/recurring_functions/get_pos

##Modes
function expai_glacier_players:player/brain/thinker_modes_init_check

##Hunger
#function expai_glacier_players:player/hunger/temp

Expand All @@ -18,5 +15,8 @@ execute rotated ~ 0 run function expai_glacier_players:player/inventory/inventor
##Damage Check
function expai_glacier_players:player/brain/damagecheck with storage minecraft:expai_glacier_players.macro

##Modes
function expai_glacier_players:player/brain/thinker_modes_init_check

##Disconnect
execute unless score #AutomaticDisconnect expai_glacier_players.config matches 1 run function expai_glacier_players:player/disconnect/disconnect_init
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ tellraw @a ["",{"selector":"@s"},{"text": " was killed"}]

kill @e[tag=GlacierPlayer.Abnormal_Selected]

kill @e[type=item,nbt={Age:0s,Item:{id:"minecraft:chest"}},limit=1]
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"}}]

function expai_glacier_players:player/death/respawn with storage expai_glacier_players.macro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ $summon piglin_brute ~ ~ ~ {Attributes:[{Name:"generic.scale",Base:1.025},{Name:

$summon armor_stand ~ ~ ~ {CustomName:'{"text":$(respawning_name)}',CustomNameVisible:true,PersistenceRequired:true,Tags:["GlacierPlayer","gp.id$(abnormal_pid_num)","expai_glacier_players.processed_id"],Silent:true,Invulnerable:true,ShowArms:true}

$execute as @e[tag=gp.id$(abnormal_pid_num),limit=1] run function expai_glacier_players:player/death/set_self with storage expai_glacier_players.macro
$execute as @e[limit=1,tag=gp.id$(abnormal_pid_num)] run function expai_glacier_players:player/death/set_self with storage expai_glacier_players.macro

$summon donkey ~ ~ ~ {Invulnerable:true,Silent:true,Tags:["GP.$(abnormal_pid_num).InvSection1","GP_Inv.$(abnormal_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
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"}}]
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
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!
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!
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ function expai_glacier_players:player/inventory/inventory_tp
execute unless entity @s[tag=GlacierPlayer.Pickup_Delayed] at @s run function expai_glacier_players:player/inventory/inventory_gather_search
##Switch HandItems
execute store result score @s expai_glacier_players.rng run random value 0..10000
execute if score @s expai_glacier_players.rng matches 5000 run function expai_glacier_players:player/inventory/hands/inv_slot_select
execute if score @s expai_glacier_players.rng matches 5000 run function expai_glacier_players:player/inventory/hands/inv_slot_select
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
$msg @a[tag=expai.debug] $(player_inv_slot)

#Check if current slot has same item
$execute as @e[tag=GP.Inventory_Selected.InvSection1,limit=1] if items entity @s horse.$(player_inv_slot) $(picked_item_id) run function expai_glacier_players:player/inventory/item/check/hotbar/same_item with storage expai_glacier_players.inventory_macro
$execute as @e[limit=1,tag=GP.Inventory_Selected.InvSection1] if items entity @s horse.$(player_inv_slot) $(picked_item_id) run function expai_glacier_players:player/inventory/item/check/hotbar/same_item with storage expai_glacier_players.inventory_macro

#Check if current slot is empty
$execute as @e[tag=GP.Inventory_Selected.InvSection1,limit=1] if items entity @s horse.$(player_inv_slot) debug_stick run function expai_glacier_players:player/inventory/item/check/hotbar/override_empty_slot with storage expai_glacier_players.inventory_macro
$execute as @e[limit=1,tag=GP.Inventory_Selected.InvSection1] if items entity @s horse.$(player_inv_slot) debug_stick run function expai_glacier_players:player/inventory/item/check/hotbar/override_empty_slot with storage expai_glacier_players.inventory_macro

##Repeat
execute store result storage expai_glacier_players.inventory_macro player_inv_slot int 1 run scoreboard players add @s expai_glacier_players.inventory_slot_slot_number 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ $msg @a[tag=expai.debug] empty slot $(player_inv_slot) overidden
$data modify entity @s Items[$(player_inv_slot)] set value {count: $(picked_item_count), Slot:$(player_inv_slot)b, components: $(picked_item_components), id:"$(picked_item_id)"}

#Give tag to indicate that the item has been stored
tag @e[tag=GlacierPlayer.Player_Selected,limit=1] add GlacierPlayer.Inv_Sorted_Item
tag @e[limit=1,tag=GlacierPlayer.Player_Selected] add GlacierPlayer.Inv_Sorted_Item
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ $msg @a[tag=expai.debug] empty slot $(player_inv_slot) overidden
$data modify entity @s Items[$(player_inv_slot)] set value {count: $(combined_item_count), Slot:$(player_inv_slot)b, components: $(picked_item_components), id:"$(picked_item_id)"}

#Give tag to indicate that the item has been stored
tag @e[tag=GlacierPlayer.Player_Selected,limit=1] add GlacierPlayer.Inv_Sorted_Item
tag @e[limit=1,tag=GlacierPlayer.Player_Selected] add GlacierPlayer.Inv_Sorted_Item
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ msg @a[tag=expai.debug] ran inv check
$msg @a[tag=expai.debug] $(player_inv_slot)

#Check if current slot has same item
$execute as @e[tag=GP.Inventory_Selected.InvSection2,limit=1] if items entity @s horse.$(player_inv_slot) $(picked_item_id) run function expai_glacier_players:player/inventory/item/check/hotbar/same_item with storage expai_glacier_players.inventory_macro
$execute as @e[limit=1,tag=GP.Inventory_Selected.InvSection2] if items entity @s horse.$(player_inv_slot) $(picked_item_id) run function expai_glacier_players:player/inventory/item/check/hotbar/same_item with storage expai_glacier_players.inventory_macro

#Check if current slot is empty
$execute as @e[tag=GP.Inventory_Selected.InvSection2,limit=1] if items entity @s horse.$(player_inv_slot) debug_stick run function expai_glacier_players:player/inventory/item/check/hotbar/override_empty_slot with storage expai_glacier_players.inventory_macro
$execute as @e[limit=1,tag=GP.Inventory_Selected.InvSection2] if items entity @s horse.$(player_inv_slot) debug_stick run function expai_glacier_players:player/inventory/item/check/hotbar/override_empty_slot with storage expai_glacier_players.inventory_macro

##Repeat
execute store result storage expai_glacier_players.inventory_macro player_inv_slot int 1 run scoreboard players add @s expai_glacier_players.inventory_slot_slot_number 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ msg @a[tag=expai.debug] ran inv check 2
$msg @a[tag=expai.debug] $(player_inv_slot)

#Check if current slot has same item
$execute as @e[tag=GP.Inventory_Selected.InvSection3,limit=1] if items entity @s horse.$(player_inv_slot) $(picked_item_id) run function expai_glacier_players:player/inventory/item/check/hotbar/same_item with storage expai_glacier_players.inventory_macro
$execute as @e[limit=1,tag=GP.Inventory_Selected.InvSection3] if items entity @s horse.$(player_inv_slot) $(picked_item_id) run function expai_glacier_players:player/inventory/item/check/hotbar/same_item with storage expai_glacier_players.inventory_macro

#Check if current slot is empty
$execute as @e[tag=GP.Inventory_Selected.InvSection3,limit=1] if items entity @s horse.$(player_inv_slot) debug_stick run function expai_glacier_players:player/inventory/item/check/hotbar/override_empty_slot with storage expai_glacier_players.inventory_macro
$execute as @e[limit=1,tag=GP.Inventory_Selected.InvSection3] if items entity @s horse.$(player_inv_slot) debug_stick run function expai_glacier_players:player/inventory/item/check/hotbar/override_empty_slot with storage expai_glacier_players.inventory_macro

##Repeat
execute store result storage expai_glacier_players.inventory_macro player_inv_slot int 1 run scoreboard players add @s expai_glacier_players.inventory_slot_slot_number 1
Expand Down
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ scoreboard players set @s expai_glacier_players.ticks_till_force_destory_dmarker
tag @s add expai_glacier_players.summoned_dmarker

summon marker ~ ~ ~ {Tags:["GP.DMarker_Process","GP.DMarker"]}
execute as @e[tag=GP.DMarker_Process,limit=1] run function expai_glacier_players:player/move/destination_marker/spawn_marker_final with storage expai_glacier_players.macro
execute as @e[limit=1,tag=GP.DMarker_Process] run function expai_glacier_players:player/move/destination_marker/spawn_marker_final with storage expai_glacier_players.macro

0 comments on commit 5ebaa93

Please sign in to comment.