1.18.2

Shnupbups · Mar 10, 2022 · d9626d6 · d9626d6
1 parent 22222e3
commit d9626d6
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.10-SNAPSHOT'
+	id 'fabric-loom' version '0.11-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -10,9 +10,6 @@ archivesBaseName = project.mod_name
 version = project.mod_version + "+" + project.version_meta
 group = project.maven_group
 
-minecraft {
-}
-
 repositories {
 	maven { url "https://maven.terraformersmc.com/"}
 	maven { url "https://maven.shedaniel.me/" }

diff --git a/gradle.properties b/gradle.properties
@@ -2,25 +2,25 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.18-rc3
+	# check these on https://fabricmc.net/develop/
+	minecraft_version=1.18.2
 	yarn_mappings=2
 	tiny_version=2
-	loader_version=0.12.5
+	loader_version=0.13.3
 
 # Mod Properties
 	mod_version = 1.1.1
 	maven_group = com.shnupbups
 	mod_name = piglib
-	version_meta = fabric-mc1.18
+	version_meta = fabric-mc1.18.2
 
 # Dependencies
-	# check on https://modmuss50.me/fabric.html
-	fapi_version=0.43.1+1.18
+	# check on https://fabricmc.net/develop/
+	fapi_version=0.47.10+1.18.2
 
 # Other Stuff
 	# check on maven at https://maven.shedaniel.me/me/shedaniel/RoughlyEnoughItems-fabric/
-	rei_version = 7.0.339
+	rei_version = 8.0.442
 
 	# check on maven at https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/
-	modmenu_version = 3.0.0
+	modmenu_version = 3.1.0
diff --git a/src/main/java/com/shnupbups/piglib/Piglib.java b/src/main/java/com/shnupbups/piglib/Piglib.java
@@ -3,18 +3,18 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tag.ItemTags;
-import net.minecraft.tag.Tag;
+import net.minecraft.tag.TagKey;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
 
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.tag.TagFactory;
 
 public class Piglib implements ModInitializer {
 	public static final String MOD_ID = "piglib";
 
-	public static Tag.Identified<Item> PIGLIN_SAFE_ARMOR;
-	public static Tag.Identified<Item> PIGLIN_LOVED_NUGGETS;
-	public static Tag.Identified<Item> PIGLIN_BARTERING_ITEMS;
+	public static TagKey<Item> PIGLIN_SAFE_ARMOR = TagKey.of(Registry.ITEM_KEY, id("piglin_safe_armor"));
+	public static TagKey<Item> PIGLIN_LOVED_NUGGETS = TagKey.of(Registry.ITEM_KEY, id("piglin_loved_nuggets"));
+	public static TagKey<Item> PIGLIN_BARTERING_ITEMS = TagKey.of(Registry.ITEM_KEY, id("piglin_bartering_items"));
 
 	public static boolean shouldAdmire(ItemStack stack) {
 		return stack.isIn(ItemTags.PIGLIN_LOVED);
@@ -26,8 +26,6 @@ public static Identifier id(String id) {
 
 	@Override
 	public void onInitialize() {
-		PIGLIN_SAFE_ARMOR = TagFactory.ITEM.create(id("piglin_safe_armor"));
-		PIGLIN_LOVED_NUGGETS = TagFactory.ITEM.create(id("piglin_loved_nuggets"));
-		PIGLIN_BARTERING_ITEMS = TagFactory.ITEM.create(id("piglin_bartering_items"));
+		// NO-OP
 	}
 }
diff --git a/src/main/java/com/shnupbups/piglib/rei/PiglibClientPlugin.java b/src/main/java/com/shnupbups/piglib/rei/PiglibClientPlugin.java
@@ -4,9 +4,12 @@
 
 import com.google.common.collect.Lists;
 
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.tag.ItemTags;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.RegistryEntry;
 
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.client.registry.category.CategoryRegistry;
@@ -46,15 +49,15 @@ public void registerCategories(CategoryRegistry registry) {
 
 	@Override
 	public void registerDisplays(DisplayRegistry registry) {
-		registry.add(new BarteringDisplay(CollectionUtils.map(Lists.newArrayList(Piglib.PIGLIN_BARTERING_ITEMS.values()), ItemStack::new)));
+		registry.add(new BarteringDisplay(CollectionUtils.map(Lists.newArrayList(Registry.ITEM.getOrCreateEntryList(Piglib.PIGLIN_BARTERING_ITEMS).stream().iterator()), ItemStack::new)));
 		registry.add(new PiglinLovedDisplay(getPiglinLovedStacks()));
-		registry.add(new PiglinSafeArmorDisplay(CollectionUtils.map(Lists.newArrayList(Piglib.PIGLIN_SAFE_ARMOR.values()), ItemStack::new)));
-		registry.add(new PiglinRepellentsDisplay(CollectionUtils.map(Lists.newArrayList(ItemTags.PIGLIN_REPELLENTS.values()), ItemStack::new)));
+		registry.add(new PiglinSafeArmorDisplay(CollectionUtils.map(Lists.newArrayList(Registry.ITEM.getOrCreateEntryList(Piglib.PIGLIN_SAFE_ARMOR).stream().iterator()), ItemStack::new)));
+		registry.add(new PiglinRepellentsDisplay(CollectionUtils.map(Lists.newArrayList(Registry.ITEM.getOrCreateEntryList(ItemTags.PIGLIN_REPELLENTS).stream().iterator()), ItemStack::new)));
 	}
 
 	public List<ItemStack> getPiglinLovedStacks() {
-		List<ItemStack> list = CollectionUtils.map(Lists.newArrayList(ItemTags.PIGLIN_LOVED.values()), ItemStack::new);
-		list.addAll(CollectionUtils.map(Lists.newArrayList(Piglib.PIGLIN_LOVED_NUGGETS.values()), (item) -> new ItemStack(item, 64)));
+		List<ItemStack> list = CollectionUtils.map(Lists.newArrayList(Registry.ITEM.getOrCreateEntryList(ItemTags.PIGLIN_LOVED).stream().iterator()), ItemStack::new);
+		list.addAll(CollectionUtils.map(Lists.newArrayList(Registry.ITEM.getOrCreateEntryList(Piglib.PIGLIN_LOVED_NUGGETS).stream().iterator()), (entry) -> new ItemStack(entry.value(), 64)));
 		return list;
 	}
 }