diff --git a/gradle.properties b/gradle.properties index 3364bb2a..50c85010 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check https://fabricmc.net/develop/ - minecraft_version=1.20.2-pre2 + minecraft_version=1.20.2-pre4 loader_version=0.14.22 jsr305_version=3.0.2 fabric_version=0.88.2+1.20.2 diff --git a/src/main/java/carpet/helpers/BlockRotator.java b/src/main/java/carpet/helpers/BlockRotator.java index 6794f9bb..ea876368 100644 --- a/src/main/java/carpet/helpers/BlockRotator.java +++ b/src/main/java/carpet/helpers/BlockRotator.java @@ -2,8 +2,8 @@ package carpet.helpers; import carpet.fakes.PistonBlockInterface; import net.minecraft.core.BlockPos; -import net.minecraft.core.BlockSource; import net.minecraft.core.Direction; +import net.minecraft.core.dispenser.BlockSource; import net.minecraft.core.dispenser.DispenseItemBehavior; import net.minecraft.core.dispenser.OptionalDispenseItemBehavior; import net.minecraft.world.InteractionHand; @@ -51,9 +51,9 @@ public class BlockRotator public static ItemStack dispenserRotate(BlockSource source, ItemStack stack) { - Direction sourceFace = source.getBlockState().getValue(DispenserBlock.FACING); - Level world = source.getLevel(); - BlockPos blockpos = source.getPos().relative(sourceFace); // offset + Direction sourceFace = source.state().getValue(DispenserBlock.FACING); + Level world = source.level(); + BlockPos blockpos = source.pos().relative(sourceFace); // offset BlockState blockstate = world.getBlockState(blockpos); Block block = blockstate.getBlock(); @@ -100,7 +100,7 @@ public class BlockRotator } } // Send block update to the block that just have been rotated. - world.neighborChanged(blockpos, block, source.getPos()); + world.neighborChanged(blockpos, block, source.pos()); return stack; } diff --git a/src/main/java/carpet/script/argument/FileArgument.java b/src/main/java/carpet/script/argument/FileArgument.java index c5e3cb53..dbc05859 100644 --- a/src/main/java/carpet/script/argument/FileArgument.java +++ b/src/main/java/carpet/script/argument/FileArgument.java @@ -461,7 +461,7 @@ public class FileArgument else { dataInputStream.readUTF(); - return TagTypes.getType(b).load(dataInputStream, 0, NbtAccounter.UNLIMITED); + return TagTypes.getType(b).load(dataInputStream, NbtAccounter.unlimitedHeap()); } } catch (IOException secondIO)