Skip to content

Fix Xaero's OreVein icons #5087

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

Merged
jurrejelle merged 3 commits into from
Jul 12, 2026
Merged

Fix Xaero's OreVein icons #5087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7082be2
fix xaero ore veins using the wrong icons and lang key
YoungOnionMC Jul 12, 2026
7239354
sorting by descending weight
YoungOnionMC Jul 12, 2026
90a639e
comment
YoungOnionMC Jul 12, 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
7 changes: 4 additions & 3 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,10 @@ dependencies {
modExtraLocalRuntime(forge.heracles)
modExtraLocalRuntime(forge.resourcefullib)

// modExtraLocalRuntime(forge.xaerosminimap)
// modExtraLocalRuntime(forge.xaerosworldmap)
// modExtraLocalRuntime(forge.journeymap.forge)
modExtraLocalRuntime(forge.xaeroslib)
modExtraLocalRuntime(forge.xaerosworldmap)
modExtraLocalRuntime(forge.xaerosminimap)
modExtraLocalRuntime(forge.journeymap.forge)
// modExtraLocalRuntime(forge.ftbchunks)

modExtraLocalRuntime(forge.gamestages)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public List<BlockState> getAllBlocks() {

public List<Material> getAllMaterials() {
return getAllEntries().stream()
.sorted(Comparator.comparingInt(VeinEntry::chance))
.sorted((a, b) -> Integer.compare(b.chance, a.chance))
.map(VeinEntry::mapToMaterial)
.filter(mat -> !mat.isNull())
.toList();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/integration/map/layer/builtin/OreRenderLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static Component getName(GeneratedVeinMetadata vein) {
ClientProxy.CLIENT_ORE_VEINS.inverse().get(vein.definition()) == null) {
return Component.translatable("gtceu.minimap.ore_vein.depleted");
}
return Component.translatable("gtceu.jei.ore_vein." + OreVeinRecipeWidget.getOreName(vein.definition()));
return Component.translatable(OreVeinRecipeWidget.getOreName(vein.definition()));
}

public static @NotNull Material getMaterial(@NotNull GeneratedVeinMetadata vein) {
Expand Down
7 changes: 4 additions & 3 deletions ...java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElementRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.gregtechceu.gtceu.client.util.RenderUtil;
import com.gregtechceu.gtceu.config.ConfigHolder;
import com.gregtechceu.gtceu.integration.map.GroupingMapRenderer;
import com.gregtechceu.gtceu.integration.map.layer.builtin.OreRenderLayer;
import com.gregtechceu.gtceu.integration.map.xaeros.common.ore.OreVeinElement;

import net.minecraft.client.Minecraft;
Expand Down Expand Up @@ -42,13 +43,13 @@ public boolean renderElement(OreVeinElement element,
GeneratedVeinMetadata vein = element.getVein();
int iconSize = ConfigHolder.INSTANCE.compat.minimap.oreIconSize;

Material firstMaterial = vein.definition().veinGenerator().getAllMaterials().get(0);
int materialARGB = firstMaterial.getMaterialARGB();
Material material = OreRenderLayer.getMaterial(vein);
int materialARGB = material.getMaterialARGB();
float[] colors = RenderUtil.floats(materialARGB);
RenderSystem.setShaderColor(1, 1, 1, 1);

ResourceLocation oreTexture = MaterialIconType.rawOre
.getItemTexturePath(firstMaterial.getMaterialIconSet(), true);
.getItemTexturePath(material.getMaterialIconSet(), true);
if (oreTexture != null) {
var oreSprite = Minecraft.getInstance()
.getTextureAtlas(InventoryMenu.BLOCK_ATLAS)
Expand Down
11 changes: 6 additions & 5 deletions ...ava/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElementRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.gregtechceu.gtceu.client.util.RenderUtil;
import com.gregtechceu.gtceu.config.ConfigHolder;
import com.gregtechceu.gtceu.integration.map.GroupingMapRenderer;
import com.gregtechceu.gtceu.integration.map.layer.builtin.OreRenderLayer;
import com.gregtechceu.gtceu.integration.map.xaeros.common.ore.OreVeinElement;

import net.minecraft.client.Minecraft;
Expand Down Expand Up @@ -83,13 +84,13 @@ public boolean renderElement(int location, OreVeinElement element,
GeneratedVeinMetadata vein = element.getVein();
int iconSize = ConfigHolder.INSTANCE.compat.minimap.oreIconSize;

Material firstMaterial = vein.definition().veinGenerator().getAllMaterials().get(0);
int materialARGB = firstMaterial.getMaterialARGB();
Material material = OreRenderLayer.getMaterial(vein);
int materialARGB = material.getMaterialARGB();
float[] colors = RenderUtil.floats(materialARGB);
RenderSystem.setShaderColor(1, 1, 1, 1);

ResourceLocation oreTexture = MaterialIconType.rawOre
.getItemTexturePath(firstMaterial.getMaterialIconSet(), true);
.getItemTexturePath(material.getMaterialIconSet(), true);
if (oreTexture != null) {
var oreSprite = Minecraft.getInstance()
.getTextureAtlas(InventoryMenu.BLOCK_ATLAS)
Expand All @@ -98,9 +99,9 @@ public boolean renderElement(int location, OreVeinElement element,
oreSprite, colors[0], colors[1], colors[2], 1);
}

oreTexture = MaterialIconType.rawOre.getItemTexturePath(firstMaterial.getMaterialIconSet(), "secondary", true);
oreTexture = MaterialIconType.rawOre.getItemTexturePath(material.getMaterialIconSet(), "secondary", true);
if (oreTexture != null) {
int materialSecondaryARGB = firstMaterial.getMaterialSecondaryARGB();
int materialSecondaryARGB = material.getMaterialSecondaryARGB();
colors = RenderUtil.floats(materialSecondaryARGB);
var oreSprite = Minecraft.getInstance()
.getTextureAtlas(InventoryMenu.BLOCK_ATLAS)
Expand Down
Loading