Skip to content

De-ldlib the prospector UI #4822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
screret wants to merge 15 commits into
base: mui2-refactor
Choose a base branch
from
Open

De-ldlib the prospector UI #4822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0c9f911
Actually use the generics prospector code has instead of bypassing them
screret Apr 6, 2026
a19ceeb
Make ProspectorMode.ORE not use `String`s for keys
screret Apr 6, 2026
c7aabe5
Rename ProspectorMode.OreInfo -> BedrockOreInfo
screret Apr 6, 2026
1f95545
Use actual `Component`s for translated strings instead of hardcoding …
screret Apr 6, 2026
faa4c73
Copy some very useful stuff from another branch
screret Apr 6, 2026
d8bd2d4
De-ldlib the prospector
screret May 4, 2026
b7b44c3
Minor simplification that happened to be on the branch I copied most …
screret May 4, 2026
60bea5f
dtngn nd sprthlss
screret May 4, 2026
1e47c9b
Repackage (again)
screret May 5, 2026
8ad8186
It works now
screret May 5, 2026
d6e53b5
Also draw the player location arrow & lines
screret May 5, 2026
743a57c
Default to dark mode so people see their tin veins
screret May 5, 2026
792bca3
Fix the player rotation marker being rotated from the wrong location
screret May 5, 2026
1ddc316
Spotless
screret May 5, 2026
5978501
fix up the player arrow a bit
May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 93 additions & 47 deletions src/generated/resources/assets/gtceu/lang/en_ud.json
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 34 additions & 19 deletions src/generated/resources/assets/gtceu/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,13 @@
"behavior.portable_scanner.workable_progress": "Progress: %s s / %s s",
"behavior.portable_scanner.workable_stored_energy": "Stored Energy: %s EU / %s EU",
"behavior.prospector.added_waypoint": "Created waypoint named %s!",
"behavior.prospector.display_all": "All resources",
"behavior.prospector.mode.bedrock_ore": "§bBedrock Ore Prospection Mode",
"behavior.prospector.mode.fluid": "§bFluid Prospection Mode",
"behavior.prospector.mode.ores": "§aOre Prospection Mode",
"behavior.prospector.not_enough_energy": "Not Enough Energy!",
"behavior.prospector.tooltip.modes": "Available Modes:",
"behavior.prospector.tooltip.radius": "Scans resources in a %s Chunk Radius",
"behavior.toggle_energy_consumer.tooltip": "Use to toggle mode",
"behaviour.boor.by": "by %s",
"behaviour.hammer": "Turns on and off Muffling for Machines (by hitting them)",
Expand Down Expand Up @@ -1133,6 +1139,8 @@
"block.gtceu.substation_capacitor.tooltip_filled": "§cEnergy Capacity: §f%d EU",
"block.gtceu.superconducting_coil": "Superconducting Coil Block",
"block.gtceu.tempered_glass": "Tempered Glass",
"block.gtceu.test_mui": "Test Mui",
"block.gtceu.test_mui_new": "Test Mui New",
"block.gtceu.the_end_marker": "The End",
"block.gtceu.the_nether_marker": "The Nether",
"block.gtceu.titanium_crate": "Titanium Crate",
Expand Down Expand Up @@ -1777,7 +1785,9 @@
"config.gtceu.option.coloredWireOutline": "coloredWireOutline",
"config.gtceu.option.compat": "compat",
"config.gtceu.option.createCompat": "createCompat",
"config.gtceu.option.cursorColor": "cursorColor",
"config.gtceu.option.debug": "debug",
"config.gtceu.option.debugUI": "debugUI",
"config.gtceu.option.debugWorldgen": "debugWorldgen",
"config.gtceu.option.defaultPaintingColor": "defaultPaintingColor",
"config.gtceu.option.defaultUIColor": "defaultUIColor",
Expand Down Expand Up @@ -1805,6 +1815,7 @@
"config.gtceu.option.energyUsageMultiplier": "energyUsageMultiplier",
"config.gtceu.option.environmentalHazardDecayRate": "environmentalHazardDecayRate",
"config.gtceu.option.environmentalHazards": "environmentalHazards",
"config.gtceu.option.escRestoresLastText": "escRestoresLastText",
"config.gtceu.option.euToFeRatio": "euToFeRatio",
"config.gtceu.option.extractorRecyclingYield": "extractorRecyclingYield",
"config.gtceu.option.feToEuRatio": "feToEuRatio",
Expand Down Expand Up @@ -1856,6 +1867,7 @@
"config.gtceu.option.meHatchEnergyUsage": "meHatchEnergyUsage",
"config.gtceu.option.minerSpeed": "minerSpeed",
"config.gtceu.option.minimap": "minimap",
"config.gtceu.option.mui": "mui",
"config.gtceu.option.nanoSaber": "nanoSaber",
"config.gtceu.option.nanoSaberBaseDamage": "nanoSaberBaseDamage",
"config.gtceu.option.nanoSaberDamageBoost": "nanoSaberDamageBoost",
Expand All @@ -1876,6 +1888,7 @@
"config.gtceu.option.oreVeinGridSize": "oreVeinGridSize",
"config.gtceu.option.oreVeinRandomOffset": "oreVeinRandomOffset",
"config.gtceu.option.oreVeins": "oreVeins",
"config.gtceu.option.outlineColor": "outlineColor",
"config.gtceu.option.ownerOPBypass": "ownerOPBypass",
"config.gtceu.option.prospectorEnergyUseMultiplier": "prospectorEnergyUseMultiplier",
"config.gtceu.option.quantumTank": "quantumTank",
Expand All @@ -1889,14 +1902,28 @@
"config.gtceu.option.renderGrowingPlants": "renderGrowingPlants",
"config.gtceu.option.renderer": "renderer",
"config.gtceu.option.replaceMinedBlocksWith": "replaceMinedBlocksWith",
"config.gtceu.option.replaceVanillaTooltips": "replaceVanillaTooltips",
"config.gtceu.option.replaceWithCobbleVersion": "replaceWithCobbleVersion",
"config.gtceu.option.requireGTToolsForBlocks": "requireGTToolsForBlocks",
"config.gtceu.option.rngDamageElectricTools": "rngDamageElectricTools",
"config.gtceu.option.rubberTreeSpawnChance": "rubberTreeSpawnChance",
"config.gtceu.option.sandOresFall": "sandOresFall",
"config.gtceu.option.scale": "scale",
"config.gtceu.option.shouldWeatherOrTerrainExplosion": "shouldWeatherOrTerrainExplosion",
"config.gtceu.option.showDimensionTier": "showDimensionTier",
"config.gtceu.option.showExtra": "showExtra",
"config.gtceu.option.showHovered": "showHovered",
"config.gtceu.option.showOutline": "showOutline",
"config.gtceu.option.showParent": "showParent",
"config.gtceu.option.showParentOutline": "showParentOutline",
"config.gtceu.option.showParentPos": "showParentPos",
"config.gtceu.option.showParentSize": "showParentSize",
"config.gtceu.option.showParentWidgetTheme": "showParentWidgetTheme",
"config.gtceu.option.showPos": "showPos",
"config.gtceu.option.showSize": "showSize",
"config.gtceu.option.showWidgetTheme": "showWidgetTheme",
"config.gtceu.option.smallBoilers": "smallBoilers",
"config.gtceu.option.smoothProgressBar": "smoothProgressBar",
"config.gtceu.option.solarBoilerBaseOutput": "solarBoilerBaseOutput",
"config.gtceu.option.solidBoilerBaseOutput": "solidBoilerBaseOutput",
"config.gtceu.option.sprayCanChainLength": "sprayCanChainLength",
Expand All @@ -1908,17 +1935,21 @@
"config.gtceu.option.surfaceRockProspectRange": "surfaceRockProspectRange",
"config.gtceu.option.tankItemFluidPreview": "tankItemFluidPreview",
"config.gtceu.option.temperaturesInCelsius": "temperaturesInCelsius",
"config.gtceu.option.textColor": "textColor",
"config.gtceu.option.titaniumBoilerHeatSpeed": "titaniumBoilerHeatSpeed",
"config.gtceu.option.titaniumBoilerMaxTemperature": "titaniumBoilerMaxTemperature",
"config.gtceu.option.toggle": "toggle",
"config.gtceu.option.toolCraftingSounds": "toolCraftingSounds",
"config.gtceu.option.toolUseSounds": "toolUseSounds",
"config.gtceu.option.tools": "tools",
"config.gtceu.option.tooltipPos": "tooltipPos",
"config.gtceu.option.treeFellingDelay": "treeFellingDelay",
"config.gtceu.option.tungstensteelBoilerHeatSpeed": "tungstensteelBoilerHeatSpeed",
"config.gtceu.option.tungstensteelBoilerMaxTemperature": "tungstensteelBoilerMaxTemperature",
"config.gtceu.option.ui": "ui",
"config.gtceu.option.universalHazards": "universalHazards",
"config.gtceu.option.updateIntervals": "updateIntervals",
"config.gtceu.option.useDarkThemeByDefault": "useDarkThemeByDefault",
"config.gtceu.option.useVBO": "useVBO",
"config.gtceu.option.voltageTierAdvImpeller": "voltageTierAdvImpeller",
"config.gtceu.option.voltageTierAdvNanoSuit": "voltageTierAdvNanoSuit",
Expand Down Expand Up @@ -2225,7 +2256,7 @@
"gtceu.bus.collapse_true": "Bus will collapse Items",
"gtceu.button.bedrock_fluids": "Show Bedrock Fluid Veins",
"gtceu.button.hide_depleted": "Hide Depleted Veins",
"gtceu.button.ore_veins": "Show GT Ore Veins",
"gtceu.button.ore_veins": "Show Ore Veins",
"gtceu.button.show_depleted": "Show Depleted Veins",
"gtceu.cable.amperage": "§eMax Amperage:§r §e%d",
"gtceu.cable.loss_per_block": "§cLoss/Meter/Ampere:§r §c%d§7 EU-Volt",
Expand Down Expand Up @@ -2527,6 +2558,7 @@
"gtceu.gui.toggle_view.disabled": "Toggle View (Fluids)",
"gtceu.gui.toggle_view.enabled": "Toggle View (Items)",
"gtceu.gui.waiting_list": "Sending Queue:",
"gtceu.gui.waiting_list_empty": "Sending Queue: §2Empty",
"gtceu.implosion_compressor": "Implosion Compressor",
"gtceu.io.both": "Both",
"gtceu.io.export": "Export",
Expand Down Expand Up @@ -2642,9 +2674,6 @@
"gtceu.jei.ore_vein_diagram.weight": "Weight: %s",
"gtceu.jei.programmed_circuit": "Programmed Circuit Page",
"gtceu.journeymap.options.layers": "Prospection layers",
"gtceu.journeymap.options.layers.bedrock_fluids": "Show Bedrock Fluid Veins",
"gtceu.journeymap.options.layers.hide_depleted": "Hide Depleted Veins",
"gtceu.journeymap.options.layers.ore_veins": "Show Ore Veins",
"gtceu.key.armor_charging": "Armor Charging to Inventory Toggle",
"gtceu.key.armor_hover": "Armor Hover Toggle",
"gtceu.key.armor_mode_switch": "Armor Mode Switch",
Expand Down Expand Up @@ -3281,7 +3310,7 @@
"gtceu.maintenance.configurable_time": "Time: %fx",
"gtceu.maintenance.configurable_time.changed_description": "Maintenance problems will occur at %fx the normal rate.",
"gtceu.maintenance.configurable_time.unchanged_description": "Maintenance problems will occur at normal rate. Change configuration to update.",
"gtceu.minimap.ore_vein.depleted": "Depleted",
"gtceu.minimap.ore_vein.depleted": "Depleted Vein",
"gtceu.mixer": "Mixer",
"gtceu.mode.both": "§dBoth (Fluid And Item)§r",
"gtceu.mode.fluid": "§9Fluid§r",
Expand Down Expand Up @@ -3814,7 +3843,6 @@
"gtceu.recipe_modifier.default_fail": "Recipe Modifier Fail",
"gtceu.recipe_modifier.insufficient_eu_to_start_fusion": "Insufficient Energy to Initiate Fusion Reaction",
"gtceu.recipe_modifier.insufficient_voltage": "Voltage Tier Too Low",
"gtceu.recipe_type.show_recipes": "Show Recipes",
"gtceu.rei.group.potion_fluids": "Potion Fluids",
"gtceu.research_station": "Research Station",
"gtceu.rock_breaker": "Rock Breaker",
Expand Down Expand Up @@ -5831,11 +5859,6 @@
"metaitem.machine_configuration.mode": "§aConfiguration Mode:§r %s",
"metaitem.plugin.proxy.tooltips.1": "(Please adjust to proxy mode in the screen)",
"metaitem.plugin.tooltips.1": "Plugins can be added to the screen for more functionality.",
"metaitem.prospector.mode.bedrock_ore": "§bBedrock Ore Prospection Mode§r",
"metaitem.prospector.mode.fluid": "§bFluid Prospection Mode§r",
"metaitem.prospector.mode.ores": "§aOre Prospection Mode§r",
"metaitem.prospector.tooltip.modes": "Available Modes:",
"metaitem.prospector.tooltip.radius": "Scans range in a %s Chunk Radius",
"metaitem.record.sus.tooltip": "§7Leonz - Among Us Drip",
"metaitem.terminal.tooltip": "Sharp tools make good work",
"metaitem.terminal.tooltip.creative": "§bCreative Mode",
Expand Down Expand Up @@ -5989,14 +6012,6 @@
"tagprefix.wire_gt_quadruple": "4x %s Wire",
"tagprefix.wire_gt_single": "1x %s Wire",
"tagprefix.wrench_tip": "%s Wrench Tip",
"tile.gtceu.brittle_charcoal.name": "Brittle Charcoal",
"tile.gtceu.brittle_charcoal.tooltip.0": "Produced by the Charcoal Pile Igniter.",
"tile.gtceu.brittle_charcoal.tooltip.1": "Mine this to get Charcoal.",
"tile.gtceu.foam.name": "Foam",
"tile.gtceu.petrified_foam.name": "Petrified Foam",
"tile.gtceu.reinforced_foam.name": "Reinforced Foam",
"tile.gtceu.reinforced_stone.name": "Reinforced Stone",
"tile.gtceu.seal.name": "Sealed Block",
"tooltip.gtceu.antidote.description": "§aAntidote §7Hold Shift to show details",
"tooltip.gtceu.antidote.description.effect_removed": "Removes %s%% of current conditions' effects",
"tooltip.gtceu.antidote.description.effect_removed.all": "Removes all of current conditions' effects",
Expand Down
46 changes: 0 additions & 46 deletions src/main/java/com/gregtechceu/gtceu/api/gui/misc/PacketProspecting.java
View file
Open in desktop

This file was deleted.

Loading
Loading