MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed tested ToDo's

Browse source
This commit is contained in:
Frank 2021-12-09 22:35:56 +01:00
parent 33d8fe86fd
commit ef02d0ee5f
13 changed files with 9 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ru/betterend/blocks/HydrothermalVentBlock.java
View file

@ -91,8 +91,7 @@ public class HydrothermalVentBlock extends BaseBlockNotFull implements EntityBlo
return Blocks.WATER.defaultBlockState(); return Blocks.WATER.defaultBlockState();
} }
else if (state.getValue(WATERLOGGED) && facing == Direction.UP && neighborState.is(Blocks.WATER)) { else if (state.getValue(WATERLOGGED) && facing == Direction.UP && neighborState.is(Blocks.WATER)) {
//TODO: 1.18 see if it still ticks world.scheduleTick(pos, this, 20);
world./*getBlockTicks().*/scheduleTick(pos, this, 20);
} }
return state; return state;
} }
@ -120,8 +119,7 @@ public class HydrothermalVentBlock extends BaseBlockNotFull implements EntityBlo
BlockPos up = pos.above(); BlockPos up = pos.above();
if (world.getBlockState(up).is(Blocks.WATER)) { if (world.getBlockState(up).is(Blocks.WATER)) {
BlocksHelper.setWithoutUpdate(world, up, EndBlocks.VENT_BUBBLE_COLUMN); BlocksHelper.setWithoutUpdate(world, up, EndBlocks.VENT_BUBBLE_COLUMN);
//TODO: 1.18 see if it still ticks world.scheduleTick(up, EndBlocks.VENT_BUBBLE_COLUMN, 5);
world./*getBlockTicks().*/scheduleTick(up, EndBlocks.VENT_BUBBLE_COLUMN, 5);
} }
} }

3
src/main/java/ru/betterend/blocks/NeonCactusPlantBlock.java
View file

@ -116,8 +116,7 @@ public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWate
@Override @Override
public BlockState updateShape(BlockState state, Direction direction, BlockState newState, LevelAccessor world, BlockPos pos, BlockPos posFrom) { public BlockState updateShape(BlockState state, Direction direction, BlockState newState, LevelAccessor world, BlockPos pos, BlockPos posFrom) {
//TODO: 1.18 Check if this still workd world.scheduleTick(pos, this, 2);
world./*getBlockTicks().*/scheduleTick(pos, this, 2);
if (state.getValue(WATERLOGGED)) { if (state.getValue(WATERLOGGED)) {
world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world));
} }

3
src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java
View file

@ -76,8 +76,7 @@ public class VentBubbleColumnBlock extends Block implements BucketPickup, Liquid
BlockPos up = pos.above(); BlockPos up = pos.above();
if (world.getBlockState(up).is(Blocks.WATER)) { if (world.getBlockState(up).is(Blocks.WATER)) {
BlocksHelper.setWithoutUpdate(world, up, this); BlocksHelper.setWithoutUpdate(world, up, this);
//TODO: 1.18 check if this ticks world.scheduleTick(up, this, 5);
world./*getBlockTicks().*/scheduleTick(up, this, 5);
} }
} }
return state; return state;

2
src/main/java/ru/betterend/mixin/common/EntityMixin.java
View file

@ -66,8 +66,6 @@ public abstract class EntityMixin implements TeleportingEntity {
entity.getXRot() entity.getXRot()
); );
entity.setDeltaMovement(teleportTarget.speed); entity.setDeltaMovement(teleportTarget.speed);
//TODO: check if this works as intended in 1.17
destination.addDuringTeleport(entity); destination.addDuringTeleport(entity);
} }

2
src/main/java/ru/betterend/mixin/common/NoiseBasedChunkGeneratorMixin.java
View file

@ -31,7 +31,7 @@ public abstract class NoiseBasedChunkGeneratorMixin extends ChunkGenerator {
TerrainGenerator.initNoise(seed); 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) // @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) { // private void be_fillNoiseColumn(double[] buffer, int x, int z, int k, int l, CallbackInfo info) {
// if (GeneratorOptions.useNewGenerator() && settings.get().stable(NoiseGeneratorSettings.END)) { // if (GeneratorOptions.useNewGenerator() && settings.get().stable(NoiseGeneratorSettings.END)) {

2
src/main/java/ru/betterend/world/biome/land/FoggyMushroomlandBiome.java
View file

@ -25,13 +25,11 @@ public class FoggyMushroomlandBiome extends EndBiome.Config {
.fogColor(41, 122, 173) .fogColor(41, 122, 173)
.fogDensity(3) .fogDensity(3)
.waterAndFogColor(119, 227, 250) .waterAndFogColor(119, 227, 250)
//TODO: 1.18 check surface Rules
.chancedSurface( .chancedSurface(
SurfaceRules.state(surfaceMaterial().getTopMaterial()), SurfaceRules.state(surfaceMaterial().getTopMaterial()),
SurfaceRules.state(surfaceMaterial().getAltTopMaterial()), SurfaceRules.state(surfaceMaterial().getAltTopMaterial()),
END_STONE END_STONE
) )
//.surface(EndBlocks.END_MOSS, EndBlocks.END_MYCELIUM)
.particles(EndParticles.GLOWING_SPHERE, 0.001F) .particles(EndParticles.GLOWING_SPHERE, 0.001F)
.loop(EndSounds.AMBIENT_FOGGY_MUSHROOMLAND) .loop(EndSounds.AMBIENT_FOGGY_MUSHROOMLAND)
.music(EndSounds.MUSIC_FOREST) .music(EndSounds.MUSIC_FOREST)

2
src/main/java/ru/betterend/world/biome/land/MegalakeBiome.java
View file

@ -26,13 +26,11 @@ public class MegalakeBiome extends EndBiome.Config {
.fogDensity(1.75F) .fogDensity(1.75F)
.music(EndSounds.MUSIC_WATER) .music(EndSounds.MUSIC_WATER)
.loop(EndSounds.AMBIENT_MEGALAKE) .loop(EndSounds.AMBIENT_MEGALAKE)
//TODO: 1.18 check surface Rules
.chancedSurface( .chancedSurface(
SurfaceRules.state(surfaceMaterial().getTopMaterial()), SurfaceRules.state(surfaceMaterial().getTopMaterial()),
SurfaceRules.state(surfaceMaterial().getAltTopMaterial()), SurfaceRules.state(surfaceMaterial().getAltTopMaterial()),
END_STONE END_STONE
) )
//.surface(EndBlocks.END_MOSS, EndBlocks.ENDSTONE_DUST)
//TODO: 1.18 removed //TODO: 1.18 removed
//.depth(0F) //.depth(0F)
.feature(EndFeatures.END_LOTUS) .feature(EndFeatures.END_LOTUS)

2
src/main/java/ru/betterend/world/biome/land/NeonOasisBiome.java
View file

@ -22,13 +22,11 @@ public class NeonOasisBiome extends EndBiome.Config {
.fogColor(226, 239, 168) .fogColor(226, 239, 168)
.fogDensity(2) .fogDensity(2)
.waterAndFogColor(106, 238, 215) .waterAndFogColor(106, 238, 215)
//TODO: 1.18 check surface Rules
.chancedSurface( .chancedSurface(
SurfaceRules.state(surfaceMaterial().getTopMaterial()), SurfaceRules.state(surfaceMaterial().getTopMaterial()),
SurfaceRules.state(surfaceMaterial().getAltTopMaterial()), SurfaceRules.state(surfaceMaterial().getAltTopMaterial()),
END_STONE END_STONE
) )
//.surface(EndBlocks.ENDSTONE_DUST, EndBlocks.END_MOSS)
.particles(ParticleTypes.WHITE_ASH, 0.01F) .particles(ParticleTypes.WHITE_ASH, 0.01F)
.loop(EndSounds.AMBIENT_DUST_WASTELANDS) .loop(EndSounds.AMBIENT_DUST_WASTELANDS)
.music(EndSounds.MUSIC_OPENSPACE) .music(EndSounds.MUSIC_OPENSPACE)

2
src/main/java/ru/betterend/world/biome/land/SulphurSpringsBiome.java
View file

@ -27,8 +27,6 @@ public class SulphurSpringsBiome extends EndBiome.Config {
@Override @Override
protected void addCustomBuildData(BCLBiomeBuilder builder) { protected void addCustomBuildData(BCLBiomeBuilder builder) {
builder builder
//TODO: 1.18 check surface Rules
//.surface(SurfaceBuilders.SULPHURIC_SURFACE.configured(SurfaceBuilders.DEFAULT_END_CONFIG))
.surface( .surface(
SurfaceRules.sequence( SurfaceRules.sequence(
SurfaceRules.ifTrue(new SulphuricSurfaceNoiseCondition(-0.6), SurfaceRules.state(surfaceMaterial().getAltTopMaterial())), SurfaceRules.ifTrue(new SulphuricSurfaceNoiseCondition(-0.6), SurfaceRules.state(surfaceMaterial().getAltTopMaterial())),

2
src/main/java/ru/betterend/world/biome/land/UmbraValleyBiome.java
View file

@ -21,8 +21,6 @@ public class UmbraValleyBiome extends EndBiome.Config {
builder.fogColor(100, 100, 100) builder.fogColor(100, 100, 100)
.plantsColor(172, 189, 190) .plantsColor(172, 189, 190)
.waterAndFogColor(69, 104, 134) .waterAndFogColor(69, 104, 134)
//TODO: 1.18 check surface Rules
//.surface(SurfaceBuilders.UMBRA_SURFACE.configured(SurfaceBuilders.DEFAULT_END_CONFIG))
.surface( .surface(
SurfaceRules.sequence( SurfaceRules.sequence(
SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.sequence( SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.sequence(

1
src/main/java/ru/betterend/world/features/BiomeIslandFeature.java
View file

@ -34,7 +34,6 @@ public class BiomeIslandFeature extends DefaultFeature {
BlockPos surfacePos = new BlockPos(pos.getX(), pos.getY()-dist, pos.getZ()); BlockPos surfacePos = new BlockPos(pos.getX(), pos.getY()-dist, pos.getZ());
BlockState topMaterial = EndBiome.findTopMaterial(world, surfacePos);; 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)) { if (BlocksHelper.isFluid(topMaterial)) {
topBlock = Blocks.GRAVEL.defaultBlockState(); topBlock = Blocks.GRAVEL.defaultBlockState();
underBlock = Blocks.STONE.defaultBlockState(); underBlock = Blocks.STONE.defaultBlockState();

3
src/main/java/ru/betterend/world/features/terrain/SulphuricLakeFeature.java
View file

@ -76,8 +76,7 @@ public class SulphuricLakeFeature extends DefaultFeature {
else { else {
if (!isAbsoluteBorder(world, POS)) { if (!isAbsoluteBorder(world, POS)) {
BlocksHelper.setWithoutUpdate(world, POS, Blocks.WATER); BlocksHelper.setWithoutUpdate(world, POS, Blocks.WATER);
//TODO: 1.18 check if this ticks world.scheduleTick(POS, Fluids.WATER, 0);
world./*getLiquidTicks().*/scheduleTick(POS, Fluids.WATER, 0);
brimstone.add(POS.below()); brimstone.add(POS.below());
if (random.nextBoolean()) { if (random.nextBoolean()) {
brimstone.add(POS.below(2)); brimstone.add(POS.below(2));

3
src/main/java/ru/betterend/world/structures/piece/LakePiece.java
View file

@ -210,7 +210,8 @@ public class LakePiece extends BasePiece {
} }
else if (chunk.getBlockState(mut.move(Direction.UP)).isAir()) { else if (chunk.getBlockState(mut.move(Direction.UP)).isAir()) {
//TODO: 1.18 test if this is thr right tick //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);
} }
} }
} }