From ef02d0ee5fca0712b73a34d4fac4c96d3e6a0b3a Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 9 Dec 2021 22:35:56 +0100 Subject: [PATCH] Removed tested ToDo's --- .../java/ru/betterend/blocks/HydrothermalVentBlock.java | 6 ++---- src/main/java/ru/betterend/blocks/NeonCactusPlantBlock.java | 3 +-- .../java/ru/betterend/blocks/VentBubbleColumnBlock.java | 3 +-- src/main/java/ru/betterend/mixin/common/EntityMixin.java | 2 -- .../mixin/common/NoiseBasedChunkGeneratorMixin.java | 2 +- .../betterend/world/biome/land/FoggyMushroomlandBiome.java | 2 -- .../java/ru/betterend/world/biome/land/MegalakeBiome.java | 2 -- .../java/ru/betterend/world/biome/land/NeonOasisBiome.java | 2 -- .../ru/betterend/world/biome/land/SulphurSpringsBiome.java | 4 +--- .../ru/betterend/world/biome/land/UmbraValleyBiome.java | 2 -- .../ru/betterend/world/features/BiomeIslandFeature.java | 1 - .../world/features/terrain/SulphuricLakeFeature.java | 3 +-- .../java/ru/betterend/world/structures/piece/LakePiece.java | 3 ++- 13 files changed, 9 insertions(+), 26 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/HydrothermalVentBlock.java b/src/main/java/ru/betterend/blocks/HydrothermalVentBlock.java index 780a3551..8353cb0c 100644 --- a/src/main/java/ru/betterend/blocks/HydrothermalVentBlock.java +++ b/src/main/java/ru/betterend/blocks/HydrothermalVentBlock.java @@ -91,8 +91,7 @@ public class HydrothermalVentBlock extends BaseBlockNotFull implements EntityBlo return Blocks.WATER.defaultBlockState(); } else if (state.getValue(WATERLOGGED) && facing == Direction.UP && neighborState.is(Blocks.WATER)) { - //TODO: 1.18 see if it still ticks - world./*getBlockTicks().*/scheduleTick(pos, this, 20); + world.scheduleTick(pos, this, 20); } return state; } @@ -120,8 +119,7 @@ public class HydrothermalVentBlock extends BaseBlockNotFull implements EntityBlo BlockPos up = pos.above(); if (world.getBlockState(up).is(Blocks.WATER)) { BlocksHelper.setWithoutUpdate(world, up, EndBlocks.VENT_BUBBLE_COLUMN); - //TODO: 1.18 see if it still ticks - world./*getBlockTicks().*/scheduleTick(up, EndBlocks.VENT_BUBBLE_COLUMN, 5); + world.scheduleTick(up, EndBlocks.VENT_BUBBLE_COLUMN, 5); } } diff --git a/src/main/java/ru/betterend/blocks/NeonCactusPlantBlock.java b/src/main/java/ru/betterend/blocks/NeonCactusPlantBlock.java index c5674904..1c55c2f5 100644 --- a/src/main/java/ru/betterend/blocks/NeonCactusPlantBlock.java +++ b/src/main/java/ru/betterend/blocks/NeonCactusPlantBlock.java @@ -116,8 +116,7 @@ public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWate @Override public BlockState updateShape(BlockState state, Direction direction, BlockState newState, LevelAccessor world, BlockPos pos, BlockPos posFrom) { - //TODO: 1.18 Check if this still workd - world./*getBlockTicks().*/scheduleTick(pos, this, 2); + world.scheduleTick(pos, this, 2); if (state.getValue(WATERLOGGED)) { world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); } diff --git a/src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java b/src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java index b0d2ba08..a03fe926 100644 --- a/src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java +++ b/src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java @@ -76,8 +76,7 @@ public class VentBubbleColumnBlock extends Block implements BucketPickup, Liquid BlockPos up = pos.above(); if (world.getBlockState(up).is(Blocks.WATER)) { BlocksHelper.setWithoutUpdate(world, up, this); - //TODO: 1.18 check if this ticks - world./*getBlockTicks().*/scheduleTick(up, this, 5); + world.scheduleTick(up, this, 5); } } return state; diff --git a/src/main/java/ru/betterend/mixin/common/EntityMixin.java b/src/main/java/ru/betterend/mixin/common/EntityMixin.java index 20d4e1ee..31b3876f 100644 --- a/src/main/java/ru/betterend/mixin/common/EntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/EntityMixin.java @@ -66,8 +66,6 @@ public abstract class EntityMixin implements TeleportingEntity { entity.getXRot() ); entity.setDeltaMovement(teleportTarget.speed); - //TODO: check if this works as intended in 1.17 - destination.addDuringTeleport(entity); } diff --git a/src/main/java/ru/betterend/mixin/common/NoiseBasedChunkGeneratorMixin.java b/src/main/java/ru/betterend/mixin/common/NoiseBasedChunkGeneratorMixin.java index 4e98411e..5aa420b4 100644 --- a/src/main/java/ru/betterend/mixin/common/NoiseBasedChunkGeneratorMixin.java +++ b/src/main/java/ru/betterend/mixin/common/NoiseBasedChunkGeneratorMixin.java @@ -31,7 +31,7 @@ public abstract class NoiseBasedChunkGeneratorMixin extends ChunkGenerator { TerrainGenerator.initNoise(seed); } - //TODO: 1.18 Find anothe rplace for this + //TODO: 1.18 Find another place for this // @Inject(method = "fillNoiseColumn([DIIII)V", at = @At("HEAD"), cancellable = true, allow = 2) // private void be_fillNoiseColumn(double[] buffer, int x, int z, int k, int l, CallbackInfo info) { // if (GeneratorOptions.useNewGenerator() && settings.get().stable(NoiseGeneratorSettings.END)) { diff --git a/src/main/java/ru/betterend/world/biome/land/FoggyMushroomlandBiome.java b/src/main/java/ru/betterend/world/biome/land/FoggyMushroomlandBiome.java index 1ecc681d..40720f83 100644 --- a/src/main/java/ru/betterend/world/biome/land/FoggyMushroomlandBiome.java +++ b/src/main/java/ru/betterend/world/biome/land/FoggyMushroomlandBiome.java @@ -25,13 +25,11 @@ public class FoggyMushroomlandBiome extends EndBiome.Config { .fogColor(41, 122, 173) .fogDensity(3) .waterAndFogColor(119, 227, 250) - //TODO: 1.18 check surface Rules .chancedSurface( SurfaceRules.state(surfaceMaterial().getTopMaterial()), SurfaceRules.state(surfaceMaterial().getAltTopMaterial()), END_STONE ) - //.surface(EndBlocks.END_MOSS, EndBlocks.END_MYCELIUM) .particles(EndParticles.GLOWING_SPHERE, 0.001F) .loop(EndSounds.AMBIENT_FOGGY_MUSHROOMLAND) .music(EndSounds.MUSIC_FOREST) diff --git a/src/main/java/ru/betterend/world/biome/land/MegalakeBiome.java b/src/main/java/ru/betterend/world/biome/land/MegalakeBiome.java index 0c492778..7d1b08e3 100644 --- a/src/main/java/ru/betterend/world/biome/land/MegalakeBiome.java +++ b/src/main/java/ru/betterend/world/biome/land/MegalakeBiome.java @@ -26,13 +26,11 @@ public class MegalakeBiome extends EndBiome.Config { .fogDensity(1.75F) .music(EndSounds.MUSIC_WATER) .loop(EndSounds.AMBIENT_MEGALAKE) - //TODO: 1.18 check surface Rules .chancedSurface( SurfaceRules.state(surfaceMaterial().getTopMaterial()), SurfaceRules.state(surfaceMaterial().getAltTopMaterial()), END_STONE ) - //.surface(EndBlocks.END_MOSS, EndBlocks.ENDSTONE_DUST) //TODO: 1.18 removed //.depth(0F) .feature(EndFeatures.END_LOTUS) diff --git a/src/main/java/ru/betterend/world/biome/land/NeonOasisBiome.java b/src/main/java/ru/betterend/world/biome/land/NeonOasisBiome.java index e74a4a55..23564790 100644 --- a/src/main/java/ru/betterend/world/biome/land/NeonOasisBiome.java +++ b/src/main/java/ru/betterend/world/biome/land/NeonOasisBiome.java @@ -22,13 +22,11 @@ public class NeonOasisBiome extends EndBiome.Config { .fogColor(226, 239, 168) .fogDensity(2) .waterAndFogColor(106, 238, 215) - //TODO: 1.18 check surface Rules .chancedSurface( SurfaceRules.state(surfaceMaterial().getTopMaterial()), SurfaceRules.state(surfaceMaterial().getAltTopMaterial()), END_STONE ) - //.surface(EndBlocks.ENDSTONE_DUST, EndBlocks.END_MOSS) .particles(ParticleTypes.WHITE_ASH, 0.01F) .loop(EndSounds.AMBIENT_DUST_WASTELANDS) .music(EndSounds.MUSIC_OPENSPACE) diff --git a/src/main/java/ru/betterend/world/biome/land/SulphurSpringsBiome.java b/src/main/java/ru/betterend/world/biome/land/SulphurSpringsBiome.java index 0c0b162e..7741c5ce 100644 --- a/src/main/java/ru/betterend/world/biome/land/SulphurSpringsBiome.java +++ b/src/main/java/ru/betterend/world/biome/land/SulphurSpringsBiome.java @@ -27,9 +27,7 @@ public class SulphurSpringsBiome extends EndBiome.Config { @Override protected void addCustomBuildData(BCLBiomeBuilder builder) { builder - //TODO: 1.18 check surface Rules - //.surface(SurfaceBuilders.SULPHURIC_SURFACE.configured(SurfaceBuilders.DEFAULT_END_CONFIG)) - .surface( + .surface( SurfaceRules.sequence( SurfaceRules.ifTrue(new SulphuricSurfaceNoiseCondition(-0.6), SurfaceRules.state(surfaceMaterial().getAltTopMaterial())), SurfaceRules.ifTrue(new SulphuricSurfaceNoiseCondition(-0.3), SurfaceRules.state(surfaceMaterial().getTopMaterial())), diff --git a/src/main/java/ru/betterend/world/biome/land/UmbraValleyBiome.java b/src/main/java/ru/betterend/world/biome/land/UmbraValleyBiome.java index 0e95aeea..369fbb64 100644 --- a/src/main/java/ru/betterend/world/biome/land/UmbraValleyBiome.java +++ b/src/main/java/ru/betterend/world/biome/land/UmbraValleyBiome.java @@ -21,8 +21,6 @@ public class UmbraValleyBiome extends EndBiome.Config { builder.fogColor(100, 100, 100) .plantsColor(172, 189, 190) .waterAndFogColor(69, 104, 134) - //TODO: 1.18 check surface Rules - //.surface(SurfaceBuilders.UMBRA_SURFACE.configured(SurfaceBuilders.DEFAULT_END_CONFIG)) .surface( SurfaceRules.sequence( SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.sequence( diff --git a/src/main/java/ru/betterend/world/features/BiomeIslandFeature.java b/src/main/java/ru/betterend/world/features/BiomeIslandFeature.java index 4954440c..9015529e 100644 --- a/src/main/java/ru/betterend/world/features/BiomeIslandFeature.java +++ b/src/main/java/ru/betterend/world/features/BiomeIslandFeature.java @@ -34,7 +34,6 @@ public class BiomeIslandFeature extends DefaultFeature { BlockPos surfacePos = new BlockPos(pos.getX(), pos.getY()-dist, pos.getZ()); BlockState topMaterial = EndBiome.findTopMaterial(world, surfacePos);; - //TODO: 1.18 the block selection should be based on the surface rules of the biome if (BlocksHelper.isFluid(topMaterial)) { topBlock = Blocks.GRAVEL.defaultBlockState(); underBlock = Blocks.STONE.defaultBlockState(); diff --git a/src/main/java/ru/betterend/world/features/terrain/SulphuricLakeFeature.java b/src/main/java/ru/betterend/world/features/terrain/SulphuricLakeFeature.java index 430259fa..62962804 100644 --- a/src/main/java/ru/betterend/world/features/terrain/SulphuricLakeFeature.java +++ b/src/main/java/ru/betterend/world/features/terrain/SulphuricLakeFeature.java @@ -76,8 +76,7 @@ public class SulphuricLakeFeature extends DefaultFeature { else { if (!isAbsoluteBorder(world, POS)) { BlocksHelper.setWithoutUpdate(world, POS, Blocks.WATER); - //TODO: 1.18 check if this ticks - world./*getLiquidTicks().*/scheduleTick(POS, Fluids.WATER, 0); + world.scheduleTick(POS, Fluids.WATER, 0); brimstone.add(POS.below()); if (random.nextBoolean()) { brimstone.add(POS.below(2)); diff --git a/src/main/java/ru/betterend/world/structures/piece/LakePiece.java b/src/main/java/ru/betterend/world/structures/piece/LakePiece.java index 7434f1c1..219e3f1e 100644 --- a/src/main/java/ru/betterend/world/structures/piece/LakePiece.java +++ b/src/main/java/ru/betterend/world/structures/piece/LakePiece.java @@ -210,7 +210,8 @@ public class LakePiece extends BasePiece { } else if (chunk.getBlockState(mut.move(Direction.UP)).isAir()) { //TODO: 1.18 test if this is thr right tick - /*chunk.getLiquidTicks()*/world.scheduleTick(mut.move(Direction.DOWN), state.getType(), 0); + chunk.markPosForPostprocessing(mut.move(Direction.DOWN)); +// /*chunk.getLiquidTicks()*/world.scheduleTick(mut.move(Direction.DOWN), state.getType(), 0); } } }