icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.16-pre6

Browse Source
This commit is contained in:
gnembon committed 2020-06-15 18:59:09 -03:00
1 parent 5bf1b734dc
commit b21731884f
4 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+2 -2
View File
@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
# or better: https://modmuss50.me/fabric.html # or better: https://modmuss50.me/fabric.html
minecraft_version=1.16-pre5 minecraft_version=1.16-pre6
yarn_mappings=1.16-pre5+build.1 yarn_mappings=1.16-pre6+build.1
loader_version=0.8.7+build.201 loader_version=0.8.7+build.201
# Mod Properties # Mod Properties
src/main/java/carpet/mixins/World_fillUpdatesMixin.java
+2 -2
View File
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(World.class) @Mixin(World.class)
public abstract class World_fillUpdatesMixin 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)) constant = @Constant(intValue = 16))
private int addFillUpdatesInt(int original) { private int addFillUpdatesInt(int original) {
if (CarpetSettings.impendingFillSkipUpdates) if (CarpetSettings.impendingFillSkipUpdates)
@@ -21,7 +21,7 @@ public abstract class World_fillUpdatesMixin
return original; 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", value = "INVOKE",
target = "Lnet/minecraft/world/World;updateNeighbors(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/Block;)V" target = "Lnet/minecraft/world/World;updateNeighbors(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/Block;)V"
)) ))
src/main/java/carpet/mixins/World_movableTEMixin.java
+4 -4
View File
@@ -54,7 +54,7 @@ public abstract class World_movableTEMixin implements WorldInterface, WorldAcces
@Shadow public abstract void updateComparators(BlockPos pos, Block block); @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(); @Shadow public abstract boolean isDebugWorld();
@@ -125,9 +125,9 @@ public abstract class World_movableTEMixin implements WorldInterface, WorldAcces
if ((int_1 & 16) == 0) if ((int_1 & 16) == 0)
{ {
int int_2 = int_1 & -2; int int_2 = int_1 & -2;
blockState_2.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); 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); blockState_1.prepare((net.minecraft.world.WorldAccess) this, blockPos_1, int_2, 512);
} }
this.onBlockChanged(blockPos_1, blockState_2, blockState_3); this.onBlockChanged(blockPos_1, blockState_2, blockState_3);
} }
src/main/java/carpet/patches/EntityPlayerMPFake.java
+2 -2
View File
@@ -48,7 +48,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
instance.setHealth(20.0F); instance.setHealth(20.0F);
instance.removed = false; instance.removed = false;
instance.stepHeight = 0.6F; 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 EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), dimensionId);//instance.dimension);
server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), dimensionId);//instance.dimension); server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), dimensionId);//instance.dimension);
instance.getServerWorld().getChunkManager().updateCameraPosition(instance); instance.getServerWorld().getChunkManager().updateCameraPosition(instance);
@@ -68,7 +68,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
playerShadow.setHealth(player.getHealth()); playerShadow.setHealth(player.getHealth());
playerShadow.networkHandler.requestTeleport(player.getX(), player.getY(), player.getZ(), player.yaw, player.pitch); 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()); ((ServerPlayerEntityInterface) playerShadow).getActionPack().copyFrom(((ServerPlayerEntityInterface) player).getActionPack());
playerShadow.stepHeight = 0.6F; playerShadow.stepHeight = 0.6F;
playerShadow.dataTracker.set(PLAYER_MODEL_PARTS, player.getDataTracker().get(PLAYER_MODEL_PARTS)); playerShadow.dataTracker.set(PLAYER_MODEL_PARTS, player.getDataTracker().get(PLAYER_MODEL_PARTS));