From b21731884fd420a5e31155c2a1f843f80c8ecfa6 Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 15 Jun 2020 18:59:09 -0300 Subject: [PATCH] 1.16-pre6 --- gradle.properties | 4 ++-- src/main/java/carpet/mixins/World_fillUpdatesMixin.java | 4 ++-- src/main/java/carpet/mixins/World_movableTEMixin.java | 8 ++++---- src/main/java/carpet/patches/EntityPlayerMPFake.java | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 05f983c8..872284a4 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-pre5 - yarn_mappings=1.16-pre5+build.1 + minecraft_version=1.16-pre6 + yarn_mappings=1.16-pre6+build.1 loader_version=0.8.7+build.201 # Mod Properties diff --git a/src/main/java/carpet/mixins/World_fillUpdatesMixin.java b/src/main/java/carpet/mixins/World_fillUpdatesMixin.java index 4459e3e1..1d5c15f6 100644 --- a/src/main/java/carpet/mixins/World_fillUpdatesMixin.java +++ b/src/main/java/carpet/mixins/World_fillUpdatesMixin.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(World.class) public abstract class World_fillUpdatesMixin { - @ModifyConstant(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z", + @ModifyConstant(method = "method_30092", //setBlockState main constant = @Constant(intValue = 16)) private int addFillUpdatesInt(int original) { if (CarpetSettings.impendingFillSkipUpdates) @@ -21,7 +21,7 @@ public abstract class World_fillUpdatesMixin return original; } - @Redirect(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z", at = @At( + @Redirect(method = "method_30092", at = @At( //setBlockState main value = "INVOKE", target = "Lnet/minecraft/world/World;updateNeighbors(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/Block;)V" )) diff --git a/src/main/java/carpet/mixins/World_movableTEMixin.java b/src/main/java/carpet/mixins/World_movableTEMixin.java index 0a53ff68..74520b5a 100644 --- a/src/main/java/carpet/mixins/World_movableTEMixin.java +++ b/src/main/java/carpet/mixins/World_movableTEMixin.java @@ -54,7 +54,7 @@ public abstract class World_movableTEMixin implements WorldInterface, WorldAcces @Shadow public abstract void updateComparators(BlockPos pos, Block block); - @Shadow public abstract boolean setBlockState(BlockPos pos, BlockState state, int flags); + //@Shadow public abstract boolean setBlockState(BlockPos pos, BlockState state, int flags); @Shadow public abstract boolean isDebugWorld(); @@ -125,9 +125,9 @@ public abstract class World_movableTEMixin implements WorldInterface, WorldAcces if ((int_1 & 16) == 0) { int int_2 = int_1 & -2; - blockState_2.prepare((net.minecraft.world.WorldAccess) this, blockPos_1, int_2); - blockState_1.updateNeighbors((net.minecraft.world.WorldAccess) this, blockPos_1, int_2); - blockState_1.prepare((net.minecraft.world.WorldAccess) this, blockPos_1, int_2); + blockState_2.prepare((net.minecraft.world.WorldAccess) this, blockPos_1, int_2, 512); + blockState_1.updateNeighbors((net.minecraft.world.WorldAccess) this, blockPos_1, int_2, 512); + blockState_1.prepare((net.minecraft.world.WorldAccess) this, blockPos_1, int_2, 512); } this.onBlockChanged(blockPos_1, blockState_2, blockState_3); } diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index de2ca657..570dc464 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java @@ -48,7 +48,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity instance.setHealth(20.0F); instance.removed = false; instance.stepHeight = 0.6F; - interactionManagerIn.setGameMode(gamemode); + interactionManagerIn.method_30118(gamemode); // setGameMode server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), dimensionId);//instance.dimension); server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), dimensionId);//instance.dimension); instance.getServerWorld().getChunkManager().updateCameraPosition(instance); @@ -68,7 +68,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity playerShadow.setHealth(player.getHealth()); playerShadow.networkHandler.requestTeleport(player.getX(), player.getY(), player.getZ(), player.yaw, player.pitch); - interactionManagerIn.setGameMode(player.interactionManager.getGameMode()); + interactionManagerIn.method_30118(player.interactionManager.getGameMode()); // setGameMode ((ServerPlayerEntityInterface) playerShadow).getActionPack().copyFrom(((ServerPlayerEntityInterface) player).getActionPack()); playerShadow.stepHeight = 0.6F; playerShadow.dataTracker.set(PLAYER_MODEL_PARTS, player.getDataTracker().get(PLAYER_MODEL_PARTS));