From 1ca74a876986305a01abedf9e9c8ac30975070ed Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 22:13:25 +0100 Subject: [PATCH] hot or not fixes! goodbye, blowpipe exploit --- config/tfchotornot-common.toml | 4 +-- kubejs/server_scripts/hotornot/tags.js | 3 -- kubejs/startup_scripts/horornot/constants.js | 28 ------------------- .../startup_scripts/horornot/modifications.js | 10 ------- kubejs/startup_scripts/main_startup_script.js | 1 - 5 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 kubejs/startup_scripts/horornot/modifications.js diff --git a/config/tfchotornot-common.toml b/config/tfchotornot-common.toml index 158dc3fa3..4e174fcf0 100644 --- a/config/tfchotornot-common.toml +++ b/config/tfchotornot-common.toml @@ -25,10 +25,10 @@ itemTemperatureModifier = 2.0 #How often the heat of your tongs, mittens or potholders should increase. Higher value -> slower. Too high and items won't heat up. #Range: > 1 - itemHeatTimeInterval = 4 + itemHeatTimeInterval = 3 #How often the durability of your tongs, mittens or potholders should take damage. Higher value -> slower. Holding multiple hot items will damage your insulating items faster! #Range: > 1 - itemDamageTimeInterval = 40 + itemDamageTimeInterval = 60 #Durability for wooden tongs. #Range: > 0 woodenTongsDurability = 250 diff --git a/kubejs/server_scripts/hotornot/tags.js b/kubejs/server_scripts/hotornot/tags.js index 9aa9be1b7..f31f1c7e2 100644 --- a/kubejs/server_scripts/hotornot/tags.js +++ b/kubejs/server_scripts/hotornot/tags.js @@ -7,9 +7,6 @@ const registerHotOrNotItemTags = (event) => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }) - - // TODO: TEMP FIX - event.add('tfchotornot:insulating', '#tfc:all_blowpipes') } const registerHotOrNotBlockTags = (event) => { diff --git a/kubejs/startup_scripts/horornot/constants.js b/kubejs/startup_scripts/horornot/constants.js index 544611c11..ed60a260c 100644 --- a/kubejs/startup_scripts/horornot/constants.js +++ b/kubejs/startup_scripts/horornot/constants.js @@ -1,32 +1,4 @@ // priority: 0 global.HOT_OR_NOT_DISABLED_ITEMS = [ -]; - -// Can't just use the #tfchotornot:insulating tag here because tags don't exist at startup -global.HOT_OR_NOT_ITEMS = [ - 'tfchotornot:mittens', - 'tfchotornot:burlap_potholder', - 'tfchotornot:silk_potholder', - 'tfchotornot:wool_potholder', - 'tfchotornot:tongs/wood', - 'tfchotornot:tongs/bismuth', - 'tfchotornot:tongs/bismuth_bronze', - 'tfchotornot:tongs/black_bronze', - 'tfchotornot:tongs/bronze', - 'tfchotornot:tongs/brass', - 'tfchotornot:tongs/copper', - 'tfchotornot:tongs/gold', - 'tfchotornot:tongs/nickel', - 'tfchotornot:tongs/rose_gold', - 'tfchotornot:tongs/silver', - 'tfchotornot:tongs/tin', - 'tfchotornot:tongs/zinc', - 'tfchotornot:tongs/sterling_silver', - 'tfchotornot:tongs/wrought_iron', - 'tfchotornot:tongs/cast_iron', - 'tfchotornot:tongs/steel', - 'tfchotornot:tongs/black_steel', - 'tfchotornot:tongs/red_steel', - 'tfchotornot:tongs/blue_steel', ]; \ No newline at end of file diff --git a/kubejs/startup_scripts/horornot/modifications.js b/kubejs/startup_scripts/horornot/modifications.js deleted file mode 100644 index e4138548c..000000000 --- a/kubejs/startup_scripts/horornot/modifications.js +++ /dev/null @@ -1,10 +0,0 @@ -// priority: 0 - -function registerHotOrNotItemModifications(event) { - - global.HOT_OR_NOT_ITEMS.forEach(i => { - event.modify(i, item => { - item.maxDamage = item.maxDamage * 3 - }) - }) -} \ No newline at end of file diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index c93d56db9..cdf916826 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -27,7 +27,6 @@ BlockEvents.modification(event => { */ ItemEvents.modification(event => { registerBeneathItemModifications(event) - registerHotOrNotItemModifications(event) registerMinecraftItemModifications(event) })