From df4da810ecd8c4fac86da26e6a52709f0d69797a Mon Sep 17 00:00:00 2001 From: dfsek Date: Tue, 4 May 2021 21:37:36 -0700 Subject: [PATCH] fix forge mixin issues --- .../src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java | 2 +- .../forge/mixin/implementations/chunk/ChunkRegionMixin.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java index 89d0849b9..5668e9192 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java @@ -288,7 +288,7 @@ public class TerraForgePlugin implements TerraPlugin { public TerraWorld getWorld(World world) { return worldMap.computeIfAbsent(world.getSeed(), w -> { logger.info("Loading world " + w); - return new TerraWorld(world, ((ForgeChunkGeneratorWrapper) (world.getGenerator()).getHandle()).getPack(), this); + return new TerraWorld(world, ((ForgeChunkGeneratorWrapper) world.getGenerator()).getPack(), this); }); } diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkRegionMixin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkRegionMixin.java index 9446aad92..7f9d6a57c 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkRegionMixin.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkRegionMixin.java @@ -39,7 +39,7 @@ public abstract class ChunkRegionMixin { } public Block terra$getBlock(int x, int y, int z) { - BlockPos pos = new BlockPos(x + (x << 4), y, z + (z << 4)); + BlockPos pos = new BlockPos(x + (this.x << 4), y, z + (this.z << 4)); return new ForgeBlock(pos, (WorldGenRegion) (Object) this); } @@ -48,7 +48,7 @@ public abstract class ChunkRegionMixin { } public void terra$setBlock(int x, int y, int z, @NotNull BlockData blockData) { - ((WorldGenRegion) (Object) this).setBlock(new BlockPos(x + (x << 4), y, z + (z << 4)), ((ForgeBlockData) blockData).getHandle(), 0); + ((WorldGenRegion) (Object) this).setBlock(new BlockPos(x + (this.x << 4), y, z + (this.z << 4)), ((ForgeBlockData) blockData).getHandle(), 0); } public Object terra$getHandle() {