Skip to content

Commit

Permalink
v1.8.1 📋
Browse files Browse the repository at this point in the history
  • Loading branch information
Bret06 committed Mar 25, 2023
1 parent d942384 commit 77db52a
Show file tree
Hide file tree
Showing 23 changed files with 68 additions and 32 deletions.
12 changes: 12 additions & 0 deletions .changelogs/1.8.1 Changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# **v1.8.1 Changelog**

## **🚀 New Features**
- Herobrine will now relight doused shrines. (You may need to relight shrines for this to take effect.)

## **🐛 Bug Fixes**
- Fixed both the creeping and stalking mechanic using stalkingVanishingDelay.
- Fixed Herobrine removing blocks to place his signs.
- Fixed Herobrine sometimes moonwalking for literally no reason. (Bro really said Micheal Jackson xD)

## **💻 Technical**
- Removed Mojang
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion fabric-forge/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ logoFile="banner.png"

[[mods]]
modId="watching"
version="1.8"
version="1.8.1"
displayName="From The Fog"
credits="§8Created by §5☆Lunar Eclipse Studios☆"
displayURL="https://lunareclipse.studio/creations/from-the-fog"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ execute anchored eyes run tp @e[type=marker,tag=fireTrace,tag=!found] ^ ^ ^5 ~ ~
execute as @e[type=marker,tag=fireTrace] at @s if block ~ ~ ~ minecraft:fire run tag @s add found

#foundFire
execute at @e[type=marker,tag=fireTrace,tag=found,tag=!logged] unless score true startedEvents matches 1.. if block ~ ~-1 ~ netherrack if block ~ ~-2 ~ #watching:shrine_center if block ~1 ~-2 ~ gold_block if block ~-1 ~-2 ~ gold_block if block ~ ~-2 ~1 gold_block if block ~ ~-2 ~-1 gold_block if block ~1 ~-2 ~1 gold_block if block ~-1 ~-2 ~-1 gold_block if block ~1 ~-2 ~-1 gold_block if block ~-1 ~-2 ~1 gold_block if block ~1 ~-1 ~ redstone_torch if block ~-1 ~-1 ~ redstone_torch if block ~ ~-1 ~-1 redstone_torch if block ~ ~-1 ~1 redstone_torch as @s at @s run function watching:events/found_shrine
execute as @e[type=marker,tag=fireTrace,tag=found,tag=!logged] at @s if entity @e[type=marker,tag=fireTrace,tag=logged,distance=..1] run kill @s
execute as @e[type=marker,tag=fireTrace,tag=found,tag=!logged] at @s run tag @s add logged
execute at @e[type=marker,tag=fireTrace,tag=found] unless score true startedEvents matches 1.. if block ~ ~-1 ~ netherrack if block ~ ~-2 ~ #watching:shrine_center if block ~1 ~-2 ~ gold_block if block ~-1 ~-2 ~ gold_block if block ~ ~-2 ~1 gold_block if block ~ ~-2 ~-1 gold_block if block ~1 ~-2 ~1 gold_block if block ~-1 ~-2 ~-1 gold_block if block ~1 ~-2 ~-1 gold_block if block ~-1 ~-2 ~1 gold_block if block ~1 ~-1 ~ redstone_torch if block ~-1 ~-1 ~ redstone_torch if block ~ ~-1 ~-1 redstone_torch if block ~ ~-1 ~1 redstone_torch as @s at @s run function watching:events/found_shrine
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ execute if entity @s[tag=torchTrace] unless block ~ ~ ~ #watching:torches run fu
execute if entity @s[tag=bedTrace] unless block ~ ~ ~ #beds run function watching:events/general/kill/kill_trace_marker
execute if entity @s[tag=chestTrace] unless block ~ ~ ~ chest run function watching:events/general/kill/kill_trace_marker
execute if entity @s[tag=lanternTrace] unless block ~ ~ ~ lantern run function watching:events/general/kill/kill_trace_marker
execute if entity @s[tag=candleTrace] unless block ~ ~ ~ #candles run function watching:events/general/kill/kill_trace_marker
execute if entity @s[tag=candleTrace] unless block ~ ~ ~ #candles run function watching:events/general/kill/kill_trace_marker
execute if entity @s[tag=fireTrace] unless block ~ ~-1 ~ netherrack run function watching:events/general/kill/kill_trace_marker
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
function watching:events/start_events
function watching:events/sightings/creeping
execute if score true OGshrineMechanicConfig matches 1 as @e[type=marker,tag=fireTrace] at @s run summon lightning_bolt ~ ~ ~
playsound watching:message.warning master @s
execute as @e[type=marker,tag=fireTrace] at @s run kill @s


playsound watching:message.warning master @s
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#slipBehindBlock
execute anchored eyes unless block ^-1 ^ ^1 #watching:glass_sight_blocks if block ^-1 ^ ^ #watching:glass_sight_blocks run tag @s add moveRight
execute unless entity @s[tag=moveRight] anchored eyes unless block ^1 ^ ^1 #watching:glass_sight_blocks if block ^1 ^ ^ #watching:glass_sight_blocks run tag @s add moveLeft
execute anchored eyes unless block ^-1 ^ ^1 #watching:glass_sight_blocks if block ^-1 ^ ^ #watching:glass_sight_blocks run tag @s add ableToSlip
execute anchored eyes unless block ^1 ^ ^1 #watching:glass_sight_blocks if block ^1 ^ ^ #watching:glass_sight_blocks run tag @s add ableToSlip
execute anchored eyes if block ^1 ^ ^1 #watching:glass_sight_blocks if block ^-1 ^ ^1 #watching:glass_sight_blocks run tag @s remove ableToSlip
execute anchored eyes unless block ^1 ^ ^ #watching:glass_sight_blocks unless block ^-1 ^ ^ #watching:glass_sight_blocks run tag @s remove ableToSlip
execute if entity @s[tag=ableToSlip] run tag @e[type=armor_stand,tag=secondaryRotate] add pauseRot
execute if entity @s[tag=moveRight] as @e[type=armor_stand,tag=secondaryRotate] at @s run tp @s ~ ~ ~ ~45 ~
execute if entity @s[tag=moveLeft] as @e[type=armor_stand,tag=secondaryRotate] at @s run tp @s ~ ~ ~ ~-45 ~
Expand All @@ -10,8 +14,8 @@ execute if entity @s[tag=ableToSlip] run tag @e[type=armor_stand,tag=legs] add w
execute unless entity @s[tag=ableToSlip] unless entity @s[tag=turnAround] run tag @s add disappear

#vanish
execute if entity @s[tag=disappear] if score number stalkingVanishingDelayConfig matches 0 run function watching:events/general/kill/kill_spread_entity
execute if entity @s[tag=disappear] if score number stalkingVanishingDelayConfig matches 1 run schedule function watching:events/general/kill/kill_spread_entity 0.5s
execute if entity @s[tag=disappear] if score number stalkingVanishingDelayConfig matches 2 run schedule function watching:events/general/kill/kill_spread_entity 1s
execute if entity @s[tag=disappear] if score number stalkingVanishingDelayConfig matches 3 run schedule function watching:events/general/kill/kill_spread_entity 1.5s
execute if entity @s[tag=disappear] if score number stalkingVanishingDelayConfig matches 4 run schedule function watching:events/general/kill/kill_spread_entity 2s
execute if entity @s[tag=disappear] if score number creepingVanishingDelayConfig matches 0 run function watching:events/general/kill/kill_spread_entity
execute if entity @s[tag=disappear] if score number creepingVanishingDelayConfig matches 1 run schedule function watching:events/general/kill/kill_spread_entity 0.5s
execute if entity @s[tag=disappear] if score number creepingVanishingDelayConfig matches 2 run schedule function watching:events/general/kill/kill_spread_entity 1s
execute if entity @s[tag=disappear] if score number creepingVanishingDelayConfig matches 3 run schedule function watching:events/general/kill/kill_spread_entity 1.5s
execute if entity @s[tag=disappear] if score number creepingVanishingDelayConfig matches 4 run schedule function watching:events/general/kill/kill_spread_entity 2s
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#placeSign
execute if score true sinisterSignsConfig matches 1 if score lang lurkingLanguageConfig matches 0 if predicate watching:chances/number/50 run function watching:events/sightings/spotted/glass_spotted/english_sign
execute if score true sinisterSignsConfig matches 1 if score lang lurkingLanguageConfig matches 1 if predicate watching:chances/number/50 run function watching:events/sightings/spotted/glass_spotted/swedish_sign
execute if block ~ ~ ~ #watching:air_blocks if score true sinisterSignsConfig matches 1 if score lang lurkingLanguageConfig matches 0 if predicate watching:chances/number/50 run function watching:events/sightings/spotted/glass_spotted/english_sign
execute if block ~ ~ ~ #watching:air_blocks if score true sinisterSignsConfig matches 1 if score lang lurkingLanguageConfig matches 1 if predicate watching:chances/number/50 run function watching:events/sightings/spotted/glass_spotted/swedish_sign

#killEntity
function watching:events/general/kill/kill_spread_entity
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ summon armor_stand ~ 0 ~ {Tags:["spread","model","stalking","herobrine"],Marker:

#stalkingPos
# execute as @e[tag=spread] at @s in minecraft:overworld run tp @s -2603.45 75.00 27378.49
# execute as @e[tag=spread] at @s in minecraft:overworld run tp @s -2621.74 83.00 27404.82 -464.38 9.45
execute as @e[tag=spread] at @s in minecraft:overworld run tp @s -2621.74 83.00 27404.82 -464.38 9.45
# execute as @e[tag=spread] at @s in minecraft:overworld run tp @s -2574.46 -17.00 27341.50 809.43 0.89
# execute as @e[tag=spread] at @s in minecraft:overworld run tp @s -2619.87 72.00 27358.56 -1252.57 3.18
# execute as @e[tag=spread] at @s in minecraft:overworld run tp @s -2613.53 80.00 27397.71 -534.15 12.19
# execute as @e[tag=spread] at @s in minecraft:overworld run tp @s -2675.39 78.00 27404.70 -539.24 1.28
# execute as @e[tag=spread] at @s in minecraft:overworld run tp @s -2565.50 77.00 27345.04 -1730.43 10.87
# execute as @e[tag=spread] at @s in minecraft:overworld run tp @s -2586.08 72.00 27354.47 -2069.60 0.72
execute as @e[tag=spread] at @s in minecraft:overworld run tp @s -2736.14 72.00 27514.86 183.45 2.77
# execute as @e[tag=spread] at @s in minecraft:overworld run tp @s -2736.14 72.00 27514.86 183.45 2.77
execute as @e[type=armor_stand,tag=spread] at @s align xz run tp ~0.5 ~ ~0.5

#createModel
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#slipBehindBlock
execute anchored eyes unless block ^-1 ^ ^1 #watching:glass_sight_blocks if block ^-1 ^ ^ #watching:glass_sight_blocks run tag @s add moveRight
execute unless entity @s[tag=moveRight] anchored eyes unless block ^1 ^ ^1 #watching:glass_sight_blocks if block ^1 ^ ^ #watching:glass_sight_blocks run tag @s add moveLeft
execute anchored eyes unless block ^-1 ^ ^1 #watching:glass_sight_blocks if block ^-1 ^ ^ #watching:glass_sight_blocks run tag @s add ableToSlip
execute anchored eyes unless block ^1 ^ ^1 #watching:glass_sight_blocks if block ^1 ^ ^ #watching:glass_sight_blocks run tag @s add ableToSlip
execute anchored eyes if block ^1 ^ ^1 #watching:glass_sight_blocks if block ^-1 ^ ^1 #watching:glass_sight_blocks run tag @s remove ableToSlip
execute anchored eyes unless block ^1 ^ ^ #watching:glass_sight_blocks unless block ^-1 ^ ^ #watching:glass_sight_blocks run tag @s remove ableToSlip
execute if entity @s[tag=ableToSlip] run tag @e[type=armor_stand,tag=secondaryRotate] add pauseRot
execute if entity @s[tag=moveRight] as @e[type=armor_stand,tag=secondaryRotate] at @s run tp @s ~ ~ ~ ~45 ~
execute if entity @s[tag=moveLeft] as @e[type=armor_stand,tag=secondaryRotate] at @s run tp @s ~ ~ ~ ~-45 ~
Expand Down
3 changes: 3 additions & 0 deletions fabric-forge/data/watching/functions/main/20tick.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ execute if score chance sightingChanceConfig matches 3 if score true startedEven
#removeTraces
execute as @e[type=marker,tag=logged] at @s run function watching:events/block_detection/technical/remove_traces

#relightShrine
execute as @e[type=marker,tag=fireTrace,tag=logged] at @s unless entity @a[distance=..100,gamemode=!spectator] unless block ~ ~ ~ fire run setblock ~ ~ ~ fire

#chilledCandles
execute if score true chilledCandlesConfig matches 1 as @e[type=marker,tag=candleTrace,tag=logged] at @s unless score true chilledCandlesDayPassed matches 1.. unless entity @a[distance=..100,gamemode=!spectator] run function watching:events/chilled_candles/try_douse

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ execute if entity @s[type=armor_stand,tag=move] as @e[type=wolf,distance=..30,nb
execute if entity @s[tag=move] anchored eyes unless block ^-1 ^ ^1 #watching:glass_sight_blocks if block ^-1 ^ ^ #watching:glass_sight_blocks run tag @s add ableToSlip
execute if entity @s[tag=move] anchored eyes unless block ^1 ^ ^1 #watching:glass_sight_blocks if block ^1 ^ ^ #watching:glass_sight_blocks run tag @s add ableToSlip
execute if entity @s[tag=move] anchored eyes if block ^1 ^ ^1 #watching:glass_sight_blocks if block ^-1 ^ ^1 #watching:glass_sight_blocks run tag @s remove ableToSlip
execute if entity @s[tag=move] anchored eyes unless block ^1 ^ ^ #watching:glass_sight_blocks unless block ^-1 ^ ^ #watching:glass_sight_blocks run tag @s remove ableToSlip
execute if entity @s[tag=moveRight] run function watching:events/sightings/spotted/slip_behind_block/right
execute if entity @s[tag=moveLeft] run function watching:events/sightings/spotted/slip_behind_block/left

Expand Down
2 changes: 1 addition & 1 deletion fabric-forge/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"name": "From The Fog",
"id": "watching",
"version": "1.8",
"version": "1.8.1",
"description": "Enter a world of fear and mystery with From The Fog, a Minecraft mod that brings the legendary Herobrine to life in a spooky and immersive way true to the legend.",
"icon": "pack.png",
"authors": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ execute anchored eyes run tp @e[type=marker,tag=fireTrace,tag=!found] ^ ^ ^5 ~ ~
execute as @e[type=marker,tag=fireTrace] at @s if block ~ ~ ~ minecraft:fire run tag @s add found

#foundFire
execute at @e[type=marker,tag=fireTrace,tag=found,tag=!logged] unless score true startedEvents matches 1.. if block ~ ~-1 ~ netherrack if block ~ ~-2 ~ #watching:shrine_center if block ~1 ~-2 ~ gold_block if block ~-1 ~-2 ~ gold_block if block ~ ~-2 ~1 gold_block if block ~ ~-2 ~-1 gold_block if block ~1 ~-2 ~1 gold_block if block ~-1 ~-2 ~-1 gold_block if block ~1 ~-2 ~-1 gold_block if block ~-1 ~-2 ~1 gold_block if block ~1 ~-1 ~ redstone_torch if block ~-1 ~-1 ~ redstone_torch if block ~ ~-1 ~-1 redstone_torch if block ~ ~-1 ~1 redstone_torch as @s at @s run function watching:events/found_shrine
execute as @e[type=marker,tag=fireTrace,tag=found,tag=!logged] at @s if entity @e[type=marker,tag=fireTrace,tag=logged,distance=..1] run kill @s
execute as @e[type=marker,tag=fireTrace,tag=found,tag=!logged] at @s run tag @s add logged
execute at @e[type=marker,tag=fireTrace,tag=found] unless score true startedEvents matches 1.. if block ~ ~-1 ~ netherrack if block ~ ~-2 ~ #watching:shrine_center if block ~1 ~-2 ~ gold_block if block ~-1 ~-2 ~ gold_block if block ~ ~-2 ~1 gold_block if block ~ ~-2 ~-1 gold_block if block ~1 ~-2 ~1 gold_block if block ~-1 ~-2 ~-1 gold_block if block ~1 ~-2 ~-1 gold_block if block ~-1 ~-2 ~1 gold_block if block ~1 ~-1 ~ redstone_torch if block ~-1 ~-1 ~ redstone_torch if block ~ ~-1 ~-1 redstone_torch if block ~ ~-1 ~1 redstone_torch as @s at @s run function watching:events/found_shrine
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ execute if entity @s[tag=torchTrace] unless block ~ ~ ~ #watching:torches run fu
execute if entity @s[tag=bedTrace] unless block ~ ~ ~ #beds run function watching:events/general/kill/kill_trace_marker
execute if entity @s[tag=chestTrace] unless block ~ ~ ~ chest run function watching:events/general/kill/kill_trace_marker
execute if entity @s[tag=lanternTrace] unless block ~ ~ ~ lantern run function watching:events/general/kill/kill_trace_marker
execute if entity @s[tag=candleTrace] unless block ~ ~ ~ #candles run function watching:events/general/kill/kill_trace_marker
execute if entity @s[tag=candleTrace] unless block ~ ~ ~ #candles run function watching:events/general/kill/kill_trace_marker
execute if entity @s[tag=fireTrace] unless block ~ ~-1 ~ netherrack run function watching:events/general/kill/kill_trace_marker
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
function watching:events/start_events
function watching:events/sightings/creeping
execute if score true OGshrineMechanicConfig matches 1 as @e[type=marker,tag=fireTrace] at @s run summon lightning_bolt ~ ~ ~
playsound watching:message.warning master @s
execute as @e[type=marker,tag=fireTrace] at @s run kill @s


playsound watching:message.warning master @s
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#slipBehindBlock
execute anchored eyes unless block ^-1 ^ ^1 #watching:glass_sight_blocks if block ^-1 ^ ^ #watching:glass_sight_blocks run tag @s add moveRight
execute unless entity @s[tag=moveRight] anchored eyes unless block ^1 ^ ^1 #watching:glass_sight_blocks if block ^1 ^ ^ #watching:glass_sight_blocks run tag @s add moveLeft
execute anchored eyes unless block ^-1 ^ ^1 #watching:glass_sight_blocks if block ^-1 ^ ^ #watching:glass_sight_blocks run tag @s add ableToSlip
execute anchored eyes unless block ^1 ^ ^1 #watching:glass_sight_blocks if block ^1 ^ ^ #watching:glass_sight_blocks run tag @s add ableToSlip
execute anchored eyes if block ^1 ^ ^1 #watching:glass_sight_blocks if block ^-1 ^ ^1 #watching:glass_sight_blocks run tag @s remove ableToSlip
execute anchored eyes unless block ^1 ^ ^ #watching:glass_sight_blocks unless block ^-1 ^ ^ #watching:glass_sight_blocks run tag @s remove ableToSlip
execute if entity @s[tag=ableToSlip] run tag @e[type=armor_stand,tag=secondaryRotate] add pauseRot
execute if entity @s[tag=moveRight] as @e[type=armor_stand,tag=secondaryRotate] at @s run tp @s ~ ~ ~ ~45 ~
execute if entity @s[tag=moveLeft] as @e[type=armor_stand,tag=secondaryRotate] at @s run tp @s ~ ~ ~ ~-45 ~
Expand All @@ -10,8 +14,8 @@ execute if entity @s[tag=ableToSlip] run tag @e[type=armor_stand,tag=legs] add w
execute unless entity @s[tag=ableToSlip] unless entity @s[tag=turnAround] run tag @s add disappear

#vanish
execute if entity @s[tag=disappear] if score number stalkingVanishingDelayConfig matches 0 run function watching:events/general/kill/kill_spread_entity
execute if entity @s[tag=disappear] if score number stalkingVanishingDelayConfig matches 1 run schedule function watching:events/general/kill/kill_spread_entity 0.5s
execute if entity @s[tag=disappear] if score number stalkingVanishingDelayConfig matches 2 run schedule function watching:events/general/kill/kill_spread_entity 1s
execute if entity @s[tag=disappear] if score number stalkingVanishingDelayConfig matches 3 run schedule function watching:events/general/kill/kill_spread_entity 1.5s
execute if entity @s[tag=disappear] if score number stalkingVanishingDelayConfig matches 4 run schedule function watching:events/general/kill/kill_spread_entity 2s
execute if entity @s[tag=disappear] if score number creepingVanishingDelayConfig matches 0 run function watching:events/general/kill/kill_spread_entity
execute if entity @s[tag=disappear] if score number creepingVanishingDelayConfig matches 1 run schedule function watching:events/general/kill/kill_spread_entity 0.5s
execute if entity @s[tag=disappear] if score number creepingVanishingDelayConfig matches 2 run schedule function watching:events/general/kill/kill_spread_entity 1s
execute if entity @s[tag=disappear] if score number creepingVanishingDelayConfig matches 3 run schedule function watching:events/general/kill/kill_spread_entity 1.5s
execute if entity @s[tag=disappear] if score number creepingVanishingDelayConfig matches 4 run schedule function watching:events/general/kill/kill_spread_entity 2s
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#placeSign
execute if score true sinisterSignsConfig matches 1 if score lang lurkingLanguageConfig matches 0 if predicate watching:chances/number/50 run function watching:events/sightings/spotted/glass_spotted/english_sign
execute if score true sinisterSignsConfig matches 1 if score lang lurkingLanguageConfig matches 1 if predicate watching:chances/number/50 run function watching:events/sightings/spotted/glass_spotted/swedish_sign
execute if block ~ ~ ~ #watching:air_blocks if score true sinisterSignsConfig matches 1 if score lang lurkingLanguageConfig matches 0 if predicate watching:chances/number/50 run function watching:events/sightings/spotted/glass_spotted/english_sign
execute if block ~ ~ ~ #watching:air_blocks if score true sinisterSignsConfig matches 1 if score lang lurkingLanguageConfig matches 1 if predicate watching:chances/number/50 run function watching:events/sightings/spotted/glass_spotted/swedish_sign

#killEntity
function watching:events/general/kill/kill_spread_entity

0 comments on commit 77db52a

Please sign in to comment.