mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-24 00:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement world api changes

Browse Source
This commit is contained in:
dfsek
2021-11-28 12:19:10 -07:00
parent 01f6df4a19
commit 1e9e1dce75
49 changed files with 111 additions and 1428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
View File

@@ -194,10 +194,10 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C
public CompletableFuture<Chunk> populateNoise(Executor executor, Blender arg, StructureAccessor structureAccessor, Chunk chunk) {
return CompletableFuture.supplyAsync(() -> {
World world = (World) ((StructureAccessorAccessor) structureAccessor).getWorld();
delegate.generateChunkData((ProtoChunk) chunk, (ProtoWorld) world, chunk.getPos().z, chunk.getPos().x);
delegate.generateChunkData((ProtoChunk) chunk, world, chunk.getPos().z, chunk.getPos().x);
delegate.getGenerationStages().forEach(populator -> {
if(populator instanceof Chunkified) {
populator.populate(world, (com.dfsek.terra.api.world.chunk.Chunk) world);
populator.populate((ProtoWorld) world);
}
});
return chunk;
@@ -208,7 +208,7 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C
public void generateFeatures(StructureWorldAccess world, Chunk chunk, StructureAccessor structureAccessor) {
delegate.getGenerationStages().forEach(populator -> {
if(!(populator instanceof Chunkified)) {
populator.populate((World) world, (com.dfsek.terra.api.world.chunk.Chunk) world);
populator.populate((ProtoWorld) world);
}
});
if(pack.vanillaFlora()) {

25
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java
View File

@@ -17,7 +17,7 @@
package com.dfsek.terra.fabric.mixin.implementations.world;
import com.dfsek.terra.api.world.chunk.Chunk;
import com.dfsek.terra.api.world.chunk.generation.ProtoWorld;
import net.minecraft.block.FluidBlock;
import net.minecraft.fluid.Fluid;
@@ -26,6 +26,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ChunkRegion;
import net.minecraft.world.ServerWorldAccess;
import net.minecraft.world.WorldAccess;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.ChunkStatus;
import net.minecraft.world.tick.OrderedTick;
import net.minecraft.world.tick.QueryableTickScheduler;
@@ -57,7 +58,7 @@ import com.dfsek.terra.fabric.util.FabricUtil;
@Mixin(ChunkRegion.class)
@Implements(@Interface(iface = World.class, prefix = "terraWorld$", remap = Interface.Remap.NONE))
@Implements(@Interface(iface = ProtoWorld.class, prefix = "terraWorld$", remap = Interface.Remap.NONE))
public abstract class ChunkRegionMixin {
private WorldConfig config;
@@ -72,6 +73,10 @@ public abstract class ChunkRegionMixin {
@Shadow
public abstract QueryableTickScheduler<Fluid> getFluidTickScheduler();
@Shadow
@Final
private Chunk centerPos;
@Inject(at = @At("RETURN"),
method = "<init>(Lnet/minecraft/server/world/ServerWorld;Ljava/util/List;Lnet/minecraft/world/chunk/ChunkStatus;I)V")
public void injectConstructor(ServerWorld world, List<net.minecraft.world.chunk.Chunk> list, ChunkStatus chunkStatus, int i,
@@ -107,10 +112,6 @@ public abstract class ChunkRegionMixin {
return (((ChunkRegion) (Object) this).getBottomY()) + ((ChunkRegion) (Object) this).getHeight();
}
public Chunk terraWorld$getChunkAt(int x, int z) {
return (Chunk) ((ChunkRegion) (Object) this).getChunk(x, z);
}
@Intrinsic(displace = true)
public BlockState terraWorld$getBlockData(int x, int y, int z) {
BlockPos pos = new BlockPos(x, y, z);
@@ -137,6 +138,18 @@ public abstract class ChunkRegionMixin {
.getBiomeSource()).getProvider();
}
public int terra$getCenterChunkX() {
return centerPos.getPos().x;
}
public int terra$getCenterChunkZ() {
return centerPos.getPos().z;
}
public World terra$getWorld() {
return (World) world;
}
public WorldConfig terraWorld$getConfig() {
return config;
}