wip: start updating to 24w34a

A lot doesn't compile with some registries having changed. Some kinds have migrated to records, moving away from enums. This poses some slight problem with representing the kinds themselves for API usage.
SpongePowered · Aug 25, 2024 · 4485781 · 4485781
1 parent 42dc372
commit 4485781
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 22 deletions.
diff --git a/src/main/java/org/spongepowered/api/data/Keys.java b/src/main/java/org/spongepowered/api/data/Keys.java
@@ -265,7 +265,6 @@
 import org.spongepowered.api.world.explosion.Explosion;
 import org.spongepowered.api.world.generation.ChunkGenerator;
 import org.spongepowered.api.world.generation.carver.Carver;
-import org.spongepowered.api.world.generation.carver.CarvingStep;
 import org.spongepowered.api.world.generation.config.WorldGenerationConfig;
 import org.spongepowered.api.world.generation.feature.DecorationStep;
 import org.spongepowered.api.world.generation.feature.PlacedFeature;
@@ -656,7 +655,7 @@ public final class Keys {
      * The carvers of a {@link Biome} used during world generation.
      * Readonly
      */
-    public static final Key<MapValue<CarvingStep, List<Carver>>> CARVERS = Keys.mapKey(ResourceKey.sponge("carvers"), TypeToken.get(CarvingStep.class), new TypeToken<List<Carver>>() {});
+    public static final Key<ListValue<Carver>> CARVERS = Keys.listKey(ResourceKey.sponge("carvers"), Carver.class);
 
     /**
      * The current casting time of a {@link Spellcaster}.

diff --git a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java
@@ -165,7 +165,6 @@
 import org.spongepowered.api.world.gamerule.GameRule;
 import org.spongepowered.api.world.generation.carver.Carver;
 import org.spongepowered.api.world.generation.carver.CarverType;
-import org.spongepowered.api.world.generation.carver.CarvingStep;
 import org.spongepowered.api.world.generation.config.flat.FlatGeneratorConfig;
 import org.spongepowered.api.world.generation.config.noise.DensityFunction;
 import org.spongepowered.api.world.generation.config.noise.Noise;
@@ -306,8 +305,6 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<CatType> CAT_TYPE = RegistryTypes.minecraftKeyInGame("cat_variant");
 
-    public static final DefaultedRegistryType<CarvingStep> CARVING_STEP = RegistryTypes.spongeKeyInGame("carving_step");
-
     public static final DefaultedRegistryType<ChatVisibility> CHAT_VISIBILITY = RegistryTypes.spongeKeyInGame("chat_visibility");
 
     public static final DefaultedRegistryType<ChestAttachmentType> CHEST_ATTACHMENT_TYPE = RegistryTypes.spongeKeyInGame("chest_attachment_type");

diff --git a/src/main/java/org/spongepowered/api/world/biome/Biome.java b/src/main/java/org/spongepowered/api/world/biome/Biome.java
@@ -42,7 +42,6 @@
 import org.spongepowered.api.world.biome.spawner.NaturalSpawnCost;
 import org.spongepowered.api.world.biome.spawner.NaturalSpawner;
 import org.spongepowered.api.world.generation.carver.Carver;
-import org.spongepowered.api.world.generation.carver.CarvingStep;
 import org.spongepowered.api.world.generation.feature.DecorationStep;
 import org.spongepowered.api.world.generation.feature.PlacedFeature;
 
@@ -116,7 +115,7 @@ default TemperatureModifier temperatureModifier() {
      *
      * @return The carvers
      */
-    default Map<CarvingStep, List<Carver>> carvers() {
+    default List<Carver> carvers() {
         return this.require(Keys.CARVERS);
     }
 

diff --git a/src/main/java/org/spongepowered/api/world/generation/carver/CarvingStep.java b/src/main/java/org/spongepowered/api/world/generation/carver/CarvingStep.java
@@ -24,12 +24,9 @@
  */
 package org.spongepowered.api.world.generation.carver;
 
-import org.spongepowered.api.util.annotation.CatalogedBy;
-
 /**
  * A carving step for {@link Carver carvers}
  */
-@CatalogedBy(CarvingSteps.class)
 public interface CarvingStep {
 
 }
diff --git a/src/main/java/org/spongepowered/api/world/generation/carver/CarvingSteps.java b/src/main/java/org/spongepowered/api/world/generation/carver/CarvingSteps.java
@@ -37,21 +37,9 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class CarvingSteps {
     // @formatter:off
-
-    public static final DefaultedRegistryReference<CarvingStep> AIR = CarvingSteps.key(ResourceKey.sponge("air"));
-
-    public static final DefaultedRegistryReference<CarvingStep> LIQUID = CarvingSteps.key(ResourceKey.sponge("liquid"));
-
     // @formatter:on
 
     private CarvingSteps() {
     }
 
-    public static Registry<CarvingStep> registry() {
-        return Sponge.game().registry(RegistryTypes.CARVING_STEP);
-    }
-
-    private static DefaultedRegistryReference<CarvingStep> key(final ResourceKey location) {
-        return RegistryKey.of(RegistryTypes.CARVING_STEP, location).asDefaultedReference(Sponge::game);
-    }
 }