Address deprecation warnings

Author: glowredman

build.gradle

@@ -1,6 +1,5 @@
 buildscript {
     repositories {
-        // These repositories are only for Gradle plugins, put any other repositories in the repository block further below
         maven { url = 'https://maven.minecraftforge.net' }
         maven { url = 'https://maven.parchmentmc.org' }
         mavenCentral()
@@ -12,36 +11,20 @@ buildscript {
 }
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.parchmentmc.librarian.forgegradle'
-// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '0.9.1-beta'
-group = 'glowredman.modularmaterials' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+version = '0.9.2-beta'
+group = 'glowredman.modularmaterials'
 archivesBaseName = 'modularmaterials'
 
-// Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16.
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
-    // The mappings can be changed at any time and must be in the following format.
-    // Channel:   Version:
-    // snapshot   YYYYMMDD   Snapshot are built nightly.
-    // stable     #          Stables are built at the discretion of the MCP team.
-    // official   MCVersion  Official field/method names from Mojang mapping files
-    //
-    // You must be aware of the Mojang license when using the 'official' mappings.
-    // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
-    //
-    // Use non-default mappings at your own risk. They may not always work.
-    // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'parchment', version: '1.18.1-2022.03.06-1.18.2'
-
-    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
-
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
+    mappings channel: 'parchment', version: '2022.05.02-1.18.2'
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
+
     runs {
         client {
             workingDirectory project.file('run')
@@ -114,24 +97,12 @@ minecraft {
     }
 }
 
-// Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
-repositories {
-    // Put repositories for dependencies here
-    // ForgeGradle automatically adds the Forge maven and Maven Central for you
-
-    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
-    // flatDir {
-    //     dir 'libs'
-    // }
-}
+repositories {}
 
 dependencies {
-    // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.18.2-40.0.12'
+    minecraft 'net.minecraftforge:forge:1.18.2-40.1.16'
 
     // Real mod deobf dependency examples - these get remapped to your current mappings
     // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
@@ -146,13 +117,12 @@ dependencies {
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 }
 
-// Example for how to get properties into the manifest for reading at runtime.
 jar {
     manifest {
         attributes([
                 "Specification-Title"     : "modularmaterials",
                 "Specification-Vendor"    : "glowredman",
-                "Specification-Version"   : "1", // We are version 1 of ourselves
+                "Specification-Version"   : "2",
                 "Implementation-Title"    : project.name,
                 "Implementation-Version"  : project.jar.archiveVersion,
                 "Implementation-Vendor"   : "glowredman",

src/main/java/glowredman/modularmaterials/MM_Commands.java

@@ -14,6 +14,7 @@
 
 import glowredman.modularmaterials.data.PresetHandler;
 import glowredman.modularmaterials.data.legacy.LegacyHandler;
+import glowredman.modularmaterials.util.TagHelper;
 import net.minecraft.ChatFormatting;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
@@ -41,6 +42,7 @@
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fluids.FluidAttributes;
+import net.minecraftforge.registries.ForgeRegistries;
 
 public class MM_Commands {
 
@@ -99,12 +101,12 @@ private static int getInfo(CommandSourceStack commandSourceStack, BlockPos pos)
 		BlockState blockstate = level.getBlockState(pos);
 		Block block = blockstate.getBlock();
 		String blockRegName = block.getRegistryName().toString();
-		List<TagKey<Block>> blockTags = block.builtInRegistryHolder().tags().toList();
+		List<TagKey<Block>> blockTags = TagHelper.getTags(ForgeRegistries.BLOCKS, block);
 
 		FluidState fluidstate = level.getFluidState(pos);
 		Fluid fluid = fluidstate.getType();
 		String fluidRegName = fluid.getRegistryName().toString();
-		List<TagKey<Fluid>> fluidTags = fluid.builtInRegistryHolder().tags().toList();
+		List<TagKey<Fluid>> fluidTags = TagHelper.getTags(ForgeRegistries.FLUIDS, fluid);
 		FluidAttributes fluidAttributes = fluid.getAttributes();
 
 		commandSourceStack.sendSuccess(new TextComponent("Information for ").withStyle(ChatFormatting.GOLD)
@@ -117,7 +119,7 @@ private static int getInfo(CommandSourceStack commandSourceStack, BlockPos pos)
 				.append(copyable(biome.value().getRegistryName().toString())), false);
 
 		commandSourceStack.sendSuccess(new TextComponent("Biome Category: ").withStyle(ChatFormatting.BLUE)
-				.append(copyable(Biome.getBiomeCategory(biome).getName())), false);
+				.append(copyable(biome.value().getBiomeCategory().getName())), false);
 
 		commandSourceStack.sendSuccess(new TextComponent("Dimension: ").withStyle(ChatFormatting.BLUE)
 				.append(copyable(level.dimension().location().toString())), false);

src/main/java/glowredman/modularmaterials/block/BlockHandler.java

@@ -57,8 +57,8 @@ public void registerBlocks(Register<Block> event) {
                     String materialName = eMaterial.getKey();
                     MM_Material material = eMaterial.getValue();
                     if((material.enabled && material.enabledTypes.contains(typeName)) || MM_Reference.CONFIG.enableAll) {
-                        RegistryObject<MetaFluid> fluidS = RegistryObject.of(new ResourceLocation(MM_Reference.MODID, typeName + "." + materialName), ForgeRegistries.FLUIDS);
-                        RegistryObject<MetaFluid> fluidF = RegistryObject.of(new ResourceLocation(MM_Reference.MODID, "flowing_" + typeName + "." + materialName), ForgeRegistries.FLUIDS);
+                        RegistryObject<MetaFluid> fluidS = RegistryObject.create(new ResourceLocation(MM_Reference.MODID, typeName + "." + materialName), ForgeRegistries.FLUIDS);
+                        RegistryObject<MetaFluid> fluidF = RegistryObject.create(new ResourceLocation(MM_Reference.MODID, "flowing_" + typeName + "." + materialName), ForgeRegistries.FLUIDS);
 
                         FluidAttributes.Builder b = FluidAttributes.builder(
                                 new ResourceLocation(MM_Reference.MODID, "fluids/" + material.texture + "/" + typeName + "_still"),

src/main/java/glowredman/modularmaterials/block/MetaFluidBlock.java

@@ -6,6 +6,7 @@
 import glowredman.modularmaterials.data.object.MM_Material;
 import glowredman.modularmaterials.data.object.MM_Type;
 import glowredman.modularmaterials.fluid.MetaFluid;
+import glowredman.modularmaterials.util.TagHelper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.sounds.SoundEvent;
@@ -24,6 +25,7 @@
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraftforge.event.ForgeEventFactory;
+import net.minecraftforge.registries.ForgeRegistries;
 
 public class MetaFluidBlock extends LiquidBlock {
 
@@ -95,7 +97,7 @@ public void neighborChanged(BlockState pState, Level pLevel, BlockPos pPos, Bloc
 	}
 
 	private boolean shouldSpreadLiquid(Level pLevel, BlockPos pPos, BlockState pState) {
-		if (this.getFluid().is(FluidTags.LAVA)) {
+		if (TagHelper.hasTag(ForgeRegistries.FLUIDS, this.getFluid(), FluidTags.LAVA)) {
 			boolean flag = pLevel.getBlockState(pPos.below()).is(Blocks.SOUL_SOIL);
 
 			for (Direction direction : POSSIBLE_FLOW_DIRECTIONS) {

src/main/java/glowredman/modularmaterials/item/MetaBucketItem.java

@@ -7,6 +7,7 @@
 import glowredman.modularmaterials.MM_Reference;
 import glowredman.modularmaterials.data.object.MM_Material;
 import glowredman.modularmaterials.fluid.MetaFluid;
+import glowredman.modularmaterials.util.TagHelper;
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -44,6 +45,7 @@
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.event.ForgeEventFactory;
 import net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper;
+import net.minecraftforge.registries.ForgeRegistries;
 
 public class MetaBucketItem extends BucketItem {
 
@@ -176,7 +178,7 @@ public boolean emptyContents(Player pPlayer, Level pLevel, BlockPos pPos, BlockH
 		boolean flag1 = blockstate.isAir() || flag || block instanceof LiquidBlockContainer && ((LiquidBlockContainer) block).canPlaceLiquid(pLevel, pPos, blockstate, this.getFluid());
 		if (!flag1) {
 			return pResult != null && this.emptyContents(pPlayer, pLevel, pResult.getBlockPos().relative(pResult.getDirection()), (BlockHitResult) null);
-		} else if (pLevel.dimensionType().ultraWarm() && this.getFluid().is(FluidTags.WATER)) {
+		} else if (pLevel.dimensionType().ultraWarm() && TagHelper.hasTag(ForgeRegistries.FLUIDS, this.getFluid(), FluidTags.WATER)) {
 			int i = pPos.getX();
 			int j = pPos.getY();
 			int k = pPos.getZ();
@@ -208,7 +210,7 @@ public boolean emptyContents(Player pPlayer, Level pLevel, BlockPos pPos, BlockH
 	@Override
 	protected void playEmptySound(Player pPlayer, LevelAccessor pLevel, BlockPos pPos) {
 		SoundEvent soundevent = this.getFluid().getAttributes().getEmptySound();
-		if (soundevent == null) soundevent = this.getFluid().is(FluidTags.LAVA) ? SoundEvents.BUCKET_EMPTY_LAVA : SoundEvents.BUCKET_EMPTY;
+		if (soundevent == null) soundevent = TagHelper.hasTag(ForgeRegistries.FLUIDS, this.getFluid(), FluidTags.LAVA) ? SoundEvents.BUCKET_EMPTY_LAVA : SoundEvents.BUCKET_EMPTY;
 		pLevel.playSound(pPlayer, pPos, soundevent, SoundSource.BLOCKS, 1.0F, 1.0F);
 		pLevel.gameEvent(pPlayer, GameEvent.FLUID_PLACE, pPos);
 	}

src/main/java/glowredman/modularmaterials/util/TagHelper.java

@@ -0,0 +1,21 @@
+package glowredman.modularmaterials.util;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import net.minecraft.tags.TagKey;
+import net.minecraftforge.registries.IForgeRegistry;
+import net.minecraftforge.registries.IForgeRegistryEntry;
+import net.minecraftforge.registries.tags.IReverseTag;
+
+public class TagHelper {
+	
+	public static <T extends IForgeRegistryEntry<T>> List<TagKey<T>> getTags(IForgeRegistry<T> registry, T object) {
+		return registry.tags().getReverseTag(object).map(IReverseTag::getTagKeys).orElseGet(Stream::of).toList();
+	}
+	
+	public static <T extends IForgeRegistryEntry<T>> boolean hasTag(IForgeRegistry<T> registry, T object, TagKey<T> tag) {
+		return registry.tags().getTag(tag).contains(object);
+	}
+
+}

src/main/resources/META-INF/accesstransformer.cfg

@@ -0,0 +1 @@
+public net.minecraft.world.level.biome.Biome m_47567_()Lnet/minecraft/world/level/biome/Biome$BiomeCategory; # getBiomeCategory

src/main/resources/META-INF/mods.toml

@@ -41,7 +41,7 @@ description='''Dynamic and fully customizeable material-generation-system for Mi
     # Does this dependency have to exist - if not, ordering below must be specified
     mandatory=true #mandatory
     # The version range of the dependency
-    versionRange="[40.0.0,)" #mandatory
+    versionRange="[40.0.18,)" #mandatory
     # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
     ordering="NONE"
     # Side this dependency is applied on - BOTH, CLIENT or SERVER