先把矿石注册的代码注释上

KasugaLibGroup · Dec 31, 2024 · f942dcd · f942dcd
1 parent 62bf866
commit f942dcd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/src/generated/resources/data/kasuga_lib/forge/biome_modifier/add_salt_ore.json b/src/generated/resources/data/kasuga_lib/forge/biome_modifier/add_salt_ore.json
diff --git a/src/main/java/kasuga/lib/example_env/AllExampleElements.java b/src/main/java/kasuga/lib/example_env/AllExampleElements.java
@@ -177,13 +177,13 @@ public class AllExampleElements {
                     .tabTo(tab)
                     .submit(ExampleMain.testRegistry);
 
-    public static final OreReg<DropExperienceBlock> exampleOreConfig = new OreReg<DropExperienceBlock>("salt_ore")
+/*    public static final OreReg<DropExperienceBlock> exampleOreConfig = new OreReg<DropExperienceBlock>("salt_ore")
             .setOreBlock(SALT_ORE::getBlock)
             .setOreCountPerChunk(20)
             .setOreQuantityPerGroup(100)
             .setOreDistributionType(PlacedFeatureReg.DistributionType.TRIANGLE)
             .setOreAnchorAbsolute(80, -80)
-            .submit(ExampleMain.testRegistry);
+            .submit(ExampleMain.testRegistry);*/
 
     public static final MenuReg<GreenAppleMenu, GreenAppleScreen> apple =
             new MenuReg<GreenAppleMenu, GreenAppleScreen>("green_apple_screen")

diff --git a/src/main/java/kasuga/lib/registrations/common/ConfiguredFeatureReg.java b/src/main/java/kasuga/lib/registrations/common/ConfiguredFeatureReg.java
@@ -32,10 +32,10 @@ public ConfiguredFeatureReg(String registrationKey) {
         super(registrationKey);
     }
 
-    public ConfiguredFeatureReg<T> addOreConfigTarget(Supplier<T> ore) {
+    public ConfiguredFeatureReg<T> addOreConfigTarget(T ore) {
         oreConfigTargetList.add(OreConfiguration.target(
                 OreFeatures.STONE_ORE_REPLACEABLES,
-                ore.get().defaultBlockState()));
+                ore.defaultBlockState()));
         return this;
     }
 

diff --git a/src/main/java/kasuga/lib/registrations/common/OreReg.java b/src/main/java/kasuga/lib/registrations/common/OreReg.java
@@ -14,6 +14,8 @@
 
 public class OreReg<T extends Block> extends Reg {
 
+    private Supplier<T> oreBlockSupplier;
+
     private ConfiguredFeatureReg<T> configuredFeatureObject = null;
 
     private PlacedFeatureReg placedFeatureObject = null;
@@ -24,8 +26,8 @@ public OreReg(String registrationKey) {
         this.placedFeatureObject = new PlacedFeatureReg(registrationKey + "_placed");
     }
 
-    public OreReg<T> setOreBlock(Supplier<T> oreBlock) {
-        this.configuredFeatureObject.addOreConfigTarget(oreBlock);
+    public OreReg<T> setOreBlock(Supplier<T> oreBlockSupplier) {
+        this.oreBlockSupplier = oreBlockSupplier;
         return this;
     }
 
@@ -72,7 +74,8 @@ public OreReg<T> setOreCountPerChunk(int count) {
     @Override
     public OreReg<T> submit(SimpleRegistry registry) {
         if (configuredFeatureObject == null || placedFeatureObject == null)
-            throw new NullPointerException("ConfiguredFeature or placedFeature is null in OreReg!");
+            throw new NullPointerException("Either ConfiguredFeature or PlacedFeature is null in OreReg!");
+        configuredFeatureObject.addOreConfigTarget(oreBlockSupplier.get());
         configuredFeatureObject.submit(registry);
         placedFeatureObject.setConfiguredFeatureObject(configuredFeatureObject.getRegistryObject());
         placedFeatureObject.submit(registry);