From 0937ba8352496698acc6f677025ba9cea3a815a1 Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 18 Jun 2021 23:43:47 -0300 Subject: [PATCH] 1.17.1-pre1 --- gradle.properties | 8 ++++---- src/main/java/carpet/helpers/EntityPlayerActionPack.java | 4 ++-- src/main/java/carpet/helpers/FeatureGenerator.java | 8 ++++---- .../ServerPlayNetworkHandler_scarpetEventsMixin.java | 4 ++-- src/main/java/carpet/script/api/Inventories.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5829a745..ac8a7f04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=1.17 - yarn_mappings=1.17+build.1 - loader_version=0.11.3 - fabric_version=0.34.9+1.17 + minecraft_version=1.17.1-pre1 + yarn_mappings=1.17.1-pre1+build.1 + loader_version=0.11.6 + fabric_version=0.35.2+1.17 # Mod Properties mod_version = 1.4.40 diff --git a/src/main/java/carpet/helpers/EntityPlayerActionPack.java b/src/main/java/carpet/helpers/EntityPlayerActionPack.java index c4b57553..4c63e35e 100644 --- a/src/main/java/carpet/helpers/EntityPlayerActionPack.java +++ b/src/main/java/carpet/helpers/EntityPlayerActionPack.java @@ -487,7 +487,7 @@ public class EntityPlayerActionPack boolean execute(ServerPlayerEntity player, Action action) { player.updateLastActionTime(); - player.dropSelectedItem(false); + player.method_37413(false); // dropSelectedItem return false; } }, @@ -497,7 +497,7 @@ public class EntityPlayerActionPack boolean execute(ServerPlayerEntity player, Action action) { player.updateLastActionTime(); - player.dropSelectedItem(true); + player.method_37413(true); // dropSelectedItem return false; } }, diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 0cb97fc4..05ed8afa 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -192,7 +192,7 @@ public class FeatureGenerator new Identifier("bastion/starts"), new Identifier("empty"), ImmutableList.of( - Pair.of(StructurePoolElement.method_30435("bastion/units/air_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) + Pair.of(StructurePoolElement.ofProcessedSingle("bastion/units/air_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) ), StructurePool.Projection.RIGID ), 6), @@ -204,7 +204,7 @@ public class FeatureGenerator new Identifier("bastion/starts"), new Identifier("empty"), ImmutableList.of( - Pair.of(StructurePoolElement.method_30435("bastion/hoglin_stable/air_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) + Pair.of(StructurePoolElement.ofProcessedSingle("bastion/hoglin_stable/air_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) ), StructurePool.Projection.RIGID ), 6), @@ -216,7 +216,7 @@ public class FeatureGenerator new Identifier("bastion/starts"), new Identifier("empty"), ImmutableList.of( - Pair.of(StructurePoolElement.method_30435("bastion/treasure/big_air_full", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) + Pair.of(StructurePoolElement.ofProcessedSingle("bastion/treasure/big_air_full", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) ), StructurePool.Projection.RIGID ), 6), @@ -228,7 +228,7 @@ public class FeatureGenerator new Identifier("bastion/starts"), new Identifier("empty"), ImmutableList.of( - Pair.of(StructurePoolElement.method_30435("bastion/bridge/starting_pieces/entrance_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) + Pair.of(StructurePoolElement.ofProcessedSingle("bastion/bridge/starting_pieces/entrance_base", StructureProcessorLists.BASTION_GENERIC_DEGRADATION), 1) ), StructurePool.Projection.RIGID ), 6), diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java index c1f91226..3811ddb2 100644 --- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java @@ -62,7 +62,7 @@ public class ServerPlayNetworkHandler_scarpetEventsMixin @Inject(method = "onPlayerAction", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/network/ServerPlayerEntity;dropSelectedItem(Z)Z", + target = "Lnet/minecraft/server/network/ServerPlayerEntity;method_37413(Z)Z", // dropSelectedItem ordinal = 0, shift = At.Shift.BEFORE )) @@ -84,7 +84,7 @@ public class ServerPlayNetworkHandler_scarpetEventsMixin @Inject(method = "onPlayerAction", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/network/ServerPlayerEntity;dropSelectedItem(Z)Z", + target = "Lnet/minecraft/server/network/ServerPlayerEntity;method_37413(Z)Z", // dropSelectedItem ordinal = 1, shift = At.Shift.BEFORE )) diff --git a/src/main/java/carpet/script/api/Inventories.java b/src/main/java/carpet/script/api/Inventories.java index 211e6275..70d4dfac 100644 --- a/src/main/java/carpet/script/api/Inventories.java +++ b/src/main/java/carpet/script/api/Inventories.java @@ -396,7 +396,7 @@ public class Inventories { { ServerPlayerEntity player = (ServerPlayerEntity) inventory.owner; player.networkHandler.sendPacket(new ScreenHandlerSlotUpdateS2CPacket( - -2, + -2, 0, // resolve mystery argument int_1, inventory.inventory.getStack(int_1) ));