Skip to content

Commit

Permalink
Updating broken/issues with some cmds
Browse files Browse the repository at this point in the history
  • Loading branch information
Frustrated Programmer committed Jan 6, 2025
1 parent 2dbc603 commit 0ec554a
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ execute unless entity @e[type=minecraft:hopper_minecart,tag=LODEID70] run scoreb
execute unless entity @e[type=minecraft:hopper_minecart,tag=LODEID71] run scoreboard players set $dungeon do2.tests.all_filters 0
execute unless entity @e[type=minecraft:hopper_minecart,tag=LODEID72] run scoreboard players set $dungeon do2.tests.all_filters 0
execute unless entity @e[type=minecraft:hopper_minecart,tag=LODEID73] run scoreboard players set $dungeon do2.tests.all_filters 0
execute unless entity @e[type=minecraft:hopper_minecart,tag=LODEID74] run scoreboard players set $dungeon do2.tests.all_
execute unless entity @e[type=minecraft:hopper_minecart,tag=LODEID74] run scoreboard players set $dungeon do2.tests.all_filters 0
execute unless entity @e[type=minecraft:hopper_minecart,tag=LODEID69] run scoreboard players set $dungeon do2.tests.all_filters 0
execute unless entity @e[type=minecraft:hopper_minecart,tag=LODEID70] run scoreboard players set $dungeon do2.tests.all_filters 0
execute unless entity @e[type=minecraft:hopper_minecart,tag=LODEID71] run scoreboard players set $dungeon do2.tests.all_filters 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scoreboard objectives add do2.tests.amountOfMobsExists
scoreboard objectives add do2.tests.amountOfMobsExists dummy


# Death Room Ravager
Expand All @@ -11,13 +11,13 @@ execute unless score $dungeon do2.tests.amountOfMobsExists matches 1 run summon
function do2:entity_controller/generate_entities/evokers/test_for_all_evokers

# Axolotls
function do2:entity_controller/generate_entities/other_mobs/axolotls
function do2:entity_controller/generate_entities/other_entities/axolotls

# Fun mobs
function do2:entity_controller/generate_entities/other_mobs/fun_mobs
function do2:entity_controller/generate_entities/other_entities/fun_mobs

# Interaction Entities
function do2:entity_controller/generate_entities/other_mobs/interaction_entities
function do2:entity_controller/generate_entities/other_entities/interaction_entities


# Todo: do checks for remainders... skeleton & endermites
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function do2:agronet/add_items/add_artifake
# execute as everyone.
# if that player has found an artifact.
# that that artifact got converted.
execute as @a if score @s do2.run.foundArtifact matches 10.. as @p[tag=do2.received_shulker] run scoreboard players set @s do2.run.convertedArtifake
execute as @a if score @s do2.run.foundArtifact matches 10.. as @p[tag=do2.received_shulker] run scoreboard players set @s do2.run.convertedArtifake 1
execute as @a if score @s do2.run.foundArtifact matches 10 as @p[tag=do2.received_shulker] run scoreboard players add @s do2.artifakes.PWS 1
execute as @a if score @s do2.run.foundArtifact matches 11 as @p[tag=do2.received_shulker] run scoreboard players add @s do2.artifakes.CF1 1
execute as @a if score @s do2.run.foundArtifact matches 12 as @p[tag=do2.received_shulker] run scoreboard players add @s do2.artifakes.CUS 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# - Start Log -
tag @s add cf1PickUpLogTarget
execute as @a[scores={do2.logs.pickups=1..}] run tellraw @s ["",{"text":"[§9B§r]: "},{"selector":"@p[tag=cf1PickUpLogTarget]"},{"text":" picked up an artifact. ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"text":"§fID: §9#11\n§fValue: §b46\n§fName: §aCF-135\n§fLore:\n§o§5Let\'s GO!"}]}},{"text":")"}]
execute as @a[scores={do2.logs.pickups=1..}] run tellraw @s ["",{"text":"[§9B§r]: "},{"selector":"@p[tag=cf1PickUpLogTarget]"},{"text":" picked up an artifact. ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"text":"§fID: §9#11\n§fValue: §b46\n§fName: §aCF-135\n§fLore:\n§o§5Let's GO!"}]}},{"text":")"}]
tag @s remove cf1PickUpLogTarget
# - End Log -

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# - Start Log -
tag @s add knhPickUpLogTarget
execute as @a[scores={do2.logs.pickups=1..}] run tellraw @s ["",{"text":"[§9B§r]: "},{"selector":"@p[tag=knhPickUpLogTarget]"},{"text":" picked up an artifact. ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"text":"§fID: §9#41\n§fValue: §b23\n§fName: §aKnight's Helm\n§fLore:\n§o§5Yep. It\'s knightly. Well and good."}]}},{"text":")"}]
execute as @a[scores={do2.logs.pickups=1..}] run tellraw @s ["",{"text":"[§9B§r]: "},{"selector":"@p[tag=knhPickUpLogTarget]"},{"text":" picked up an artifact. ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"text":"§fID: §9#41\n§fValue: §b23\n§fName: §aKnight's Helm\n§fLore:\n§o§5Yep. It's knightly. Well and good."}]}},{"text":")"}]
tag @s remove knhPickUpLogTarget
# - End Log -

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

scoreboard players add @a[tag=do2.received_shulker] do2.run.systems.hazard.activated 1
scoreboard players add @a[tag=do2.received_shulker] do2.systems.hazard.activated 1
scoreboard players add $dungeon do2.run.systems.hazard.activated
scoreboard players add $dungeon do2.systems.hazard.activated
scoreboard players add $dungeon do2.run.systems.hazard.activated 1
scoreboard players add $dungeon do2.systems.hazard.activated 1

# AGRONET EVENT
function do2:agronet/systems/hazard_event
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ setblock -602 -11 1910 minecraft:air
# 2x Piston
setblock -564 -44 1911 minecraft:air
setblock -564 -44 1912 minecraft:air
setblock -564 -44 1913 minecraft:air
setblock -564 -44 1913 minecraft:air
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ scoreboard objectives add do2.logs.player_actions dummy "Receive Logs on PLAYER'
scoreboard objectives add do2.logs.dungeon_setup dummy "Receive Logs of DATAPACK SETUP."

scoreboard objectives add do2.logs.spam dummy "Receive Logs of dungeon SPAM."

scoreboard objectives add do2.logs.entity_controller dummy "Receive Logs of the entity controller's actions."
4 changes: 2 additions & 2 deletions Brilliance Datapack/data/do2/functions/version.mcfunction
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# DATAPACK VERSION NUMBER: 0.14.0
# DATAPACK VERSION NUMBER: 0.14.1

tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.14.0§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]
tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.14.1§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]

0 comments on commit 0ec554a

Please sign in to comment.