Skip to content

Commit

Permalink
v1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Bret06 committed Mar 1, 2023
1 parent a701691 commit a7201d7
Show file tree
Hide file tree
Showing 109 changed files with 981 additions and 68 deletions.
29 changes: 29 additions & 0 deletions .changelogs/1.7 Changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# **v1.7 Changelog**

## **🚀 New Features**
- Herobrine can now leave a "Dreaful Donation" in your chests. (Can happen before the 3 days pass, enabled by default.)
- Added "Crimson Curse" mechanic which gives Herobrine the ability to change your torches to redstone torches and your lanterns to soul lanterns. (one check per in-game day, happens after the 3 days or a shrine is built.)

## **🔧 Improvements**
- Reduced the likelihood of the torch breaking mechanic based on community feedback.
- Changed the "Randomize Skins" option to only cycle through the main skins.
- Made the skin library menu height match the rest of the settings.
- Increased how long Herobrine stays on screen during crash/jumpscare by 1 ticks.
- Added a warning on the crash mechanic for weaker pcs and epilepsy.
- Modified the crash mechanic to go to a black screen on crash.

## **🐛 Bug Fixes**
- Fixed redstone torch tunnel torches spawning on forbidden blocks.
- Fixed redstone torch trails spawning on forbidden blocks.
- Fixed players from any distance being able to spot herobrine through blocks.
- Fixed Herobrine flashing in and out of existance when the vanishing delay was anything other than none.

## **💻 Technical**
- Added the "noSleepMob" back to daytime so it will prevent you from sleeping during thunderstorms.
- Made the door open event more rare.
- Added "chestTrace" entity to trace the location of chest.
- Added "lanternTrace" entity to trace the location of lanterns.

## **📷 Images**
![crimson_curse](https://www.lunareclipse.studio/assets/img/from-the-fog/changelog-images/crimson_curse.png)
![dreadful_donation](https://www.lunareclipse.studio/assets/img/from-the-fog/changelog-images/dreadful_donation.png)
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.6.1"
version="1.7"
displayName="From The Fog"
credits="§8Created by §5☆Lunar Eclipse Studios☆"
displayURL="https://lunareclipse.studio/creations/from-the-fog"
Expand Down
4 changes: 3 additions & 1 deletion fabric-forge/assets/minecraft/lang/en_au.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
"watchingSkin.customSkin2.name": "Custom Skin 2",
"watchingSkin.customSkin3.name": "Custom Skin 3",
"watchingSkin.customSkin4.name": "Custom Skin 4",
"watchingSkin.customSkin5.name": "Custom Skin 5"
"watchingSkin.customSkin5.name": "Custom Skin 5",
"selectWorld.warning.experimental.title": "Unknown Entity Error",
"selectWorld.warning.experimental.question": "Minecraft has detected an unknown presence in this world. It is advised that you DO NOT PASS THIS SCREEN. Ignoring this warning may result in strange occurrences and/or encounters. Remember, don't stare directly at the bugs."
}
4 changes: 3 additions & 1 deletion fabric-forge/assets/minecraft/lang/en_ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
"watchingSkin.customSkin2.name": "Custom Skin 2",
"watchingSkin.customSkin3.name": "Custom Skin 3",
"watchingSkin.customSkin4.name": "Custom Skin 4",
"watchingSkin.customSkin5.name": "Custom Skin 5"
"watchingSkin.customSkin5.name": "Custom Skin 5",
"selectWorld.warning.experimental.title": "Unknown Entity Error",
"selectWorld.warning.experimental.question": "Minecraft has detected an unknown presence in this world. It is advised that you DO NOT PASS THIS SCREEN. Ignoring this warning may result in strange occurrences and/or encounters. Remember, don't stare directly at the bugs."
}
4 changes: 3 additions & 1 deletion fabric-forge/assets/minecraft/lang/en_gb.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
"watchingSkin.customSkin2.name": "Custom Skin 2",
"watchingSkin.customSkin3.name": "Custom Skin 3",
"watchingSkin.customSkin4.name": "Custom Skin 4",
"watchingSkin.customSkin5.name": "Custom Skin 5"
"watchingSkin.customSkin5.name": "Custom Skin 5",
"selectWorld.warning.experimental.title": "Unknown Entity Error",
"selectWorld.warning.experimental.question": "Minecraft has detected an unknown presence in this world. It is advised that you DO NOT PASS THIS SCREEN. Ignoring this warning may result in strange occurrences and/or encounters. Remember, don't stare directly at the bugs."
}
4 changes: 3 additions & 1 deletion fabric-forge/assets/minecraft/lang/en_nz.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
"watchingSkin.customSkin2.name": "Custom Skin 2",
"watchingSkin.customSkin3.name": "Custom Skin 3",
"watchingSkin.customSkin4.name": "Custom Skin 4",
"watchingSkin.customSkin5.name": "Custom Skin 5"
"watchingSkin.customSkin5.name": "Custom Skin 5",
"selectWorld.warning.experimental.title": "Unknown Entity Error",
"selectWorld.warning.experimental.question": "Minecraft has detected an unknown presence in this world. It is advised that you DO NOT PASS THIS SCREEN. Ignoring this warning may result in strange occurrences and/or encounters. Remember, don't stare directly at the bugs."
}
4 changes: 3 additions & 1 deletion fabric-forge/assets/minecraft/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
"watchingSkin.customSkin2.name": "Custom Skin 2",
"watchingSkin.customSkin3.name": "Custom Skin 3",
"watchingSkin.customSkin4.name": "Custom Skin 4",
"watchingSkin.customSkin5.name": "Custom Skin 5"
"watchingSkin.customSkin5.name": "Custom Skin 5",
"selectWorld.warning.experimental.title": "Unknown Entity Error",
"selectWorld.warning.experimental.question": "Minecraft has detected an unknown presence in this world. It is advised that you DO NOT PASS THIS SCREEN. Ignoring this warning may result in strange occurrences and/or encounters. Remember, don't stare directly at the bugs."
}
9 changes: 9 additions & 0 deletions fabric-forge/assets/watching/font/watching_ui.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,15 @@
"height": 10,
"type": "bitmap"
},
{
"ascent": 40,
"chars": [
"\uBC04"
],
"file": "watching:font/watching_ui/crash_screen.png",
"height": 200,
"type": "bitmap"
},
{
"ascent": 7,
"chars": [
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,8 @@ function watching:config/creeping_vanishing_delay/none
function watching:config/stalking_vanishing_delay/none

function watching:config/no_sleep/true
function watching:config/dreadful_donation/true

function watching:config/crimson_curse/true

playsound minecraft:block.note_block.pling master @s ~ ~ ~ 1.0 2.0 1.0
13 changes: 13 additions & 0 deletions fabric-forge/data/watching/advancements/block_detection/chest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"requirement": {
"trigger": "minecraft:placed_block",
"conditions": {
"block": "minecraft:chest"
}
}
},
"rewards": {
"function": "watching:events/block_detection/placed_chest"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"criteria": {
"requirement": {
"trigger": "minecraft:placed_block",
"conditions": {
"block": "minecraft:lantern"
}
}
},
"rewards": {
"function": "watching:events/block_detection/placed_lantern"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
scoreboard players set true crimsonCurseConfig 0
function watching:config/pages/5
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
scoreboard players set true crimsonCurseConfig 1
function watching:config/pages/5
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
scoreboard players set true dreadfulDonationConfig 0
function watching:config/pages/5
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
scoreboard players set true dreadfulDonationConfig 1
function watching:config/pages/5
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ execute if score true jumpscareConfig matches 1 run tellraw @s [{"text":"[TRUE]"
tellraw @s ""

#crashMechanic
tellraw @s {"text":"Crash Mechanic","underlined":false,"hoverEvent":{"action":"show_text","contents":"Swaps the jumpscare mechanic for the og crash mechanic. (Only works when jumpscare is enabled.)"}}
tellraw @s {"text":"Crash Mechanic","underlined":false,"hoverEvent":{"action":"show_text","contents":"Swaps the jumpscare mechanic for the og crash mechanic. [EPILEPSY WARNING!] [NOT FIT FOR WEAKER MACHINES!] (Only works when jumpscare is enabled.)"}}
execute if score true crashConfig matches 0 run tellraw @s [{"text":"[TRUE]","color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/crash/true"}},{"text":" | ","underlined":false,"color":"dark_gray","clickEvent":{"action":"copy_to_clipboard","value":"He's Watching..."}},{"text":"[FALSE]","underlined":true,"color":"green","clickEvent":{"action":"run_command","value":"/function watching:config/crash/false"}}]
execute if score true crashConfig matches 1 run tellraw @s [{"text":"[TRUE]","color":"green","underlined":true,"clickEvent":{"action":"run_command","value":"/function watching:config/crash/true"}},{"text":" | ","underlined":false,"color":"dark_gray","clickEvent":{"action":"copy_to_clipboard","value":"He's Watching..."}},{"text":"[FALSE]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/crash/false"}}]
tellraw @s ""

#startDelay
#creepingVanishingDelay
tellraw @s {"text":"Creeping Vanishing Delay","underlined":false,"hoverEvent":{"action":"show_text","contents":"Changes how long it takes for Herobrine to disappear after being caught creeping up on the player."}}
execute if score number creepingVanishingDelayConfig matches 0 run tellraw @s ["",{"text":"[NONE]","underlined":true,"color":"green","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/none"}},{"text":" | ","color":"dark_gray"},{"text":"[0.5s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/0.5"}},{"text":" | ","color":"dark_gray"},{"text":"[1s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/1"}},{"text":" | ","color":"dark_gray"},{"text":"[1.5s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/1.5"}},{"text":" | ","color":"dark_gray"},{"text":"[2s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/2"}}]
execute if score number creepingVanishingDelayConfig matches 1 run tellraw @s ["",{"text":"[NONE]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/none"}},{"text":" | ","color":"dark_gray"},{"text":"[0.5s]","underlined":true,"color":"green","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/0.5"}},{"text":" | ","color":"dark_gray"},{"text":"[1s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/1"}},{"text":" | ","color":"dark_gray"},{"text":"[1.5s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/1.5"}},{"text":" | ","color":"dark_gray"},{"text":"[2s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/2"}}]
Expand All @@ -25,7 +25,7 @@ execute if score number creepingVanishingDelayConfig matches 3 run tellraw @s ["
execute if score number creepingVanishingDelayConfig matches 4 run tellraw @s ["",{"text":"[NONE]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/none"}},{"text":" | ","color":"dark_gray"},{"text":"[0.5s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/0.5"}},{"text":" | ","color":"dark_gray"},{"text":"[1s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/1"}},{"text":" | ","color":"dark_gray"},{"text":"[1.5s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/1.5"}},{"text":" | ","color":"dark_gray"},{"text":"[2s]","underlined":true,"color":"green","clickEvent":{"action":"run_command","value":"/function watching:config/creeping_vanishing_delay/2"}}]
tellraw @s ""

#startDelay
#stalkingVanishingDelay
tellraw @s {"text":"Stalking Vanishing Delay","underlined":false,"hoverEvent":{"action":"show_text","contents":"Changes how long it takes for Herobrine to disappear after being caught stalking the player."}}
execute if score number stalkingVanishingDelayConfig matches 0 run tellraw @s ["",{"text":"[NONE]","underlined":true,"color":"green","clickEvent":{"action":"run_command","value":"/function watching:config/stalking_vanishing_delay/none"}},{"text":" | ","color":"dark_gray"},{"text":"[0.5s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/stalking_vanishing_delay/0.5"}},{"text":" | ","color":"dark_gray"},{"text":"[1s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/stalking_vanishing_delay/1"}},{"text":" | ","color":"dark_gray"},{"text":"[1.5s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/stalking_vanishing_delay/1.5"}},{"text":" | ","color":"dark_gray"},{"text":"[2s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/stalking_vanishing_delay/2"}}]
execute if score number stalkingVanishingDelayConfig matches 1 run tellraw @s ["",{"text":"[NONE]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/stalking_vanishing_delay/none"}},{"text":" | ","color":"dark_gray"},{"text":"[0.5s]","underlined":true,"color":"green","clickEvent":{"action":"run_command","value":"/function watching:config/stalking_vanishing_delay/0.5"}},{"text":" | ","color":"dark_gray"},{"text":"[1s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/stalking_vanishing_delay/1"}},{"text":" | ","color":"dark_gray"},{"text":"[1.5s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/stalking_vanishing_delay/1.5"}},{"text":" | ","color":"dark_gray"},{"text":"[2s]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/stalking_vanishing_delay/2"}}]
Expand Down
16 changes: 14 additions & 2 deletions fabric-forge/data/watching/functions/config/pages/5.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,23 @@ tellraw @s "\n\n\n\n\n\n\n\n\n\n"
tellraw @s {"text":"\uBB01\n","font": "watching:watching_ui"}
tellraw @s {"text":"Config [5/5]\n","underlined": true}

#jumpscareMechanic
#noSleepMechanic
tellraw @s {"text":"No Sleep","underlined":false,"hoverEvent":{"action":"show_text","contents":"Toggles whether or not Herobrine will prevent you from sleeping when he's nearby. (Will not work on peaceful.)"}}
execute if score true noSleepConfig matches 0 run tellraw @s [{"text":"[TRUE]","color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/no_sleep/true"}},{"text":" | ","underlined":false,"color":"dark_gray","clickEvent":{"action":"copy_to_clipboard","value":"He's Watching..."}},{"text":"[FALSE]","underlined":true,"color":"green","clickEvent":{"action":"run_command","value":"/function watching:config/no_sleep/false"}}]
execute if score true noSleepConfig matches 1 run tellraw @s [{"text":"[TRUE]","color":"green","underlined":true,"clickEvent":{"action":"run_command","value":"/function watching:config/no_sleep/true"}},{"text":" | ","underlined":false,"color":"dark_gray","clickEvent":{"action":"copy_to_clipboard","value":"He's Watching..."}},{"text":"[FALSE]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/no_sleep/false"}}]
tellraw @s "\n\n\n\n\n\n\n\n\n"
tellraw @s ""

#dreadfulDonation
tellraw @s {"text":"Dreadful Donation","underlined":false,"hoverEvent":{"action":"show_text","contents":"Toggles whether or not Herobrine will leave you gifts in your chests. (Can happen before the 3 days pass or a shrine is built. One check per in-game day.)"}}
execute if score true dreadfulDonationConfig matches 0 run tellraw @s [{"text":"[TRUE]","color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/dreadful_donation/true"}},{"text":" | ","underlined":false,"color":"dark_gray","clickEvent":{"action":"copy_to_clipboard","value":"He's Watching..."}},{"text":"[FALSE]","underlined":true,"color":"green","clickEvent":{"action":"run_command","value":"/function watching:config/dreadful_donation/false"}}]
execute if score true dreadfulDonationConfig matches 1 run tellraw @s [{"text":"[TRUE]","color":"green","underlined":true,"clickEvent":{"action":"run_command","value":"/function watching:config/dreadful_donation/true"}},{"text":" | ","underlined":false,"color":"dark_gray","clickEvent":{"action":"copy_to_clipboard","value":"He's Watching..."}},{"text":"[FALSE]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/dreadful_donation/false"}}]
tellraw @s ""

#crimsonCurseDonation
tellraw @s {"text":"Crimson Curse","underlined":false,"hoverEvent":{"action":"show_text","contents":"Toggles whether or not Herobrine will change your torches to redstone torches and your lanterns to soul lanterns. (one check per in-game day)"}}
execute if score true crimsonCurseConfig matches 0 run tellraw @s [{"text":"[TRUE]","color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/crimson_curse/true"}},{"text":" | ","underlined":false,"color":"dark_gray","clickEvent":{"action":"copy_to_clipboard","value":"He's Watching..."}},{"text":"[FALSE]","underlined":true,"color":"green","clickEvent":{"action":"run_command","value":"/function watching:config/crimson_curse/false"}}]
execute if score true crimsonCurseConfig matches 1 run tellraw @s [{"text":"[TRUE]","color":"green","underlined":true,"clickEvent":{"action":"run_command","value":"/function watching:config/crimson_curse/true"}},{"text":" | ","underlined":false,"color":"dark_gray","clickEvent":{"action":"copy_to_clipboard","value":"He's Watching..."}},{"text":"[FALSE]","underlined":false,"color":"red","clickEvent":{"action":"run_command","value":"/function watching:config/crimson_curse/false"}}]
tellraw @s "\n\n\n"


#pageSelect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ execute if score skin herobrineSkinConfig matches 16 run tellraw @s [{"text":"",
execute if score skin herobrineSkinConfig matches 17 run tellraw @s [{"text":"","font":"watching:watching_ui"},{"text":"\uBB21","hoverEvent":{"action":"show_text","contents":"Fallen Kingdom"},"underlined":false,"clickEvent":{"action":"run_command","value":"/function watching:config/herobrine_skin/15_fallen_kingdom"}},{"text":" "},{"text":"\uBB22","hoverEvent":{"action":"show_text","contents":"Sculk Infested"},"underlined":false,"clickEvent":{"action":"run_command","value":"/function watching:config/herobrine_skin/16_sculk_infested"}},{"text":" "},{"text":"밂\uBC00밁"},{"text":"\uBB23","hoverEvent":{"action":"show_text","contents":"Netherbrine"},"underlined":false,"clickEvent":{"action":"run_command","value":"/function watching:config/herobrine_skin/17_netherbrine"}},{"text":" "}]

#extraSpace
tellraw @s "\n"
tellraw @s "\n\n\n"

#customSkins
tellraw @s {"translate":"watchingSkin.customSkinPack.name","underlined": false}
Expand Down

0 comments on commit a7201d7

Please sign in to comment.