From b5fd138b5b7a8fa426c9e81f9a65e054bf06f541 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 8 Jun 2022 23:07:40 +0800 Subject: Update to 1.19 --- .../main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java | 9 ++++----- .../rei/plugin/common/displays/DefaultInformationDisplay.java | 5 ++--- .../plugin/common/displays/brewing/DefaultBrewingDisplay.java | 6 +++--- 3 files changed, 9 insertions(+), 11 deletions(-) (limited to 'default-plugin') diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java index 5ba026cc5..96cf3be2a 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java @@ -28,7 +28,6 @@ import dev.architectury.hooks.fluid.FluidStackHooks; import dev.architectury.injectables.annotations.ExpectPlatform; import dev.architectury.injectables.annotations.PlatformOnly; import dev.architectury.platform.Platform; -import dev.architectury.utils.NbtType; import me.shedaniel.rei.api.common.display.DisplaySerializerRegistry; import me.shedaniel.rei.api.common.entry.comparison.EntryComparator; import me.shedaniel.rei.api.common.entry.comparison.ItemComparatorRegistry; @@ -67,13 +66,13 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin { Function enchantmentTag = stack -> { CompoundTag tag = stack.getTag(); if (tag == null) return null; - if (!tag.contains(ItemStack.TAG_ENCH, NbtType.LIST)) { - if (tag.contains(EnchantedBookItem.TAG_STORED_ENCHANTMENTS, NbtType.LIST)) { - return tag.getList(EnchantedBookItem.TAG_STORED_ENCHANTMENTS, NbtType.COMPOUND); + if (!tag.contains(ItemStack.TAG_ENCH, Tag.TAG_LIST)) { + if (tag.contains(EnchantedBookItem.TAG_STORED_ENCHANTMENTS, Tag.TAG_LIST)) { + return tag.getList(EnchantedBookItem.TAG_STORED_ENCHANTMENTS, Tag.TAG_COMPOUND); } return null; } - return tag.getList(ItemStack.TAG_ENCH, NbtType.COMPOUND); + return tag.getList(ItemStack.TAG_ENCH, Tag.TAG_COMPOUND); }; registry.register((context, stack) -> nbtHasher.hash(context, enchantmentTag.apply(stack)), Items.ENCHANTED_BOOK); registry.registerNbt(Items.POTION); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultInformationDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultInformationDisplay.java index fbae4fb85..156792870 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultInformationDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultInformationDisplay.java @@ -24,7 +24,6 @@ package me.shedaniel.rei.plugin.common.displays; import com.google.common.collect.Lists; -import dev.architectury.utils.NbtType; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.Display; import me.shedaniel.rei.api.common.display.DisplaySerializer; @@ -116,10 +115,10 @@ public class DefaultInformationDisplay implements Display { @Override public DefaultInformationDisplay read(CompoundTag tag) { - EntryIngredient stacks = EntryIngredient.read(tag.getList("stacks", NbtType.COMPOUND)); + EntryIngredient stacks = EntryIngredient.read(tag.getList("stacks", Tag.TAG_COMPOUND)); Component name = Component.Serializer.fromJson(tag.getString("name")); List descriptions = new ArrayList<>(); - for (Tag descriptionTag : tag.getList("descriptions", NbtType.STRING)) { + for (Tag descriptionTag : tag.getList("descriptions", Tag.TAG_STRING)) { descriptions.add(Component.Serializer.fromJson(descriptionTag.getAsString())); } return new DefaultInformationDisplay(stacks, name).lines(descriptions); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java index 99c8722d8..25009039b 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java @@ -24,7 +24,6 @@ package me.shedaniel.rei.plugin.common.displays.brewing; import com.google.common.collect.Lists; -import dev.architectury.utils.NbtType; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.Display; import me.shedaniel.rei.api.common.display.DisplaySerializer; @@ -35,6 +34,7 @@ import me.shedaniel.rei.api.common.util.EntryStacks; import me.shedaniel.rei.plugin.common.BuiltinPlugin; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.Tag; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; @@ -104,8 +104,8 @@ public class DefaultBrewingDisplay implements Display { @Override public DefaultBrewingDisplay read(CompoundTag tag) { - EntryIngredient input = EntryIngredient.read(tag.getList("input", NbtType.COMPOUND)); - EntryIngredient reactant = EntryIngredient.read(tag.getList("reactant", NbtType.COMPOUND)); + EntryIngredient input = EntryIngredient.read(tag.getList("input", Tag.TAG_COMPOUND)); + EntryIngredient reactant = EntryIngredient.read(tag.getList("reactant", Tag.TAG_COMPOUND)); EntryStack output = EntryStack.read(tag.getCompound("output")); return new DefaultBrewingDisplay(input, reactant, output); } -- cgit