1.15 adjustments for scarpet 1.5

src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java

@@ -21,11 +21,11 @@ public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity
         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",
-            target = "Lnet/minecraft/entity/player/PlayerEntity;method_6040()V"
+            target = "Lnet/minecraft/entity/player/PlayerEntity;consumeItem()V"
     ))
     private void finishedUsingItem(PlayerEntity playerEntity)
     {
@@ -34,13 +34,13 @@ public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity
             Hand hand = getActiveHand();
             ItemStack stack = getActiveItem().copy();
             // do vanilla
-            super.method_6040();
+            super.consumeItem();
             PLAYER_FINISHED_USING_ITEM.onItemAction((ServerPlayerEntity) (Object)this, hand, stack);
         }
         else
         {
             // do vanilla
-            super.method_6040();
+            super.consumeItem();
         }
     }
 }

src/main/java/carpet/script/value/NBTSerializableValue.java

@@ -294,7 +294,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
         Collection<Tag> targets;
         try
         {
-            targets = nbtPath.putIfAbsent(currentTag, ListTag::new);
+            targets = nbtPath.getOrInit(currentTag, ListTag::new);
         }
         catch (CommandSyntaxException e)
         {
@@ -332,7 +332,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
         Tag originalTag = getTag().copy();
         try
         {
-            for (Tag target : nbtPath.putIfAbsent(originalTag, CompoundTag::new))
+            for (Tag target : nbtPath.getOrInit(originalTag, CompoundTag::new))
             {
                 if (!(target instanceof CompoundTag))
                 {