From 6c2471af6c3caee558f25a6af8236bbb5cf4e1b9 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 13 Jun 2023 18:03:04 +0200 Subject: [PATCH] Disabled custom portal search code --- .../betterend/portal/PortalBuilder.java | 68 +++++++++---------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/src/main/java/org/betterx/betterend/portal/PortalBuilder.java b/src/main/java/org/betterx/betterend/portal/PortalBuilder.java index 59df5524..98621006 100644 --- a/src/main/java/org/betterx/betterend/portal/PortalBuilder.java +++ b/src/main/java/org/betterx/betterend/portal/PortalBuilder.java @@ -3,15 +3,12 @@ package org.betterx.betterend.portal; import org.betterx.bclib.util.BlocksHelper; import org.betterx.betterend.blocks.EndPortalBlock; import org.betterx.betterend.registry.EndBlocks; -import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.registry.EndPoiTypes; import org.betterx.betterend.rituals.EternalRitual; -import org.betterx.worlds.together.world.event.WorldBootstrap; import net.minecraft.BlockUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.registries.Registries; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.TicketType; import net.minecraft.util.Mth; @@ -25,7 +22,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.border.WorldBorder; import net.minecraft.world.level.dimension.DimensionType; import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.LegacyRandomSource; import com.google.common.collect.Sets; @@ -305,38 +301,38 @@ public class PortalBuilder { Direction.Axis portalAxis = (Direction.Axis.X == portalDirection.getAxis()) ? Direction.Axis.Z : Direction.Axis.X; - if (!checkIsAreaValid(targetLevel, centerPos, portalAxis)) { - if (targetLevel.dimension() == Level.END) { - WorldBootstrap.getLastRegistryAccess() - .registryOrThrow(Registries.CONFIGURED_FEATURE) - .get(net.minecraft.data.worldgen.features.EndFeatures.END_ISLAND) - .place( - targetLevel, - targetLevel.getChunkSource().getGenerator(), - new LegacyRandomSource(centerPos.asLong()), - centerPos.below() - ); - } else if (targetLevel.dimension() == Level.OVERWORLD) { - centerPos = centerPos - .mutable() - .setY(targetLevel.getChunk(centerPos) - .getHeight( - Heightmap.Types.WORLD_SURFACE, - centerPos.getX(), - centerPos.getZ() - ) + 1); - } - EndFeatures.BIOME_ISLAND - .getPlacedFeature() - .value() - .place( - targetLevel, - targetLevel.getChunkSource().getGenerator(), - new LegacyRandomSource(centerPos.asLong()), - centerPos.below() - ); - - } +// if (!checkIsAreaValid(targetLevel, centerPos, portalAxis)) { +// if (targetLevel.dimension() == Level.END) { +// WorldBootstrap.getLastRegistryAccess() +// .registryOrThrow(Registries.CONFIGURED_FEATURE) +// .get(net.minecraft.data.worldgen.features.EndFeatures.END_ISLAND) +// .place( +// targetLevel, +// targetLevel.getChunkSource().getGenerator(), +// new LegacyRandomSource(centerPos.asLong()), +// centerPos.below() +// ); +// } else if (targetLevel.dimension() == Level.OVERWORLD) { +// centerPos = centerPos +// .mutable() +// .setY(targetLevel.getChunk(centerPos) +// .getHeight( +// Heightmap.Types.WORLD_SURFACE, +// centerPos.getX(), +// centerPos.getZ() +// ) + 1); +// } +// EndFeatures.BIOME_ISLAND +// .getPlacedFeature() +// .value() +// .place( +// targetLevel, +// targetLevel.getChunkSource().getGenerator(), +// new LegacyRandomSource(centerPos.asLong()), +// centerPos.below() +// ); +// +// } generatePortal(targetLevel, centerPos, portalAxis, portalID); }