Fix Ore generation Page glitches (#1668)

Author: ALongStringOfNumbers

src/main/java/gregtech/api/GTValues.java

@@ -75,7 +75,8 @@ public class GTValues {
         MODID_CT = "crafttweaker",
         MODID_TOP = "theoneprobe",
         MODID_CTM = "ctm",
-        MODID_CC = "cubicchunks";
+        MODID_CC = "cubicchunks",
+        MODID_AR = "advancedrocketry";
 
     //because forge is too fucking retarded to cache results or at least do not create fucking
     //immutable collections every time you retrieve indexed mod list

src/main/java/gregtech/api/worldgen/config/WorldGenRegistry.java

@@ -49,7 +49,7 @@ private WorldGenRegistry() {
     private final Map<String, Supplier<ShapeGenerator>> shapeGeneratorRegistry = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
     private final Map<String, Supplier<BlockFiller>> blockFillerRegistry = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
     private final Map<String, Supplier<IVeinPopulator>> veinPopulatorRegistry = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-    private final Map<String, Integer> namedDimensions = new HashMap<>();
+    private final Map<Integer, String> namedDimensions = new HashMap<>();
 
     private final List<OreDepositDefinition> registeredDefinitions = new ArrayList<>();
     private final Map<WorldProvider, WorldOreVeinCache> oreVeinCache = new WeakHashMap<>();
@@ -221,7 +221,7 @@ private void gatherNamedDimensions(Path dimensionsFile) {
         try {
             JsonArray dims = element.getAsJsonArray("dims");
             for(JsonElement dim : dims) {
-                namedDimensions.put(dim.getAsJsonObject().get("dimName").getAsString(), dim.getAsJsonObject().get("dimID").getAsInt());
+                namedDimensions.put(dim.getAsJsonObject().get("dimID").getAsInt(), dim.getAsJsonObject().get("dimName").getAsString());
             }
         } catch (RuntimeException exception){
             GTLog.logger.error("Failed to parse named dimensions", exception);
@@ -279,7 +279,7 @@ public static List<OreDepositDefinition> getOreDeposits() {
         return Collections.unmodifiableList(INSTANCE.registeredDefinitions);
     }
 
-    public static Map<String, Integer> getNamedDimensions() {
+    public static Map<Integer, String> getNamedDimensions() {
         return INSTANCE.namedDimensions;
     }
 

src/main/java/gregtech/integration/jei/GTOreCategory.java

@@ -1,8 +1,11 @@
 package gregtech.integration.jei;
 
 import gregtech.api.gui.GuiTextures;
+import gregtech.api.util.GTLog;
+import gregtech.api.worldgen.config.OreDepositDefinition;
 import gregtech.api.worldgen.config.WorldGenRegistry;
 import gregtech.integration.jei.recipe.primitive.PrimitiveRecipeCategory;
+import it.unimi.dsi.fastutil.ints.IntSortedSet;
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
 import mezz.jei.api.gui.IGuiItemStackGroup;
@@ -11,20 +14,29 @@
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.world.DimensionType;
+import net.minecraftforge.common.DimensionManager;
 
-import java.util.Map;
+import java.util.*;
+import java.util.function.Supplier;
+
+import static gregtech.api.GTValues.MODID_AR;
+import static gregtech.api.GTValues.isModLoaded;
 
 public class GTOreCategory extends PrimitiveRecipeCategory<GTOreInfo, GTOreInfo> {
 
     protected final IDrawable slot;
+    protected OreDepositDefinition definition;
     protected String veinName;
     protected int minHeight;
     protected int maxHeight;
     protected int outputCount;
     protected int weight;
-    protected int[] dimensionIDs;
+    protected List<Integer> dimensionIDs;
     protected final int FONT_HEIGHT = Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT;
-    protected final Map<String, Integer> namedDimensions = WorldGenRegistry.getNamedDimensions();
+    protected final Map<Integer, String> namedDimensions = WorldGenRegistry.getNamedDimensions();
+    private Map<DimensionType, IntSortedSet> dimMap =  DimensionManager.getRegisteredDimensions();
+    private Supplier<List<Integer>> dimension = this::getAllRegisteredDimensions;
     private final int NUM_OF_SLOTS = 5;
     private final int SLOT_WIDTH = 18;
     private final int SLOT_HEIGHT = 18;
@@ -65,7 +77,7 @@ public void setRecipe(IRecipeLayout recipeLayout, GTOreInfo recipeWrapper, IIngr
         maxHeight = recipeWrapper.getMaxHeight();
         outputCount = recipeWrapper.getOutputCount();
         weight = recipeWrapper.getWeight();
-        dimensionIDs = recipeWrapper.getDimensionIDs();
+        definition = recipeWrapper.getDefinition();
     }
 
     @Override
@@ -86,7 +98,7 @@ public void drawExtras(Minecraft minecraft) {
         //Selected Ore
         this.slot.draw(minecraft, 22, baseYPos);
         //Surface Identifier
-        this.slot.draw(minecraft, 22, 73);
+        this.slot.draw(minecraft, 22, SLOT_HEIGHT * (NUM_OF_SLOTS - 1) + 1);
 
         int yPos = 0;
         for(int i = 0; i < outputCount; i++) {
@@ -96,17 +108,20 @@ public void drawExtras(Minecraft minecraft) {
             this.slot.draw(minecraft, xPos, yPos);
         }
 
-        baseYPos = yPos; //has to be set to position of last rendered slot for later use
+        //base positions set to position of last rendered slot for later use.
+        //Must account for the fact that yPos is the top corner of the slot, so add in another slot height
+        baseYPos = yPos + SLOT_HEIGHT;
 
         drawVeinName(minecraft.fontRenderer);
 
         //Begin Drawing information, depending on how many rows of ore outputs were created
         //Give room for 5 lines of 5 ores each, so 25 unique ores in the vein
-        if(baseYPos > 73) {
+        //73 is SLOT_HEIGHT * (NUM_OF_SLOTS - 1) + 1
+        if(baseYPos >= SLOT_HEIGHT * NUM_OF_SLOTS) {
             minecraft.fontRenderer.drawString("Spawn Range: " + minHeight + "-" + maxHeight, 70, baseYPos + 1, 0x111111);
         }
         else {
-            minecraft.fontRenderer.drawString("Spawn Range: " + minHeight + "-" + maxHeight, 70, 73, 0x111111);
+            minecraft.fontRenderer.drawString("Spawn Range: " + minHeight + "-" + maxHeight, 70, SLOT_HEIGHT * (NUM_OF_SLOTS - 1) + 1, 0x111111);
             //Update the position at which the spawn information ends
             baseYPos = 73;
         }
@@ -117,27 +132,25 @@ public void drawExtras(Minecraft minecraft) {
         //Create the Dimensions
         minecraft.fontRenderer.drawString("Dimensions: ", 70, baseYPos + (2 * FONT_HEIGHT), 0x111111);
 
+        dimensionIDs = dimension.get();
+
         //Will attempt to write dimension IDs in a single line, separated by commas. If the list is so long such that it
         //would run off the end of the page, the list is continued on a new line.
-        for(int i = 0; i < dimensionIDs.length; i++) {
+        for(int i = 0; i < dimensionIDs.size(); i++) {
 
             //If the dimension name is included, append it to the dimension number
-            if(namedDimensions.containsValue(dimensionIDs[i])) {
-                int finalI = i;
-                dimName = namedDimensions.entrySet().stream()
-                                            .filter(entry -> dimensionIDs[finalI] == entry.getValue())
-                                            .map(Map.Entry::getKey)
-                                            .findFirst().get();
-                fullDimName = i == dimensionIDs.length - 1 ?
-                    dimensionIDs[i] + " (" + dimName + ")" :
-                    dimensionIDs[i] + " (" + dimName + "),";
+            if(namedDimensions.containsKey(dimensionIDs.get(i))) {
+                dimName = namedDimensions.get(dimensionIDs.get(i));
+                fullDimName = i == dimensionIDs.size() - 1 ?
+                    dimensionIDs.get(i) + " (" + dimName + ")" :
+                    dimensionIDs.get(i) + " (" + dimName + "), ";
             }
             //If the dimension name is not included, just add the dimension number
             else {
 
-                fullDimName = i == dimensionIDs.length - 1 ?
-                    Integer.toString(dimensionIDs[i]) :
-                    dimensionIDs[i] + ",";
+                fullDimName = i == dimensionIDs.size() - 1 ?
+                    Integer.toString(dimensionIDs.get(i)) :
+                    dimensionIDs.get(i) + ", ";
             }
 
             //Find the length of the dimension name string
@@ -157,7 +170,7 @@ public void drawExtras(Minecraft minecraft) {
 
 
         //Label the Surface Identifier
-        minecraft.fontRenderer.drawSplitString("SurfaceMaterial", 15, 92, 42, 0x111111);
+        minecraft.fontRenderer.drawSplitString("SurfaceMaterial", 15, 92, minecraft.fontRenderer.getStringWidth("Surface"), 0x111111);
 
     }
 
@@ -176,4 +189,46 @@ private void drawVeinName(final FontRenderer fontRenderer) {
 
         fontRenderer.drawString(veinNameToDraw, startPosition, 1, 0x111111);
     }
+
+    public List<Integer> getAllRegisteredDimensions() {
+        List<Integer> dims = new ArrayList<>();
+        dimMap.values().stream()
+                .flatMap(Collection::stream)
+                .mapToInt(Integer::intValue)
+                .filter(num -> definition.getDimensionFilter().test(DimensionManager.createProviderFor(num)))
+                .forEach(dims::add);
+
+        if(isModLoaded(MODID_AR)) {
+            try {
+                int[] plantDims = DimensionManager.getDimensions(DimensionType.byName("planet"));
+                int[] asteroidDims = DimensionManager.getDimensions(DimensionType.byName("asteroid"));
+                int[] spaceDims = DimensionManager.getDimensions(DimensionType.byName("space"));
+
+                //Add the Planets to the dimension list
+                Arrays.stream(plantDims)
+                        .filter(num -> !dims.contains(num))
+                        .filter(num -> definition.getDimensionFilter().test(DimensionManager.createProviderFor(num)))
+                        .forEach(dims::add);
+
+                //Add the Asteroids to the dimension list
+                Arrays.stream(asteroidDims)
+                        .filter(num -> !dims.contains(num))
+                        .filter(num -> definition.getDimensionFilter().test(DimensionManager.createProviderFor(num)))
+                        .forEach(dims::add);
+
+                //Remove Space from the dimension list
+                for (int spaceDim : spaceDims) {
+                    if (dims.contains(spaceDim)) {
+                        dims.remove((Integer) spaceDim);
+                    }
+                }
+            }
+            catch (IllegalArgumentException e) {
+                GTLog.logger.error("Something went wrong with AR JEI integration, No DimensionType found");
+                GTLog.logger.error(e);
+            }
+        }
+
+        return dims;
+    }
 }

src/main/java/gregtech/integration/jei/GTOreInfo.java

@@ -9,17 +9,14 @@
 import gregtech.api.worldgen.populator.IVeinPopulator;
 import gregtech.api.worldgen.populator.SurfaceBlockPopulator;
 import gregtech.api.worldgen.populator.SurfaceRockPopulator;
-import it.unimi.dsi.fastutil.ints.IntSortedSet;
 import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.biome.Biome;
-import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.fluids.*;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -39,13 +36,11 @@ public class GTOreInfo implements IRecipeWrapper {
     private final String name;
     private final String description;
     private final int weight;
-    private final int[] dimensionIDs;
     private final IVeinPopulator veinPopulator;
     private final BlockFiller blockFiller;
     private List<List<ItemStack>> groupedInputsAsItemStacks = new ArrayList<>();
     private List<List<ItemStack>> groupedOutputsAsItemStacks = new ArrayList<>();
     private final Function<Biome, Integer> biomeFunction;
-    private Map<DimensionType, IntSortedSet> dimMap =  DimensionManager.getRegisteredDimensions();
 
     public GTOreInfo(OreDepositDefinition definition) {
         this.definition = definition;
@@ -83,13 +78,6 @@ public GTOreInfo(OreDepositDefinition definition) {
 
         this.biomeFunction = definition.getBiomeWeightModifier();
 
-        //Gather the dimension IDs that the vein can spawn in
-         dimensionIDs = dimMap.values().stream()
-            .flatMap(Collection::stream)
-            .mapToInt(Integer::intValue)
-            .filter(num -> definition.getDimensionFilter().test(DimensionManager.createProviderFor(num)))
-            .toArray();
-
         //Group the input ores and the Surface Identifier
         List<ItemStack> generatedBlocksAsItemStacks = findComponentBlocksAsItemStacks();
         groupedInputsAsItemStacks.add(generatedBlocksAsItemStacks);
@@ -211,7 +199,7 @@ else if(veinPopulator instanceof FluidSpringPopulator) {
             }
         }
 
-        //Should never reach here?
+        //No defined surface rock
         return stack;
     }
 
@@ -326,7 +314,6 @@ public List<String> createOreWeightingTooltip(int slotIndex) {
         return tooltip;
     }
 
-
     public int getOutputCount() {
         return groupedOutputsAsItemStacks.size();
     }
@@ -343,11 +330,11 @@ public int getMinHeight() {
         return minHeight;
     }
 
-    public int[] getDimensionIDs() {
-        return  dimensionIDs;
-    }
-
     public int getWeight() {
         return weight;
     }
+
+    public OreDepositDefinition getDefinition() {
+        return definition;
+    }
 }