Remove unnecessary reflection #change "Remove some unnecessary reflection throwing errors" #release beta

Author: Prospector

gradle.properties

@@ -1,11 +1,11 @@
 org.gradle.jvmargs=-Xmx1G
 
-mod_version=1.0.0
+mod_version=1.0.1
 maven_group=com.terraformersmc
 archive_name=cinderscapes
 
-minecraft_version=1.16
-yarn_mappings=1.16+build.1
+minecraft_version=1.16.1
+yarn_mappings=1.16.1+build.4
 loader_version=0.8.8+build.202
 fabric_version=0.13.1+build.370-1.16
 terraform_version=1.6.10+build.21
@@ -23,7 +23,7 @@ default_release_type=beta
 # CurseForge Metadata
 curseforge_slug=cinderscapes
 curseforge_id=391429
-curseforge_game_versions=1.16, Fabric
+curseforge_game_versions=1.16.1, Fabric
 curseforge_required_dependencies=fabric-api
 curseforge_optional_dependencies=
 

src/main/java/com/terraformersmc/cinderscapes/mixin/BiomeAccessor.java

@@ -0,0 +1,13 @@
+package com.terraformersmc.cinderscapes.mixin;
+
+import net.minecraft.world.biome.Biome;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Mixin(Biome.class)
+public interface BiomeAccessor {
+    @Accessor
+    List<Biome.MixedNoisePoint> getNoisePoints();
+}

src/main/java/com/terraformersmc/cinderscapes/util/NoiseCollisionChecker.java

@@ -1,19 +1,18 @@
 package com.terraformersmc.cinderscapes.util;
 
+import com.terraformersmc.cinderscapes.mixin.BiomeAccessor;
 import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.biome.Biome;
 
-import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 //TODO: Check
 @SuppressWarnings("unchecked")
 public class NoiseCollisionChecker {
-    private static Map<Biome, Long> Hashes = new HashMap<>();
+    private static final Map<Biome, Long> HASHES = new HashMap<>();
 
     public static void init() {
         for (Biome biome : Registry.BIOME) {
@@ -30,28 +29,22 @@ public static void init() {
     }
 
     private static void check(Biome biome) {
-        //use cursed reflection to make sure no biomes have noise collisions
-        try {
-            Field noisePoints = Biome.class.getDeclaredField("noisePoints");
-            noisePoints.setAccessible(true);
-            List<Biome.MixedNoisePoint> points = (List<Biome.MixedNoisePoint>) noisePoints.get(biome);
-            //biomes can have multiple noise points so we hash all of them
-            long hash = 0;
-            for (Biome.MixedNoisePoint point : points) {
-                hash += point.hashCode();
+        List<Biome.MixedNoisePoint> points = ((BiomeAccessor) biome).getNoisePoints();
+        //biomes can have multiple noise points so we hash all of them
+        long hash = 0;
+        for (Biome.MixedNoisePoint point : points) {
+            hash += point.hashCode();
+        }
+
+        // ensure the biomes have distinct hashes
+        long finalHash = hash;
+        HASHES.forEach((cachedBiome, biomeHash) -> {
+            if (finalHash == biomeHash) {
+                System.out.println("WARNING: " + biome.getTranslationKey() + " and " + cachedBiome.getTranslationKey() + " have the same mixed noise points! They won't generate properly!!!!");
             }
+        });
+
+        HASHES.put(biome, hash);
 
-            // ensure the biomes have distinct hashes
-            long finalHash = hash;
-            Hashes.forEach((cachedBiome, biomeHash) -> {
-                if (finalHash == biomeHash) {
-                    System.out.println("WARNING: " + biome.getTranslationKey() + " and " + cachedBiome.getTranslationKey() + " have the same mixed noise points! They won't generate properly!!!!");
-                }
-            });
-
-            Hashes.put(biome, hash);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
     }
 }

src/main/resources/cinderscapes.mixins.json

@@ -3,6 +3,7 @@
   "package": "com.terraformersmc.cinderscapes.mixin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
+    "BiomeAccessor",
     "ServerWorldMixin"
   ],
   "client": [

src/main/resources/fabric.mod.json

@@ -9,6 +9,10 @@
     "NeusFear",
     "TerraformersMC"
   ],
+  "contributors": [
+    "SuperCoder79",
+    "Prospector"
+  ],
   "contact": {
     "sources": "https://github.com/TerraformersMC/Cinderscapes"
   },