From 6497200dac17f37523e8407c3c7b6cc98bad3ae2 Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 28 Nov 2019 11:43:55 -0400 Subject: [PATCH] 1.15 pre2 - 4 --- src/main/java/carpet/helpers/FeatureGenerator.java | 2 +- src/main/java/carpet/mixins/BiomeArray_getBiomeArrayMixin.java | 2 +- .../java/carpet/mixins/FloatingIslandsChunkGeneratorMixin.java | 2 +- src/main/java/carpet/mixins/SaplingBlockMixin.java | 2 +- src/main/java/carpet/mixins/StructureFeatureMixin.java | 2 +- src/main/java/carpet/script/CarpetExpression.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 102e22c4..07ef2e2b 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -66,7 +66,7 @@ public class FeatureGenerator return new VanillaLayeredBiomeSource(new VanillaLayeredBiomeSourceConfig(w.getLevelProperties())) { @Override - public Biome getStoredBiome(int i, int j, int k) + public Biome getBiomeForNoiseGen(int i, int j, int k) { return biome; } diff --git a/src/main/java/carpet/mixins/BiomeArray_getBiomeArrayMixin.java b/src/main/java/carpet/mixins/BiomeArray_getBiomeArrayMixin.java index 1d3bfa6a..f25841fc 100644 --- a/src/main/java/carpet/mixins/BiomeArray_getBiomeArrayMixin.java +++ b/src/main/java/carpet/mixins/BiomeArray_getBiomeArrayMixin.java @@ -6,7 +6,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.BiomeArray; +import net.minecraft.world.biome.source.BiomeArray; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/carpet/mixins/FloatingIslandsChunkGeneratorMixin.java b/src/main/java/carpet/mixins/FloatingIslandsChunkGeneratorMixin.java index 11eb3efa..2bc27e3b 100644 --- a/src/main/java/carpet/mixins/FloatingIslandsChunkGeneratorMixin.java +++ b/src/main/java/carpet/mixins/FloatingIslandsChunkGeneratorMixin.java @@ -32,6 +32,6 @@ public abstract class FloatingIslandsChunkGeneratorMixin extends SurfaceChunkGen return Feature.END_CITY.getMonsterSpawns(); } } - return this.world.method_23753(blockPos_1).getEntitySpawnList(entityCategory_1); + return this.world.getBiome(blockPos_1).getEntitySpawnList(entityCategory_1); } } diff --git a/src/main/java/carpet/mixins/SaplingBlockMixin.java b/src/main/java/carpet/mixins/SaplingBlockMixin.java index 9796d922..245eb263 100644 --- a/src/main/java/carpet/mixins/SaplingBlockMixin.java +++ b/src/main/java/carpet/mixins/SaplingBlockMixin.java @@ -23,7 +23,7 @@ public abstract class SaplingBlockMixin cancellable = true) private void onGenerate(ServerWorld serverWorld_1, BlockPos blockPos_1, BlockState blockState_1, Random random_1, CallbackInfo ci) { - if(CarpetSettings.desertShrubs && serverWorld_1.method_23753(blockPos_1) == Biomes.DESERT && !BlockSaplingHelper.hasWater(serverWorld_1, blockPos_1)) + if(CarpetSettings.desertShrubs && serverWorld_1.getBiome(blockPos_1) == Biomes.DESERT && !BlockSaplingHelper.hasWater(serverWorld_1, blockPos_1)) { serverWorld_1.setBlockState(blockPos_1, Blocks.DEAD_BUSH.getDefaultState(), 3); ci.cancel(); diff --git a/src/main/java/carpet/mixins/StructureFeatureMixin.java b/src/main/java/carpet/mixins/StructureFeatureMixin.java index 6fec2aa2..82a5644e 100644 --- a/src/main/java/carpet/mixins/StructureFeatureMixin.java +++ b/src/main/java/carpet/mixins/StructureFeatureMixin.java @@ -116,7 +116,7 @@ public abstract class StructureFeatureMixin implements StructureFeatureInterface return structurestart; } } - Biome biome_1 = generator.getBiomeSource().getStoredBiome((chunkpos.getStartX() + 9) >> 2, 0, (chunkpos.getStartZ() + 9) >> 2 ); + Biome biome_1 = generator.getBiomeSource().getBiomeForNoiseGen((chunkpos.getStartX() + 9) >> 2, 0, (chunkpos.getStartZ() + 9) >> 2 ); StructureStart structurestart1 = getStructureStartFactory().create((StructureFeature)(Object)this, chunkpos.x, chunkpos.z, BlockBox.empty(),0,generator.getSeed()); structurestart1.initialize(generator, ((ServerWorld)worldIn).getStructureManager() , chunkpos.x, chunkpos.z, biome_1); structurestart = structurestart1.hasChildren() ? structurestart1 : StructureStart.DEFAULT; diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 75dfcb01..5a0672cc 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -1147,7 +1147,7 @@ public class CarpetExpression BlockValue.LocatorResult locator = BlockValue.fromParams(cc, lv, 0); ServerWorld world = cc.s.getWorld(); BlockPos pos = locator.block.getPos(); - Biome biome = world.method_23753(pos); + Biome biome = world.getBiome(pos); Value res = new StringValue(biome.getTranslationKey().replaceFirst("^biome\\.minecraft\\.", "")); return (_c, _t) -> res; });