Update to 1.16.1!

Author: LemmaEOF

build.gradle

@@ -2,7 +2,7 @@ plugins {
 	id "java"
 	id "eclipse"
 	id "idea"
-	id "fabric-loom" version "0.2.7-SNAPSHOT"
+	id "fabric-loom" version "0.4-SNAPSHOT"
 	id "maven-publish"
 	id "com.jfrog.artifactory" version "4.9.0"
 }

gradle.properties

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.16-pre2
+minecraft_version=1.16.1
 yarn_build=1
-loader_version=0.8.7+build.201
+loader_version=0.8.8+build.202
 
 # Mod Properties
 mod_version = 2.4.1
@@ -14,6 +14,6 @@ archives_base_name = libcd
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.11.6+build.355-1.16
+fabric_version=0.14.0+build.371-1.16
 jankson_version=3.0.0+j1.2.0
 parchment_version=1.0.2+1.15.2

src/main/java/io/github/cottonmc/libcd/CDContent.java

@@ -26,8 +26,7 @@
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionUtil;
 import net.minecraft.potion.Potions;
-import net.minecraft.tag.BlockTags;
-import net.minecraft.tag.ItemTags;
+import net.minecraft.tag.TagContainers;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
@@ -81,15 +80,15 @@ public void initConditions(ConditionManager manager) {
 			throw new CDSyntaxError("item_exists must accept either a String or an Array!");
 		});
 		manager.registerCondition(new Identifier(CDCommons.MODID, "item_tag_exists"), value -> {
-			if (value instanceof String) return ItemTags.getContainer().getKeys().contains(new Identifier((String)value));
+			if (value instanceof String) return TagContainers.instance().items().getKeys().contains(new Identifier((String)value));
 			if (value instanceof List) {
 				for (JsonElement el : (List<JsonElement>)value) {
 					if (!(el instanceof JsonPrimitive)) throw new CDSyntaxError("item_tag_exists array must only contain Strings!");
 					Object obj = ((JsonPrimitive)el).getValue();
 					if (obj instanceof String) {
 						Identifier id = new Identifier((String) obj);
-						if (!ItemTags.getContainer().getKeys().contains(id)) return false;
-						if (ItemTags.getContainer().get(id).values().isEmpty()) return false;
+						if (!TagContainers.instance().items().getKeys().contains(id)) return false;
+						if (TagContainers.instance().items().get(id).values().isEmpty()) return false;
 					}  else throw new CDSyntaxError("item_tag_exists array must only contain Strings!");
 				}
 				return true;
@@ -111,15 +110,15 @@ public void initConditions(ConditionManager manager) {
 			throw new CDSyntaxError("block_exists must accept either a String or an Array!");
 		});
 		manager.registerCondition(new Identifier(CDCommons.MODID, "block_tag_exists"), value -> {
-			if (value instanceof String) return BlockTags.getContainer().getKeys().contains(new Identifier((String)value));
+			if (value instanceof String) return TagContainers.instance().blocks().getKeys().contains(new Identifier((String)value));
 			if (value instanceof List) {
 				for (JsonElement el : (List<JsonElement>)value) {
 					if (!(el instanceof JsonPrimitive)) throw new CDSyntaxError("block_tag_exists array must only contain Strings!");
 					Object obj = ((JsonPrimitive)el).getValue();
 					if (obj instanceof String) {
 						Identifier id = new Identifier((String) obj);
-						if (!BlockTags.getContainer().getKeys().contains(id)) return false;
-						if (ItemTags.getContainer().get(id).values().isEmpty()) return false;
+						if (!TagContainers.instance().blocks().getKeys().contains(id)) return false;
+						if (TagContainers.instance().blocks().get(id).values().isEmpty()) return false;
 					}  else throw new CDSyntaxError("block_tag_exists array must only contain Strings!");
 				}
 				return true;

src/main/java/io/github/cottonmc/libcd/api/tweaker/loot/Conditions.java

@@ -10,7 +10,7 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.StringNbtReader;
 import net.minecraft.predicate.item.ItemPredicate;
-import net.minecraft.tag.ItemTags;
+import net.minecraft.tag.TagContainers;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
@@ -119,7 +119,7 @@ public LootCondition matchTool(String item, String nbt) {
 		ItemPredicate.Builder builder = ItemPredicate.Builder.create();
 		if (item.indexOf('#') == 0) {
 			Identifier id = new Identifier(item.substring(1));
-			builder.tag(ItemTags.getContainer().get(id));
+			builder.tag(TagContainers.instance().items().get(id));
 		} else {
 			Identifier id = new Identifier(item);
 			builder.item(Registry.ITEM.get(id));

src/main/java/io/github/cottonmc/libcd/api/tweaker/recipe/RecipeParser.java

@@ -19,8 +19,8 @@
 import net.minecraft.item.Items;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.recipe.Ingredient;
-import net.minecraft.tag.ItemTags;
 import net.minecraft.tag.Tag;
+import net.minecraft.tag.TagContainers;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.registry.Registry;
@@ -85,7 +85,7 @@ else if (input instanceof ItemStack) {
 			}
 			if (in.indexOf('#') == 0) {
 				String tag = in.substring(1);
-				Tag<Item> itemTag = ItemTags.getContainer().get(new Identifier(tag));
+				Tag<Item> itemTag = TagContainers.instance().items().get(new Identifier(tag));
 				if (itemTag == null) throw new CDSyntaxError("Failed to get item tag for input: " + in);
 				for (Item item : itemTag.values()) {
 					stacks.add(new ItemStack(item));
@@ -133,7 +133,7 @@ else if (input instanceof String) {
 			Item item;
 			if (in.indexOf('#') == 0) {
 				String tag = in.substring(1);
-				Tag<Item> itemTag = ItemTags.getContainer().get(new Identifier(tag));
+				Tag<Item> itemTag = TagContainers.instance().items().get(new Identifier(tag));
 				if (itemTag == null) throw new CDSyntaxError("Failed to get item tag for output: " + in);
 				item = TagHelper.ITEM.getDefaultEntry(itemTag);
 			} else if (in.contains("->")) {

src/main/java/io/github/cottonmc/libcd/api/tweaker/recipe/RecipeTweaker.java

@@ -12,7 +12,6 @@
 import io.github.cottonmc.libcd.impl.IngredientAccessUtils;
 import io.github.cottonmc.libcd.impl.RecipeMapAccessor;
 import io.github.cottonmc.libcd.impl.ReloadListenersAccessor;
-import net.minecraft.class_5357;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -498,7 +497,7 @@ public void addSmithing(Object base, Object addition, Object output) {
 			Identifier recipeId = getRecipeId(stack);
 			Ingredient baseIng = RecipeParser.processIngredient(base);
 			Ingredient addIng = RecipeParser.processIngredient(addition);
-			addRecipe(new class_5357(recipeId, baseIng, addIng, stack));
+			addRecipe(new SmithingRecipe(recipeId, baseIng, addIng, stack));
 		} catch (Exception e) {
 			logger.error("Error parsing smithing recipe - " + e.getMessage());
 		}

src/main/java/io/github/cottonmc/libcd/api/tweaker/util/TweakerUtils.java

@@ -21,8 +21,8 @@
 import net.minecraft.nbt.StringNbtReader;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.sound.SoundEvent;
-import net.minecraft.tag.ItemTags;
 import net.minecraft.tag.Tag;
+import net.minecraft.tag.TagContainers;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.collection.DefaultedList;
@@ -52,7 +52,7 @@ public Item getItem(String id) {
 	 */
 	public Item getDefaultItem(String id) {
 		Identifier tagId = new Identifier(id);
-		Tag<Item> tag = ItemTags.getContainer().get(tagId);
+		Tag<Item> tag = TagContainers.instance().items().get(tagId);
 		if (tag == null) return Items.AIR;
 		return TagHelper.ITEM.getDefaultEntry(tag);
 	}
@@ -288,7 +288,7 @@ public ItemStack getSpecialStack(String getter, String entry) {
 	 * @return An array of items in the tag.
 	 */
 	public String[] getItemsInTag(String tagId) {
-		Tag<Item> tag = ItemTags.getContainer().get(new Identifier(tagId));
+		Tag<Item> tag = TagContainers.instance().items().get(new Identifier(tagId));
 		if (tag == null) return new String[0];
 		Object[] items = tag.values().toArray();
 		String[] res = new String[items.length];

src/main/java/io/github/cottonmc/libcd/loot/DefaultedTagEntrySerializer.java

@@ -3,15 +3,14 @@
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
-import io.github.cottonmc.libcd.LibCD;
 import io.github.cottonmc.libcd.api.tag.TagHelper;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraft.loot.condition.LootCondition;
 import net.minecraft.loot.entry.LeafEntry;
 import net.minecraft.loot.function.LootFunction;
-import net.minecraft.tag.ItemTags;
 import net.minecraft.tag.Tag;
+import net.minecraft.tag.TagContainers;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.JsonHelper;
 
@@ -20,7 +19,7 @@ public class DefaultedTagEntrySerializer extends LeafEntry.Serializer<DefaultedT
 	@Override
 	protected DefaultedTagEntry fromJson(JsonObject entryJson, JsonDeserializationContext context, int weight, int quality, LootCondition[] conditions, LootFunction[] functions) {
 		String tagName = JsonHelper.getString(entryJson, "name");
-		Tag<Item> itemTag = ItemTags.getContainer().get(new Identifier(tagName));
+		Tag<Item> itemTag = TagContainers.instance().items().get(new Identifier(tagName));
 		if (itemTag == null) {
 			throw new JsonSyntaxException("Unknown tag " + tagName);
 		}

src/main/java/io/github/cottonmc/libcd/mixin/MixinResourceManagerImpl.java

@@ -29,7 +29,7 @@ public abstract class MixinResourceManagerImpl implements ReloadableResourceMana
 
 	@Shadow @Final private Map<String, NamespaceResourceManager> namespaceManagers;
 
-	@Inject(method = "findResources", at = @At("RETURN"), locals = LocalCapture.CAPTURE_FAILEXCEPTION)
+	@Inject(method = "findResources(Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection;", at = @At("RETURN"), locals = LocalCapture.CAPTURE_FAILEXCEPTION)
 	private void checkConditioalRecipes(String parent, Predicate<String> loadFilter, CallbackInfoReturnable<Collection<Identifier>> cir,
 										Set<Identifier> foundResources, List<Identifier> sortedResources) {
 		List<Identifier> sortedCopy = new ArrayList<>(sortedResources);

src/main/java/io/github/cottonmc/libcd/mixin/MixinShapedRecipe.java

@@ -11,7 +11,7 @@
 import net.minecraft.item.Items;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.recipe.ShapedRecipe;
-import net.minecraft.tag.ItemTags;
+import net.minecraft.tag.TagContainers;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.JsonHelper;
 import org.spongepowered.asm.mixin.Mixin;
@@ -27,7 +27,7 @@ private static void loadResource(JsonObject json, CallbackInfoReturnable<ItemSta
 		if (json.has("tag")) {
 			String tagName = JsonHelper.getString(json, "tag");
 			Identifier id = new Identifier(tagName);
-			net.minecraft.tag.Tag<Item> itemTag = ItemTags.getContainer().get(id);
+			net.minecraft.tag.Tag<Item> itemTag = TagContainers.instance().items().get(id);
 			if (itemTag == null) {
 				throw new JsonSyntaxException("Unknown tag " + tagName);
 			}