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

Disabled custom portal search code

Browse source
This commit is contained in:
Frank 2023-06-13 18:03:04 +02:00
parent 3b6f59aaa2
commit 6c2471af6c
1 changed files with 32 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/main/java/org/betterx/betterend/portal/PortalBuilder.java
View file

@ -3,15 +3,12 @@ package org.betterx.betterend.portal;
import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.BlocksHelper;
import org.betterx.betterend.blocks.EndPortalBlock; import org.betterx.betterend.blocks.EndPortalBlock;
import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndFeatures;
import org.betterx.betterend.registry.EndPoiTypes; import org.betterx.betterend.registry.EndPoiTypes;
import org.betterx.betterend.rituals.EternalRitual; import org.betterx.betterend.rituals.EternalRitual;
import org.betterx.worlds.together.world.event.WorldBootstrap;
import net.minecraft.BlockUtil; import net.minecraft.BlockUtil;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.registries.Registries;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.TicketType; import net.minecraft.server.level.TicketType;
import net.minecraft.util.Mth; 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.border.WorldBorder;
import net.minecraft.world.level.dimension.DimensionType; import net.minecraft.world.level.dimension.DimensionType;
import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.Heightmap;
import net.minecraft.world.level.levelgen.LegacyRandomSource;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@ -305,38 +301,38 @@ public class PortalBuilder {
Direction.Axis portalAxis = (Direction.Axis.X == portalDirection.getAxis()) Direction.Axis portalAxis = (Direction.Axis.X == portalDirection.getAxis())
? Direction.Axis.Z ? Direction.Axis.Z
: Direction.Axis.X; : Direction.Axis.X;
if (!checkIsAreaValid(targetLevel, centerPos, portalAxis)) { // if (!checkIsAreaValid(targetLevel, centerPos, portalAxis)) {
if (targetLevel.dimension() == Level.END) { // if (targetLevel.dimension() == Level.END) {
WorldBootstrap.getLastRegistryAccess() // WorldBootstrap.getLastRegistryAccess()
.registryOrThrow(Registries.CONFIGURED_FEATURE) // .registryOrThrow(Registries.CONFIGURED_FEATURE)
.get(net.minecraft.data.worldgen.features.EndFeatures.END_ISLAND) // .get(net.minecraft.data.worldgen.features.EndFeatures.END_ISLAND)
.place( // .place(
targetLevel, // targetLevel,
targetLevel.getChunkSource().getGenerator(), // targetLevel.getChunkSource().getGenerator(),
new LegacyRandomSource(centerPos.asLong()), // new LegacyRandomSource(centerPos.asLong()),
centerPos.below() // centerPos.below()
); // );
} else if (targetLevel.dimension() == Level.OVERWORLD) { // } else if (targetLevel.dimension() == Level.OVERWORLD) {
centerPos = centerPos // centerPos = centerPos
.mutable() // .mutable()
.setY(targetLevel.getChunk(centerPos) // .setY(targetLevel.getChunk(centerPos)
.getHeight( // .getHeight(
Heightmap.Types.WORLD_SURFACE, // Heightmap.Types.WORLD_SURFACE,
centerPos.getX(), // centerPos.getX(),
centerPos.getZ() // centerPos.getZ()
) + 1); // ) + 1);
} // }
EndFeatures.BIOME_ISLAND // EndFeatures.BIOME_ISLAND
.getPlacedFeature() // .getPlacedFeature()
.value() // .value()
.place( // .place(
targetLevel, // targetLevel,
targetLevel.getChunkSource().getGenerator(), // targetLevel.getChunkSource().getGenerator(),
new LegacyRandomSource(centerPos.asLong()), // new LegacyRandomSource(centerPos.asLong()),
centerPos.below() // centerPos.below()
); // );
//
} // }
generatePortal(targetLevel, centerPos, portalAxis, portalID); generatePortal(targetLevel, centerPos, portalAxis, portalID);
} }