diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index ca602b709..9e8676e18 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1059,6 +1059,7 @@ "tfg.tooltip.obsolete.depreciated": "§cDeprecated, cannot be crafted any more", "effect.tfg.cooling": "§bCooling", "effect.tfg.warming": "§6Warming", + "effect.tfg.instant_radiation": "§aRadiation Poisoning", "tfc.jei.flint_knapping": "Flint Knapping", "tfc.jei.straw_knapping": "Straw Knapping", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing", diff --git a/kubejs/assets/tfg/textures/mob_effect/instant_radiation.png b/kubejs/assets/tfg/textures/mob_effect/instant_radiation.png new file mode 100644 index 000000000..09a26283e Binary files /dev/null and b/kubejs/assets/tfg/textures/mob_effect/instant_radiation.png differ diff --git a/kubejs/assets/tfg/textures/mob_effect/warming.png b/kubejs/assets/tfg/textures/mob_effect/warming.png index f5342aa65..72ae45afb 100644 Binary files a/kubejs/assets/tfg/textures/mob_effect/warming.png and b/kubejs/assets/tfg/textures/mob_effect/warming.png differ diff --git a/kubejs/startup_scripts/gtceu/modifications.js b/kubejs/startup_scripts/gtceu/modifications.js index 5d11e070c..5005bc417 100644 --- a/kubejs/startup_scripts/gtceu/modifications.js +++ b/kubejs/startup_scripts/gtceu/modifications.js @@ -43,4 +43,29 @@ function registerGTCEuItemModifications(event) { item.armorProtection = 12 item.armorKnockbackResistance = 0.25 }) + + //#region eating radioactive stuff + const EDIBLE_ITEMS = [ + 'gtceu:thorium_nugget', + 'gtceu:enriched_naquadah_nugget', + 'gtceu:thorium_232_nugget', + 'gtceu:thorium_230_nugget', + 'gtceu:ruthenium_trinium_americium_neutronate_nugget', + 'gtceu:plutonium_nugget', + 'gtceu:plutonium_241_nugget', + 'gtceu:neutronium_nugget', + 'gtceu:naquadria_nugget', + 'gtceu:uranium_nugget', + 'gtceu:uranium_rhodium_dinaquadide_nugget', + 'gtceu:uranium_triplatinum_nugget', + 'gtceu:uranium_235_nugget' + ] + + EDIBLE_ITEMS.forEach(edible => { + event.modify(edible, item => { + item.foodProperties = food => { + food.effect('tfg:instant_radiation', -1, 0, 0.5) + } + }) + }) } \ No newline at end of file diff --git a/pakku-lock.json b/pakku-lock.json index 503df02e8..72fcbde81 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -12754,29 +12754,6 @@ "modrinth": "2yZ8ZSeO" }, "files": [ - { - "type": "curseforge", - "file_name": "tfcgroomer-1.20.1-0.1.4.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6118/92/tfcgroomer-1.20.1-0.1.4.jar", - "id": "6118092", - "parent_id": "1003785", - "hashes": { - "sha1": "e1bb7e932f900cee6be0bf5faf3fc77111488865", - "md5": "e4f19ca0413c9716cb86a3b50ae27a36" - }, - "required_dependencies": [ - "302973" - ], - "size": 134178, - "date_published": "2025-01-23T23:02:18.440Z" - }, { "type": "modrinth", "file_name": "tfcgroomer-1.20.1-0.1.4.jar", @@ -12797,6 +12774,29 @@ "required_dependencies": [], "size": 134178, "date_published": "2025-07-27T17:29:15.479048Z" + }, + { + "type": "curseforge", + "file_name": "tfcgroomer-1.20.1-0.2.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6949/778/tfcgroomer-1.20.1-0.2.1.jar", + "id": "6949778", + "parent_id": "1003785", + "hashes": { + "sha1": "bb1ffe05adaa515f2fb473e339643140beada636", + "md5": "76f89e4453b9f08ad4006e253941f13b" + }, + "required_dependencies": [ + "302973" + ], + "size": 152681, + "date_published": "2025-08-31T20:19:12.327Z" } ] },