fix ore gen crash

Author: De6ris

changeLog/更新日志.md

@@ -2,6 +2,12 @@
 
 ---
 
+## 1.5.2
+
+* 修复了矿物生成的注册在下界崩溃的问题
+
+---
+
 ## 1.5.1
 
 * `SmeltingRecipeRegisterEvent`能为配方指定热值需求了

src/main/java/moddedmite/rustedironcore/api/event/events/OreGenerationRegisterEvent.java

@@ -4,10 +4,13 @@
 import moddedmite.rustedironcore.api.world.Dimension;
 import net.minecraft.WorldGenMinable;
 
+import java.util.Random;
+import java.util.function.ToIntFunction;
+
 public record OreGenerationRegisterEvent(OreGenerationHandler handler) {
 
     public void register(Dimension dimension, WorldGenMinable ore, int frequency) {
-        register(dimension, ore, frequency, false);
+        this.register(dimension, ore, frequency, false);
     }
 
     public void register(Dimension dimension, WorldGenMinable ore, int frequency, boolean increasesWithDepth) {
@@ -21,4 +24,7 @@ public void unregister(Dimension dimension, int mineId) {
         this.handler.unregisterOre(dimension, mineId);
     }
 
+    public void setDimensionOreHeight(Dimension dimension, ToIntFunction<Random> height) {
+        this.handler.setDimensionOreHeight(dimension, height);
+    }
 }

src/main/java/moddedmite/rustedironcore/api/event/handler/OreGenerationHandler.java

@@ -1,18 +1,28 @@
 package moddedmite.rustedironcore.api.event.handler;
 
 import moddedmite.rustedironcore.api.event.EventHandler;
+import moddedmite.rustedironcore.api.event.Handlers;
 import moddedmite.rustedironcore.api.event.events.OreGenerationRegisterEvent;
 import moddedmite.rustedironcore.api.world.Dimension;
 import net.minecraft.BiomeDecorator;
 import net.minecraft.World;
 import net.minecraft.WorldGenMinable;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.function.ToIntFunction;
 
 public class OreGenerationHandler extends EventHandler<OreGenerationRegisterEvent> {
     private final Map<Dimension, List<Setting>> ORE_MAP = new HashMap<>();
 
+    public static final ToIntFunction<Random> NETHER_ORE_HEIGHT = r -> r.nextInt(108) + 10;
+    private final Map<Dimension, ToIntFunction<Random>> ORE_HEIGHT_MAP = new HashMap<>();
+
+    public OreGenerationHandler() {
+        this.ORE_HEIGHT_MAP.put(Dimension.NETHER, NETHER_ORE_HEIGHT);
+    }
+
     @ApiStatus.Internal
     public void onOresGeneration(Context context) {
         World world = context.world;
@@ -36,11 +46,15 @@ public void unregisterOre(Dimension dimension, int blockId) {
         }
     }
 
-    public static Context context(BiomeDecorator biomeDecorator, World world) {
-        return new Context(biomeDecorator, world);
+    public void setDimensionOreHeight(Dimension dimension, ToIntFunction<Random> height) {
+        this.ORE_HEIGHT_MAP.put(dimension, height);
+    }
+
+    public static Context context(World world, @Nullable BiomeDecorator biomeDecorator, Random random, int blockX, int blockZ) {
+        return new Context(world, biomeDecorator, random, blockX, blockZ);
     }
 
-    public record Context(BiomeDecorator biomeDecorator, World world) {
+    public record Context(World world, @Nullable BiomeDecorator biomeDecorator, Random random, int blockX, int blockZ) {
     }
 
     private static Setting setting(WorldGenMinable ore, int frequency, boolean increasesWithDepth) {
@@ -49,7 +63,28 @@ private static Setting setting(WorldGenMinable ore, int frequency, boolean incre
 
     private record Setting(WorldGenMinable ore, int frequency, boolean increasesWithDepth) {
         private void generate(Context context) {
-            context.biomeDecorator.genMinable(frequency, ore, increasesWithDepth);
+            BiomeDecorator decorator = context.biomeDecorator;
+            if (decorator != null) {
+                decorator.genMinable(frequency, ore, increasesWithDepth);
+                return;
+            }
+            World world = context.world;
+            Dimension dimension = Dimension.fromWorld(world);
+            ToIntFunction<Random> oreHeight;
+            if (dimension != null && Handlers.OreGeneration.ORE_HEIGHT_MAP.containsKey(dimension)) {
+                oreHeight = Handlers.OreGeneration.ORE_HEIGHT_MAP.get(dimension);
+            } else {
+                oreHeight = NETHER_ORE_HEIGHT;
+            }
+            Random random = context.random;
+            int blockX = context.blockX;
+            int blockZ = context.blockZ;
+            for (int i = 0; i < frequency; i++) {
+                int x = blockX + random.nextInt(16);
+                int y = oreHeight.applyAsInt(random);
+                int z = blockZ + random.nextInt(16);
+                ore.generate(world, random, x, y, z);
+            }
         }
     }
 }

src/main/java/moddedmite/rustedironcore/api/world/Dimension.java

@@ -36,6 +36,11 @@ public static Dimension fromId(int id) {
         return ID_TO_DIMENSION.get(id);
     }
 
+    @Nullable
+    public static Dimension fromWorld(World world) {
+        return fromId(world.getDimensionId());
+    }
+
     public boolean isOf(World world) {
         return world.getDimensionId() == this.id;
     }

src/main/java/moddedmite/rustedironcore/mixin/chunk/ChunkProviderHellMixin.java

@@ -54,8 +54,7 @@ private void onDecoration(IChunkProvider par1IChunkProvider, int par2, int par3,
                 ));
         Handlers.OreGeneration.onOresGeneration(
                 OreGenerationHandler.context(
-                        BiomeGenBase.hell.theBiomeDecorator,
-                        this.worldObj
+                        this.worldObj, null, this.hellRNG, blockX, blockZ
                 )
         );
     }

src/main/java/moddedmite/rustedironcore/mixin/world/BiomeDecoratorMixin.java

@@ -36,8 +36,7 @@ public class BiomeDecoratorMixin {
     private void onOresGeneration(CallbackInfo ci) {
         Handlers.OreGeneration.onOresGeneration(
                 OreGenerationHandler.context(
-                        (BiomeDecorator) (Object) this,
-                        this.currentWorld
+                        this.currentWorld, (BiomeDecorator) (Object) this, this.randomGenerator, this.chunk_X, this.chunk_Z
                 )
         );
     }