mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-02 07:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "implement hacky Bukkit structure workaround"

Browse Source 
This reverts commit 688315180962ee8d17169003b3e62c31ff18d1b2.
This commit is contained in:
dfsek 2022-05-31 14:22:36 -07:00
parent 6883151809
commit 7da0580eda
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/nms/NMSChunkGeneratorDelegate.java
View File

@ -3,7 +3,9 @@ package com.dfsek.terra.bukkit.nms;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.info.WorldProperties;
import com.dfsek.terra.bukkit.generator.BukkitProtoChunk;
import com.dfsek.terra.bukkit.world.BukkitAdapter;
import com.dfsek.terra.bukkit.world.BukkitServerWorld;
import com.mojang.serialization.Codec;
import net.minecraft.core.BlockPosition;
@ -23,8 +25,7 @@ import net.minecraft.world.level.levelgen.WorldGenStage;
import net.minecraft.world.level.levelgen.blending.Blender;
import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_18_R2.block.data.CraftBlockData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.bukkit.craftbukkit.v1_18_R2.generator.CraftChunkData;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@ -32,7 +33,7 @@ import java.util.concurrent.Executor;
public class NMSChunkGeneratorDelegate extends ChunkGenerator {
private static final Logger LOGGER = LoggerFactory.getLogger(ChunkGenerator.class);
private final NMSBiomeProvider biomeSource;
private final com.dfsek.terra.api.world.chunk.generation.ChunkGenerator delegate;
@ -40,8 +41,6 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator {
private final ConfigPack pack;
private final CraftWorld world;
private volatile boolean structures = false;
public NMSChunkGeneratorDelegate(ChunkGenerator vanilla, ConfigPack pack, NMSBiomeProvider biomeProvider, CraftWorld world) {
super(vanilla.b, vanilla.e, biomeProvider, biomeProvider, world.getSeed());
@ -52,14 +51,6 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator {
this.world = world;
}
public void enableStructures() {
if(structures) {
throw new IllegalStateException("Structures have already been enabled!");
}
LOGGER.info("Enabling structure generation...");
this.structures = true;
}
@Override //applyCarvers
public void a(RegionLimitedWorldAccess regionlimitedworldaccess, long var2, BiomeManager var4, StructureManager var5,
IChunkAccess ichunkaccess, WorldGenStage.Features var7) {
@ -85,9 +76,7 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator {
@Override
public void a(GeneratorAccessSeed gas, StructureManager manager, IChunkAccess ica) {
if(structures) {
vanilla.a(gas, manager, ica);
}
vanilla.a(gas, manager, ica);
}
@Override

13
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/nms/NMSInjectListener.java
View File

@ -7,7 +7,6 @@ import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.world.WorldInitEvent;
import org.bukkit.event.world.WorldLoadEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -47,16 +46,4 @@ public class NMSInjectListener implements Listener {
INJECT_LOCK.unlock();
}
}
@EventHandler
public void onWorldLoad(WorldLoadEvent event) {
if (INJECTED.contains(event.getWorld()) && event.getWorld().getGenerator() instanceof BukkitChunkGeneratorWrapper bukkitChunkGeneratorWrapper) {
LOGGER.info("Enabling structure deadlock workaround on world {}.", event.getWorld().getName());
CraftWorld craftWorld = (CraftWorld) event.getWorld();
WorldServer serverWorld = craftWorld.getHandle();
((NMSChunkGeneratorDelegate) serverWorld.k().a.u).enableStructures();
LOGGER.info("Thank you Bukkit.");
}
}
}