Fixed #55

Author: eivindnorling

CHANGELOG.md

@@ -1,11 +1,15 @@
-**v1.16.5 - 2.6.0 **  
+**v1.16.5 - 2.7.0**  
+* Fixed a game breaking bug where ores with the same properties causes the game to crash.  
+* Updated to the latest forge version.  
+  
+**v1.16.5 - 2.6.0**  
 **IMPORTANT UPDATE**  
 * I hope this patch fixes a bug causing all vanilla ores to not generate for some people.  
   * The bug only occurred for some users probably due to their Java VM and some differences in how they cast values.  
   * Some Java VMs fail to format and cast String.format("%s_%s_%d_%d_%f_%d") properly and ends up creating an illegal ResourceLocation for each ore entry.  
   * **Update to this version to fix!**  
 
-v1.16.5 - 2.5.1
+**v1.16.5 - 2.5.1**
 * Changed template to use new BiomeDictionary Type MOUNTAIN for Emerald Ore and Infested Stone.
 * Started working on enhancing performance when generating new chunks and biomes.
 * Ore reconstruction from JSON now cashes a lot of stuff to reduce stress on biome loading.

gradle.properties

@@ -2,14 +2,14 @@
 org.gradle.jvmargs=-Xmx3G
 
 # Mod Info
-VERSION=2.6.0
+VERSION=2.7.0
 AUTHOR=Ewy
 MODNAME=OreTweaker
 MODID=oretweaker
 
 # Dependencies
 MC_VERSION=1.16.5
-FORGE_VERSION=36.2.9
+FORGE_VERSION=36.2.33
 
 # Mappings
 MCP_CHANNEL=official
@@ -21,5 +21,4 @@ BIBLIOTHECA=3334930
 
 # Curse Forge
 PROJECT_ID=242436
-RELEASE_TYPE=release
-
+RELEASE_TYPE=release

src/main/java/com/ewyboy/oretweaker/tweaking/construction/OreReconstruction.java

@@ -69,13 +69,28 @@ private static void reconstructFeatureFromJSON() {
         }
     }
 
+    private static String makeRegistryNameUnique(String name) {
+        if (registryNames.contains(name)) {
+            int i = 1;
+            while (registryNames.contains(name + "_" +  i)) {
+                i++;
+            }
+            return name + "_" +  i;
+        }
+        return name;
+    }
+
+    private static final List<String> registryNames = new ArrayList<>();
+
     private static ConfiguredFeature<?, ?> reconstructOre(Block ore, Block filler, int minY, int maxY, float spawnRate, int maxVeinSize) {
         ModLogger.debug("Reconstructing ore: " + ore);
-        String registryName = String.format("%s_%s_%s_%s_%s_%s",
+        String registryName = String.format("ore_feature_%s_%s_%s_%s_%s_%s",
                 Objects.requireNonNull(ore.getRegistryName()).getPath(),
                 Objects.requireNonNull(filler.getRegistryName()).getPath(),
                 minY, maxY, spawnRate, maxVeinSize
         );
+        registryName = makeRegistryNameUnique(registryName);
+        registryNames.add(registryName);
         return register(
                 registryName, reconstructFeature(
                         ore,