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

1.17.1-pre1

Browse Source
This commit is contained in:
gnembon committed 2021-06-18 23:43:47 -03:00
1 parent a4cec8165b
commit 0937ba8352
5 files changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/helpers/EntityPlayerActionPack.java
+2 -2
View File
@@ -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;
}
},
src/main/java/carpet/helpers/FeatureGenerator.java
+4 -4
View File
@@ -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),
src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
+2 -2
View File
@@ -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
))
src/main/java/carpet/script/api/Inventories.java
+1 -1
View File
@@ -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)
));