diff --git a/gradle.properties b/gradle.properties index a9817dc7..fa861487 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=1.16.2-pre2 - yarn_mappings=1.16.2-pre2+build.1 + minecraft_version=1.16.2-pre3 + yarn_mappings=1.16.2-pre3+build.2 loader_version=0.9.0+build.204 # Mod Properties diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 0c691292..3ca5bb96 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -9,7 +9,7 @@ import net.minecraft.structure.StructureManager; import net.minecraft.structure.StructureStart; import net.minecraft.structure.pool.StructurePool; import net.minecraft.structure.pool.StructurePoolElement; -import net.minecraft.structure.processor.ProcessorLists; +import net.minecraft.structure.processor.StructureProcessorLists; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockBox; import net.minecraft.util.math.BlockPos; @@ -193,7 +193,7 @@ public class FeatureGenerator new Identifier("bastion/starts"), new Identifier("empty"), ImmutableList.of( - Pair.of(StructurePoolElement.method_30435("bastion/units/air_base", ProcessorLists.BASTION_GENERIC_DEGRADATION), 1) + Pair.of(StructurePoolElement.method_30435("bastion/units/air_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) ), StructurePool.Projection.RIGID ), 6), @@ -205,7 +205,7 @@ public class FeatureGenerator new Identifier("bastion/starts"), new Identifier("empty"), ImmutableList.of( - Pair.of(StructurePoolElement.method_30435("bastion/hoglin_stable/air_base", ProcessorLists.BASTION_GENERIC_DEGRADATION), 1) + Pair.of(StructurePoolElement.method_30435("bastion/hoglin_stable/air_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) ), StructurePool.Projection.RIGID ), 6), @@ -217,7 +217,7 @@ public class FeatureGenerator new Identifier("bastion/starts"), new Identifier("empty"), ImmutableList.of( - Pair.of(StructurePoolElement.method_30435("bastion/treasure/big_air_full", ProcessorLists.BASTION_GENERIC_DEGRADATION), 1) + Pair.of(StructurePoolElement.method_30435("bastion/treasure/big_air_full", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) ), StructurePool.Projection.RIGID ), 6), @@ -229,7 +229,7 @@ public class FeatureGenerator new Identifier("bastion/starts"), new Identifier("empty"), ImmutableList.of( - Pair.of(StructurePoolElement.method_30435("bastion/bridge/starting_pieces/entrance_base", ProcessorLists.BASTION_GENERIC_DEGRADATION), 1) + Pair.of(StructurePoolElement.method_30435("bastion/bridge/starting_pieces/entrance_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) ), StructurePool.Projection.RIGID ), 6), diff --git a/src/main/java/carpet/mixins/ServerWorld_tickMixin.java b/src/main/java/carpet/mixins/ServerWorld_tickMixin.java index 20607218..4bbd034d 100644 --- a/src/main/java/carpet/mixins/ServerWorld_tickMixin.java +++ b/src/main/java/carpet/mixins/ServerWorld_tickMixin.java @@ -25,14 +25,15 @@ import java.util.function.Supplier; @Mixin(ServerWorld.class) public abstract class ServerWorld_tickMixin extends World { + protected ServerWorld_tickMixin(MutableWorldProperties properties, RegistryKey registryKey, DimensionType dimensionType, Supplier supplier, boolean bl, boolean bl2, long l) + { + super(properties, registryKey, dimensionType, supplier, bl, bl2, l); + } + @Shadow protected abstract void processSyncedBlockEvents(); //@Shadow protected abstract void sendBlockActions(); @Shadow protected abstract void tickTime(); - protected ServerWorld_tickMixin(MutableWorldProperties mutableWorldProperties, RegistryKey registryKey, RegistryKey registryKey2, DimensionType dimensionType, Supplier supplier, boolean bl, boolean bl2, long l) - { - super(mutableWorldProperties, registryKey, registryKey2, dimensionType, supplier, bl, bl2, l); - } private CarpetProfiler.ProfilerToken currentSection;