From 0b93101248a9336d4961fb54daac29f30a9cbb06 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 17 Mar 2021 10:42:31 -0300 Subject: [PATCH] mapping --- gradle.properties | 2 +- src/main/java/carpet/mixins/ContainerMixin.java | 4 ++-- src/main/java/carpet/script/api/Scoreboards.java | 4 ++-- src/main/java/carpet/script/argument/FileArgument.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index b87c4d41..55b918a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=21w10a - yarn_mappings=21w10a+build.15 + yarn_mappings=21w10a+build.23 loader_version=0.11.3 fabric_version=0.32.2+1.17 diff --git a/src/main/java/carpet/mixins/ContainerMixin.java b/src/main/java/carpet/mixins/ContainerMixin.java index 01905693..96e650fa 100644 --- a/src/main/java/carpet/mixins/ContainerMixin.java +++ b/src/main/java/carpet/mixins/ContainerMixin.java @@ -30,12 +30,12 @@ public abstract class ContainerMixin @Shadow protected abstract void endQuickCraft(); - @Shadow public abstract ItemStack method_34255(); + @Shadow public abstract ItemStack getCursorStack(); @Inject( method = "internalOnSlotClick", at = @At(value = "HEAD"), cancellable = true) private void onThrowClick(int slotId, int clickData, SlotActionType actionType, PlayerEntity playerEntity, CallbackInfo ci) { - if (actionType == SlotActionType.THROW && CarpetSettings.ctrlQCraftingFix && this.method_34255().isEmpty() /* playerEntity.getInventory().getCursorStack().isEmpty()*/ && slotId >= 0) + if (actionType == SlotActionType.THROW && CarpetSettings.ctrlQCraftingFix && this.getCursorStack().isEmpty() && slotId >= 0) { ItemStack itemStack_1 = ItemStack.EMPTY; Slot slot_4 = slots.get(slotId); diff --git a/src/main/java/carpet/script/api/Scoreboards.java b/src/main/java/carpet/script/api/Scoreboards.java index fb6192c5..82136acb 100644 --- a/src/main/java/carpet/script/api/Scoreboards.java +++ b/src/main/java/carpet/script/api/Scoreboards.java @@ -594,12 +594,12 @@ public class Scoreboards { return LazyValue.FALSE; case "style": if(propertyValue == null) { - return (_c, _t) -> StringValue.of(bossBar.getOverlay().getName()); + return (_c, _t) -> StringValue.of(bossBar.getStyle().getName()); } BossBar.Style style = BossBar.Style.byName(propertyValue.getString()); if(style == null) throw new InternalExpressionException("'" + propertyValue.getString() + "' is not a valid value for property " + property); - bossBar.setOverlay(style); + bossBar.setStyle(style); return LazyValue.TRUE; case "value": if(propertyValue == null) return (_c, _t) -> NumericValue.of(bossBar.getValue()); diff --git a/src/main/java/carpet/script/argument/FileArgument.java b/src/main/java/carpet/script/argument/FileArgument.java index f3ad42fe..c3800fa0 100644 --- a/src/main/java/carpet/script/argument/FileArgument.java +++ b/src/main/java/carpet/script/argument/FileArgument.java @@ -11,7 +11,7 @@ import com.google.gson.JsonParser; import com.google.gson.stream.JsonReader; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; -import net.minecraft.nbt.PositionTracker; +import net.minecraft.nbt.NbtTagSizeTracker; import net.minecraft.nbt.Tag; import net.minecraft.nbt.TagReaders; import net.minecraft.util.WorldSavePath; @@ -233,7 +233,7 @@ public class FileArgument else { dataInput_1.readUTF(); - return TagReaders.of(byte_1).read(dataInput_1, 0, PositionTracker.DEFAULT); + return TagReaders.of(byte_1).read(dataInput_1, 0, NbtTagSizeTracker.EMPTY); } } catch (IOException ignored)