From 4a0603cec2fd8a2db284648968cd6cc819ad87f6 Mon Sep 17 00:00:00 2001 From: Redeix Date: Mon, 11 Aug 2025 05:28:45 -0500 Subject: [PATCH] prospecting rework (#1594) * prospecting rework * changelog --- CHANGELOG.md | 1 + kubejs/assets/tfg/lang/en_us.json | 5 +++++ kubejs/assets/tfg/particles/ore_prospector.json | 5 +++++ .../textures/particle/ore_prospector_particle.png | Bin 0 -> 215 bytes kubejs/server_scripts/tfg/tags.js | 12 ++++++++++++ 5 files changed, 23 insertions(+) create mode 100644 kubejs/assets/tfg/particles/ore_prospector.json create mode 100644 kubejs/assets/tfg/textures/particle/ore_prospector_particle.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 2db55f846..1c5e0facb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] ### Changes +- Complete rework of prospector's picks. (#1594) @Redeix ### Bug fixes ## [0.10.9] - 10-08-2025 diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 3232beb69..b9bc01cff 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -736,6 +736,11 @@ "tfg.tooltip.moon_rabbit_variant.cyan": "Seafoam Fur", "tfg.tooltip.moon_rabbit_variant.purple": "Lavender Fur", "tfg.tooltip.moon_rabbit_variant.sofu": "Sundae Fur", + "tfg.toast.ore_prospector_none": "No ores found in range.", + "tfg.toast.ore_prospector_message": "Ores found within %s ยง6blocks in this direction: %s", + "tooltip.tfg.ore_prospector_stats": "Scan Range: %s, Cross Section: %s x %s.", + "tooltip.tfg.ore_prospector_count": "This prospector will display ore counts.", + "tooltip.tfg.ore_prospector_xray": "This prospector will display an x-ray view of ore blocks.", "item.treetap.tap": "Deprecated Item, Craft to Upgrade", "item.gtceu.zinc_ingot": "Deprecated Item, Craft to Upgrade", "item.gtceu.brass_ingot": "Deprecated Item, Craft to Upgrade", diff --git a/kubejs/assets/tfg/particles/ore_prospector.json b/kubejs/assets/tfg/particles/ore_prospector.json new file mode 100644 index 000000000..74e1988cc --- /dev/null +++ b/kubejs/assets/tfg/particles/ore_prospector.json @@ -0,0 +1,5 @@ +{ + "textures": [ + "tfg:ore_prospector_particle" + ] +} diff --git a/kubejs/assets/tfg/textures/particle/ore_prospector_particle.png b/kubejs/assets/tfg/textures/particle/ore_prospector_particle.png new file mode 100644 index 0000000000000000000000000000000000000000..386bf311647d4279ccc5fadd53faf674cadaa6aa GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7=6Sj}hFJ7&owS?tuz^I2 zed`;63nqHZ>-IP*1XoNKkvg>MPDSq$^CMFaa>vZFaojK85wlc&uAQH{CC^vUsO6_j3S1eTt{mf|N9DXsd#1;%`>!WTPyz}dTac<2aF=#Mvljd Qsu@7Q)78&qol`;+03S$Cxc~qF literal 0 HcmV?d00001 diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 09a1a5023..9070ccfa0 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -48,6 +48,18 @@ const registerTFGItemTags = (event) => { event.add('tfg:harvester', 'tfg:harvest_basket') event.add('tfg:harvester', 'tfg:aluminium_harvest_basket') + + event.removeAll('tfc:propicks') + event.add('tfg:tools/ore_prospectors/copper', 'tfc:metal/propick/copper') + event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bronze') + event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bismuth_bronze') + event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/black_bronze') + event.add('tfg:tools/ore_prospectors/wrought_iron', 'tfc:metal/propick/wrought_iron') + event.add('tfg:tools/ore_prospectors/steel', 'tfc:metal/propick/steel') + event.add('tfg:tools/ore_prospectors/black_steel', 'tfc:metal/propick/black_steel') + event.add('tfg:tools/ore_prospectors/blue_steel', 'tfc:metal/propick/blue_steel') + event.add('tfg:tools/ore_prospectors/red_steel', 'tfc:metal/propick/red_steel') + //#endregion // #region Paper from wood