Fix Xaero's OreVein icons (#5087)

Author: YoungOnionMC

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)

src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/VeinGenerator.java

@@ -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();

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) {

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)

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)