aboutsummaryrefslogtreecommitdiff
path: root/api/src/main
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2022-06-08 23:07:40 +0800
committershedaniel <daniel@shedaniel.me>2022-06-08 23:07:40 +0800
commitb5fd138b5b7a8fa426c9e81f9a65e054bf06f541 (patch)
tree26c8b962cd59b49526a1c2b13ddd590e1310035f /api/src/main
parent52ec5dcd865e6c6eeeb686c4ebe40b8580e90407 (diff)
downloadRoughlyEnoughItems-b5fd138b5b7a8fa426c9e81f9a65e054bf06f541.tar.gz
RoughlyEnoughItems-b5fd138b5b7a8fa426c9e81f9a65e054bf06f541.tar.bz2
RoughlyEnoughItems-b5fd138b5b7a8fa426c9e81f9a65e054bf06f541.zip
Update to 1.19
Diffstat (limited to 'api/src/main')
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java8
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java4
2 files changed, 6 insertions, 6 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java b/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
index a6e333921..198104f1f 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
@@ -23,12 +23,12 @@
package me.shedaniel.rei.api.common.display.basic;
-import dev.architectury.utils.NbtType;
import me.shedaniel.rei.api.common.display.Display;
import me.shedaniel.rei.api.common.display.SimpleDisplaySerializer;
import me.shedaniel.rei.api.common.entry.EntryIngredient;
import me.shedaniel.rei.api.common.util.EntryIngredients;
import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.Nullable;
@@ -131,10 +131,10 @@ public abstract class BasicDisplay implements Display {
@Override
public P read(CompoundTag tag) {
- List<EntryIngredient> input = EntryIngredients.read(tag.getList("input", NbtType.LIST));
- List<EntryIngredient> output = EntryIngredients.read(tag.getList("output", NbtType.LIST));
+ List<EntryIngredient> input = EntryIngredients.read(tag.getList("input", Tag.TAG_LIST));
+ List<EntryIngredient> output = EntryIngredients.read(tag.getList("output", Tag.TAG_LIST));
ResourceLocation location;
- if (tag.contains("location", NbtType.STRING)) {
+ if (tag.contains("location", Tag.TAG_STRING)) {
location = new ResourceLocation(tag.getString("location"));
} else {
location = null;
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java b/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java
index cf9e671cf..53c622901 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java
@@ -23,10 +23,10 @@
package me.shedaniel.rei.api.common.registry;
-import dev.architectury.utils.NbtType;
import me.shedaniel.rei.api.common.plugins.PluginManager;
import me.shedaniel.rei.api.common.plugins.REIPlugin;
import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.item.crafting.RecipeManager;
@@ -51,7 +51,7 @@ public interface RecipeManagerContext<P extends REIPlugin<?>> extends Reloadable
RecipeManager getRecipeManager();
default Recipe<?> byId(CompoundTag tag, String key) {
- if (tag.contains(key, NbtType.STRING)) {
+ if (tag.contains(key, Tag.TAG_STRING)) {
return getRecipeManager().byKey(new ResourceLocation(tag.getString(key))).orElse(null);
}
return null;