diff --git a/gradle.properties b/gradle.properties index 5c1b923c..70734ee2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check https://fabricmc.net/develop/ - minecraft_version=23w18a + minecraft_version=1.20-pre1 loader_version=0.14.19 jsr305_version=3.0.2 - fabric_version=0.80.1+1.20 + fabric_version=0.80.2+1.20 # Mod Properties mod_version = 1.4.107 diff --git a/src/main/java/carpet/helpers/OptimizedExplosion.java b/src/main/java/carpet/helpers/OptimizedExplosion.java index 9345f714..aec3620c 100644 --- a/src/main/java/carpet/helpers/OptimizedExplosion.java +++ b/src/main/java/carpet/helpers/OptimizedExplosion.java @@ -29,7 +29,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.material.FluidState; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; @@ -246,8 +246,7 @@ public class OptimizedExplosion { BlockEntity blockEntity = state.hasBlockEntity() ? world.getBlockEntity(blockpos) : null; //hasBlockEntity() - LootContext.Builder lootBuilder = (new LootContext.Builder((ServerLevel)eAccess.getLevel())) - .withRandom(eAccess.getLevel().random) + LootParams.Builder lootBuilder = (new LootParams.Builder((ServerLevel)eAccess.getLevel())) .withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(blockpos)) .withParameter(LootContextParams.TOOL, ItemStack.EMPTY) .withOptionalParameter(LootContextParams.BLOCK_ENTITY, blockEntity) diff --git a/src/main/java/carpet/mixins/Level_movableBEMixin.java b/src/main/java/carpet/mixins/Level_movableBEMixin.java index 151f215f..24d97c96 100644 --- a/src/main/java/carpet/mixins/Level_movableBEMixin.java +++ b/src/main/java/carpet/mixins/Level_movableBEMixin.java @@ -3,7 +3,7 @@ package carpet.mixins; import carpet.fakes.WorldChunkInterface; import carpet.fakes.LevelInterface; import net.minecraft.core.BlockPos; -import net.minecraft.server.level.ChunkHolder; +import net.minecraft.server.level.FullChunkStatus; import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; @@ -100,7 +100,7 @@ public abstract class Level_movableBEMixin implements LevelInterface, LevelAcces this.setBlocksDirty(blockPos_1, blockState_2, blockState_3); } - if ((int_1 & 2) != 0 && (!this.isClientSide || (int_1 & 4) == 0) && (this.isClientSide || worldChunk_1.getFullStatus() != null && worldChunk_1.getFullStatus().isOrAfter(ChunkHolder.FullChunkStatus.TICKING))) + if ((int_1 & 2) != 0 && (!this.isClientSide || (int_1 & 4) == 0) && (this.isClientSide || worldChunk_1.getFullStatus() != null && worldChunk_1.getFullStatus().isOrAfter(FullChunkStatus.BLOCK_TICKING))) { this.sendBlockUpdated(blockPos_1, blockState_2, blockState_1, int_1); }