Skip to content

Fix BiomeModificationEvent Not Firing On Dimension Change #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
calmilamsy wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix BiomeModificationEvent Not Firing On Dimension Change #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion station-worldgen-api-v0/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ addModuleDependencies(project,
"station-flattening-v0",
"station-nbt-v0",
"station-biome-events-v0",
"station-blocks-v0"
"station-blocks-v0",
"station-dimensions-v0"
)
9 changes: 9 additions & 0 deletions ...a/net/modificationstation/stationapi/api/event/worldgen/biome/BiomeModificationEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,17 @@
import net.mine_diver.unsafeevents.event.EventPhases;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.dimension.Dimension;
import net.modificationstation.stationapi.api.StationAPI;

/**
* A general event for modifying biomes in a dimension.
* <br><br>
* <b>BE AWARE THAT BIOME OBJECTS MAY BE SHARED BETWEEN DIMENSIONS.
* <br>
* TRACK THIS YOURSELF TO AVOID DUPLICATE MODIFICATIONS.</b>
* @see it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap
*/
@SuperBuilder
@EventPhases(StationAPI.INTERNAL_PHASE)
public class BiomeModificationEvent extends Event {
Expand Down
13 changes: 9 additions & 4 deletions ...rldgen-api-v0/src/main/java/net/modificationstation/stationapi/api/worldgen/BiomeAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.dimension.Dimension;
import net.modificationstation.stationapi.api.StationAPI;
import net.modificationstation.stationapi.api.event.worldgen.biome.BiomeModificationEvent;
import net.modificationstation.stationapi.api.registry.DimensionRegistry;
import net.modificationstation.stationapi.api.util.Identifier;
import net.modificationstation.stationapi.api.worldgen.biome.BiomeProvider;
import net.modificationstation.stationapi.api.worldgen.biome.BiomeRegionsProvider;
Expand All @@ -19,7 +21,7 @@
public class BiomeAPI {
private static Map<Identifier, BiomeProvider> overworldProviders = new Reference2ObjectOpenHashMap<>(16);
private static Map<Identifier, BiomeProvider> netherProviders = new Reference2ObjectOpenHashMap<>(16);
private static final Object2BooleanMap<World> MODIFICATIONS_APPLIED = new Object2BooleanOpenHashMap<>(16);
private static final Object2BooleanMap<Identifier> MODIFICATIONS_APPLIED = new Object2BooleanOpenHashMap<>(16);

private static BiomeRegionsProvider overworldProvider;
private static BiomeRegionsProvider netherProvider;
Expand Down Expand Up @@ -127,9 +129,12 @@ public static void init(World world, long seed) {

overworldProvider.setSeed(seed);
netherProvider.setSeed(seed);

if (!MODIFICATIONS_APPLIED.getBoolean(world)) {
MODIFICATIONS_APPLIED.put(world, true);
}

public static void modifyBiomes(World world) {
Identifier dimId = DimensionRegistry.INSTANCE.getIdByLegacyId(world.dimension.id).orElseThrow();
if (!MODIFICATIONS_APPLIED.getBoolean(dimId)) {
MODIFICATIONS_APPLIED.put(dimId, true); // World objects have the same hash, somehow, plus dimensions are the thing that control biomes
world.dimension.getBiomes().forEach(biome -> {
StationAPI.EVENT_BUS.post(BiomeModificationEvent.builder().biome(biome).world(world).build());
});
Expand Down
21 changes: 21 additions & 0 deletions ...pi-v0/src/main/java/net/modificationstation/stationapi/mixin/worldgen/DimensionMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package net.modificationstation.stationapi.mixin.worldgen;

import net.minecraft.world.World;
import net.minecraft.world.dimension.Dimension;
import net.modificationstation.stationapi.api.worldgen.BiomeAPI;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(Dimension.class)
public class DimensionMixin {
@Shadow
public World world;

@Inject(method = "setWorld", at = @At(value = "RETURN"))
private void modifyBiomes(CallbackInfo ci) {
BiomeAPI.modifyBiomes(world);
}
}
1 change: 1 addition & 0 deletions station-worldgen-api-v0/src/main/resources/station-worldgen-api-v0.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"mixins": [
"BiomeMixin",
"BiomeSourceMixin",
"DimensionMixin",
"NetherDimensionMixin",
"NetherWorldSourceMixin",
"OverworldDimensionMixin",
Expand Down