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

1.15 adjustments for scarpet 1.5

Browse Source
This commit is contained in:
gnembon committed 2019-10-08 02:18:09 -03:00
1 parent dc9532cf05
commit 03703fd7fe
2 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
+5 -5
View File
@@ -21,11 +21,11 @@ public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity
super(world_1, gameProfile_1); super(world_1, gameProfile_1);
} }
@Shadow protected abstract void method_6040(); @Shadow protected abstract void consumeItem();
@Redirect(method = "method_6040", at = @At( @Redirect(method = "consumeItem", at = @At(
value = "INVOKE", value = "INVOKE",
target = "Lnet/minecraft/entity/player/PlayerEntity;method_6040()V" target = "Lnet/minecraft/entity/player/PlayerEntity;consumeItem()V"
)) ))
private void finishedUsingItem(PlayerEntity playerEntity) private void finishedUsingItem(PlayerEntity playerEntity)
{ {
@@ -34,13 +34,13 @@ public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity
Hand hand = getActiveHand(); Hand hand = getActiveHand();
ItemStack stack = getActiveItem().copy(); ItemStack stack = getActiveItem().copy();
// do vanilla // do vanilla
super.method_6040(); super.consumeItem();
PLAYER_FINISHED_USING_ITEM.onItemAction((ServerPlayerEntity) (Object)this, hand, stack); PLAYER_FINISHED_USING_ITEM.onItemAction((ServerPlayerEntity) (Object)this, hand, stack);
} }
else else
{ {
// do vanilla // do vanilla
super.method_6040(); super.consumeItem();
} }
} }
} }
src/main/java/carpet/script/value/NBTSerializableValue.java
+2 -2
View File
@@ -294,7 +294,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
Collection<Tag> targets; Collection<Tag> targets;
try try
{ {
targets = nbtPath.putIfAbsent(currentTag, ListTag::new); targets = nbtPath.getOrInit(currentTag, ListTag::new);
} }
catch (CommandSyntaxException e) catch (CommandSyntaxException e)
{ {
@@ -332,7 +332,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
Tag originalTag = getTag().copy(); Tag originalTag = getTag().copy();
try try
{ {
for (Tag target : nbtPath.putIfAbsent(originalTag, CompoundTag::new)) for (Tag target : nbtPath.getOrInit(originalTag, CompoundTag::new))
{ {
if (!(target instanceof CompoundTag)) if (!(target instanceof CompoundTag))
{ {