icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

26.1-snap-2

Browse Source
This commit is contained in:
gnembon committed 2026-01-07 19:02:46 +01:00
1 parent 0595f0ced7
commit dee2d0fb87
8 files changed
+27 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/utils/FeatureGenerator.java
+4 -4
View File
@@ -239,8 +239,8 @@ public class FeatureGenerator
ChunkGenerator generator = chunkSource.getGenerator();
ChunkGeneratorStructureState structureState = chunkSource.getGeneratorState();
List<StructurePlacement> structureConfig = structureState.getPlacementsForStructure(Holder.direct(structure));
ChunkPos chunkPos = new ChunkPos(pos);
boolean couldPlace = structureConfig.stream().anyMatch(p -> p.isStructureChunk(structureState, chunkPos.x, chunkPos.z));
ChunkPos chunkPos = ChunkPos.containing(pos);
boolean couldPlace = structureConfig.stream().anyMatch(p -> p.isStructureChunk(structureState, chunkPos.x(), chunkPos.z()));
if (!couldPlace)
{
return null;
@@ -418,7 +418,7 @@ public class FeatureGenerator
checks.set(true);
try
{
StructureStart start = structure.generate(Holder.direct(structure), world.dimension(), world.registryAccess(), generator, generator.getBiomeSource(), world.getChunkSource().randomState(), world.getStructureManager(), world.getSeed(), new ChunkPos(pos), 0, world, b -> true);
StructureStart start = structure.generate(Holder.direct(structure), world.dimension(), world.registryAccess(), generator, generator.getBiomeSource(), world.getChunkSource().randomState(), world.getStructureManager(), world.getSeed(), ChunkPos.containing(pos), 0, world, b -> true);
if (start == StructureStart.INVALID_START)
{
return false;
@@ -426,7 +426,7 @@ public class FeatureGenerator
RandomSource rand = RandomSource.create(world.getRandom().nextInt());
int j = pos.getX() >> 4;
int k = pos.getZ() >> 4;
long chId = ChunkPos.asLong(j, k);
long chId = ChunkPos.pack(j, k);
world.getChunk(j, k).setStartForStructure(structure, start);
world.getChunk(j, k).addReferenceForStructure(structure, chId);
src/main/java/carpet/script/utils/WorldTools.java
+3 -3
View File
@@ -47,7 +47,7 @@ public class WorldTools
public static boolean canHasChunk(ServerLevel world, ChunkPos chpos, @Nullable Map<String, RegionFile> regionCache, boolean deepcheck)
{
if (world.getChunk(chpos.x, chpos.z, ChunkStatus.STRUCTURE_STARTS, false) != null)
if (world.getChunk(chpos.x(), chpos.z(), ChunkStatus.STRUCTURE_STARTS, false) != null)
{
return true;
}
@@ -159,8 +159,8 @@ public class WorldTools
public static void forceChunkUpdate(BlockPos pos, ServerLevel world)
{
ChunkPos chunkPos = new ChunkPos(pos);
LevelChunk worldChunk = world.getChunkSource().getChunk(chunkPos.x, chunkPos.z, false);
ChunkPos chunkPos = ChunkPos.containing(pos);
LevelChunk worldChunk = world.getChunkSource().getChunk(chunkPos.x(), chunkPos.z(), false);
if (worldChunk != null)
{
List<ServerPlayer> players = world.getChunkSource().chunkMap.getPlayers(chunkPos, false);