fixes for 22w11a
This commit is contained in:
1 parent
3e419d1557
commit
302a7b4817
39 files changed
+410
-305
No files matched your search
@@ -2,8 +2,10 @@ package carpet.mixins;
|
||||
|
||||
import carpet.fakes.ChunkGeneratorInterface;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||
import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
|
||||
import net.minecraft.world.level.levelgen.RandomState;
|
||||
import net.minecraft.world.level.levelgen.structure.Structure;
|
||||
import net.minecraft.world.level.levelgen.structure.placement.StructurePlacement;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
@@ -14,18 +16,18 @@ import java.util.List;
|
||||
public abstract class ChunkGenerator_scarpetMixin implements ChunkGeneratorInterface
|
||||
{
|
||||
|
||||
@Shadow protected abstract List<StructurePlacement> getPlacementsForFeature(Holder<ConfiguredStructureFeature<?, ?>> holder);
|
||||
@Shadow public abstract void ensureStructuresGenerated(RandomState randomState);
|
||||
|
||||
@Shadow public abstract void ensureStructuresGenerated();
|
||||
@Shadow protected abstract List<StructurePlacement> getPlacementsForStructure(Holder<Structure> holder, RandomState randomState);
|
||||
|
||||
@Override
|
||||
public void initStrongholds()
|
||||
public void initStrongholds(final ServerLevel level)
|
||||
{
|
||||
ensureStructuresGenerated();
|
||||
ensureStructuresGenerated(level.getChunkSource().randomState());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<StructurePlacement> getPlacementsForFeatureCM(ConfiguredStructureFeature<?, ?> structure) {
|
||||
return getPlacementsForFeature(Holder.direct(structure));
|
||||
public List<StructurePlacement> getPlacementsForFeatureCM(final ServerLevel level, Structure structure) {
|
||||
return getPlacementsForStructure(Holder.direct(structure), level.getChunkSource().randomState());
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user