From 7082be2719132f4bb41c5ef46eafdae2db4136df Mon Sep 17 00:00:00 2001 From: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com> Date: Sun, 12 Jul 2026 03:44:08 -0600 Subject: [PATCH 1/3] fix xaero ore veins using the wrong icons and lang key --- dependencies.gradle | 7 ++++--- .../integration/map/layer/builtin/OreRenderLayer.java | 2 +- .../xaeros/minimap/ore/OreVeinElementRenderer.java | 7 ++++--- .../xaeros/worldmap/ore/OreVeinElementRenderer.java | 11 ++++++----- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3287bdaea81..602498640fe 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -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) diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/layer/builtin/OreRenderLayer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/layer/builtin/OreRenderLayer.java index a66791e8cbb..e50b898943b 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/layer/builtin/OreRenderLayer.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/layer/builtin/OreRenderLayer.java @@ -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) { diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElementRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElementRenderer.java index 7d3cd34f9fa..f652b42bc1d 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElementRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/minimap/ore/OreVeinElementRenderer.java @@ -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; @@ -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) diff --git a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElementRenderer.java b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElementRenderer.java index 8f7a4edd158..0fbe9fa45be 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElementRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/worldmap/ore/OreVeinElementRenderer.java @@ -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; @@ -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) @@ -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) From 723935480c23b25c1e8da8dab0d9d668eae3f0af Mon Sep 17 00:00:00 2001 From: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com> Date: Sun, 12 Jul 2026 04:52:57 -0600 Subject: [PATCH 2/3] sorting by descending weight --- .../gtceu/api/data/worldgen/generator/VeinGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java index f95bee12d0e..c9a7d78ad43 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java @@ -59,7 +59,8 @@ public List getAllBlocks() { public List getAllMaterials() { return getAllEntries().stream() - .sorted(Comparator.comparingInt(VeinEntry::chance)) + .sorted((a, b) -> Integer.compare(b.chance, a.chance)) + //.sorted(Comparator.comparingInt(VeinEntry::chance)) .map(VeinEntry::mapToMaterial) .filter(mat -> !mat.isNull()) .toList(); From 90a639ed7bc5390d0ee71f29e235ef45f77ef5f1 Mon Sep 17 00:00:00 2001 From: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com> Date: Sun, 12 Jul 2026 04:53:21 -0600 Subject: [PATCH 3/3] comment --- .../gtceu/api/data/worldgen/generator/VeinGenerator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java index c9a7d78ad43..92a954d7a4a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java @@ -60,7 +60,6 @@ public List getAllBlocks() { public List getAllMaterials() { return getAllEntries().stream() .sorted((a, b) -> Integer.compare(b.chance, a.chance)) - //.sorted(Comparator.comparingInt(VeinEntry::chance)) .map(VeinEntry::mapToMaterial) .filter(mat -> !mat.isNull()) .toList();