Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move mixin for detection of newly generated chunks for a better compatibillity with worldgeneration mods. 

Fixes #101
This commit is contained in:
Blue (Lukas Rieger) 2020-10-02 15:57:55 +02:00
parent 00b9b05431
commit 8471f3275a
No known key found for this signature in database
GPG Key ID: 904C4995F9E1F800
6 changed files with 63 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinChunkGenerator.java → implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinThreadedAnvilChunkStorage.java
View File

@ -24,23 +24,35 @@
*/
package de.bluecolored.bluemap.fabric.mixin;
import java.util.concurrent.CompletableFuture;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.flowpowered.math.vector.Vector2i;
import com.mojang.datafixers.util.Either;
import de.bluecolored.bluemap.fabric.events.ChunkFinalizeCallback;
import net.minecraft.world.ChunkRegion;
import net.minecraft.world.gen.chunk.ChunkGenerator;
import net.minecraft.server.world.ChunkHolder;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.server.world.ThreadedAnvilChunkStorage;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.ChunkStatus;
@Mixin(ChunkGenerator.class)
public class MixinChunkGenerator {
@Mixin(ThreadedAnvilChunkStorage.class)
public abstract class MixinThreadedAnvilChunkStorage {
@Inject(at = @At("RETURN"), method = "generateFeatures")
public void generateFeatures(ChunkRegion region, CallbackInfo ci) {
ChunkFinalizeCallback.EVENT.invoker().onChunkFinalized(region.getWorld(), new Vector2i(region.getCenterChunkX(), region.getCenterChunkZ()));
@Accessor("world")
public abstract ServerWorld getWorld();
@Inject(at = @At("RETURN"), method = "method_20617")
public void upgradeChunk(ChunkHolder holder, ChunkStatus requiredStatus, CallbackInfoReturnable<CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>>> ci) {
if (requiredStatus == ChunkStatus.FULL) {
ChunkFinalizeCallback.EVENT.invoker().onChunkFinalized(getWorld(), new Vector2i(holder.getPos().x, holder.getPos().z));
}
}
}

2
implementations/fabric-1.15.2/src/main/resources/bluemap.mixins.json
View File

@ -6,7 +6,7 @@
"mixins": [],
"client": [],
"server": [
"MixinChunkGenerator",
"MixinThreadedAnvilChunkStorage",
"MixinPlayerManager",
"MixinServerWorld"
],

29
implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinChunkGenerator.java → implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinThreadedAnvilChunkStorage.java
View File

@ -24,24 +24,35 @@
*/
package de.bluecolored.bluemap.fabric.mixin;
import java.util.concurrent.CompletableFuture;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.flowpowered.math.vector.Vector2i;
import com.mojang.datafixers.util.Either;
import de.bluecolored.bluemap.fabric.events.ChunkFinalizeCallback;
import net.minecraft.world.ChunkRegion;
import net.minecraft.world.gen.StructureAccessor;
import net.minecraft.world.gen.chunk.ChunkGenerator;
import net.minecraft.server.world.ChunkHolder;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.server.world.ThreadedAnvilChunkStorage;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.ChunkStatus;
@Mixin(ChunkGenerator.class)
public class MixinChunkGenerator {
@Mixin(ThreadedAnvilChunkStorage.class)
public abstract class MixinThreadedAnvilChunkStorage {
@Inject(at = @At("RETURN"), method = "generateFeatures")
public void generateFeatures(ChunkRegion region, StructureAccessor accessor, CallbackInfo ci) {
ChunkFinalizeCallback.EVENT.invoker().onChunkFinalized(region.toServerWorld(), new Vector2i(region.getCenterChunkX(), region.getCenterChunkZ()));
@Accessor("world")
public abstract ServerWorld getWorld();
@Inject(at = @At("RETURN"), method = "generateChunk")
public void upgradeChunk(ChunkHolder holder, ChunkStatus requiredStatus, CallbackInfoReturnable<CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>>> ci) {
if (requiredStatus == ChunkStatus.FULL) {
ChunkFinalizeCallback.EVENT.invoker().onChunkFinalized(getWorld(), new Vector2i(holder.getPos().x, holder.getPos().z));
}
}
}

2
implementations/fabric-1.16.1/src/main/resources/bluemap.mixins.json
View File

@ -6,7 +6,7 @@
"mixins": [],
"client": [],
"server": [
"MixinChunkGenerator",
"MixinThreadedAnvilChunkStorage",
"MixinPlayerManager",
"MixinServerWorld"
],

29
implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinChunkGenerator.java → implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinThreadedAnvilChunkStorage.java
View File

@ -24,24 +24,35 @@
*/
package de.bluecolored.bluemap.fabric.mixin;
import java.util.concurrent.CompletableFuture;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.flowpowered.math.vector.Vector2i;
import com.mojang.datafixers.util.Either;
import de.bluecolored.bluemap.fabric.events.ChunkFinalizeCallback;
import net.minecraft.world.ChunkRegion;
import net.minecraft.world.gen.StructureAccessor;
import net.minecraft.world.gen.chunk.ChunkGenerator;
import net.minecraft.server.world.ChunkHolder;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.server.world.ThreadedAnvilChunkStorage;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.ChunkStatus;
@Mixin(ChunkGenerator.class)
public class MixinChunkGenerator {
@Mixin(ThreadedAnvilChunkStorage.class)
public abstract class MixinThreadedAnvilChunkStorage {
@Inject(at = @At("RETURN"), method = "generateFeatures")
public void generateFeatures(ChunkRegion region, StructureAccessor accessor, CallbackInfo ci) {
ChunkFinalizeCallback.EVENT.invoker().onChunkFinalized(region.getWorld(), new Vector2i(region.getCenterChunkX(), region.getCenterChunkZ()));
@Accessor("world")
public abstract ServerWorld getWorld();
@Inject(at = @At("RETURN"), method = "upgradeChunk")
public void upgradeChunk(ChunkHolder holder, ChunkStatus requiredStatus, CallbackInfoReturnable<CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>>> ci) {
if (requiredStatus == ChunkStatus.FULL) {
ChunkFinalizeCallback.EVENT.invoker().onChunkFinalized(getWorld(), new Vector2i(holder.getPos().x, holder.getPos().z));
}
}
}

2
implementations/fabric-1.16.2/src/main/resources/bluemap.mixins.json
View File

@ -6,7 +6,7 @@
"mixins": [],
"client": [],
"server": [
"MixinChunkGenerator",
"MixinThreadedAnvilChunkStorage",
"MixinPlayerManager",
"MixinServerWorld"
],