diff --git a/src/main/java/appeng/mixins/spatial/BiomeKeysMixin.java b/src/main/java/appeng/mixins/spatial/BuiltinBiomesMixin.java similarity index 84% rename from src/main/java/appeng/mixins/spatial/BiomeKeysMixin.java rename to src/main/java/appeng/mixins/spatial/BuiltinBiomesMixin.java index b495e6871..cd823a838 100644 --- a/src/main/java/appeng/mixins/spatial/BiomeKeysMixin.java +++ b/src/main/java/appeng/mixins/spatial/BuiltinBiomesMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.BiomeKeys; +import net.minecraft.world.biome.BuiltinBiomes; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; @@ -23,21 +23,21 @@ import appeng.spatial.SpatialStorageDimensionIds; * This only needs to be here because the server-side will create a dynamic * registry manager long before our mod is initialized. */ -@Mixin(BiomeKeys.class) -public class BiomeKeysMixin { +@Mixin(BuiltinBiomes.class) +public class BuiltinBiomesMixin { @Unique private static final Logger LOGGER = LogManager.getLogger(); @Shadow - private static Int2ObjectMap> BIOMES; + private static Int2ObjectMap> BY_RAW_ID; @Inject(method = "", at = @At("TAIL")) private static void registerBiomes(CallbackInfo ci) { BuiltinRegistries.add(BuiltinRegistries.BIOME, SpatialStorageDimensionIds.BIOME_KEY.getValue(), SpatialStorageBiome.INSTANCE); int rawId = BuiltinRegistries.BIOME.getRawId(SpatialStorageBiome.INSTANCE); - RegistryKey prev = BIOMES.put(rawId, SpatialStorageDimensionIds.BIOME_KEY); + RegistryKey prev = BY_RAW_ID.put(rawId, SpatialStorageDimensionIds.BIOME_KEY); if (prev != null) { LOGGER.warn("Biome with raw-id {} was already registered: {}", rawId, prev); } diff --git a/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java b/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java index d2d6ca03f..bf502c2fd 100644 --- a/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java +++ b/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java @@ -49,7 +49,7 @@ public class DimensionTypeMixin { dimensionType); } - @Inject(method = "method_28517", at = @At("RETURN")) + @Inject(method = "createDefaultDimensionOptions", at = @At("RETURN")) private static void buildDimensionRegistry(Registry dimensionTypes, Registry biomes, Registry chunkGeneratorSettings, long seed, CallbackInfoReturnable> cir) { diff --git a/src/main/resources/appliedenergistics2.mixins.json b/src/main/resources/appliedenergistics2.mixins.json index 4f99da186..823c20238 100644 --- a/src/main/resources/appliedenergistics2.mixins.json +++ b/src/main/resources/appliedenergistics2.mixins.json @@ -7,7 +7,7 @@ "spatial.DimensionTypeMixin", "spatial.DimensionOptionMixin", "spatial.EntityMixin", - "spatial.BiomesMixin", + "spatial.BuiltinBiomesMixin", "structure.StructuresConfigMixin", "structure.ConfiguredStructureFeaturesAccessor", "structure.StructureFeatureAccessor",