Port to 1.18.2, many random fixes

Author: SizableShrimp

build.gradle

@@ -1,11 +1,8 @@
 buildscript {
     repositories {
         maven { url = 'https://maven.minecraftforge.net/' }
-        maven { url = 'https://repo.spongepowered.org/maven' }
-        mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
         classpath 'org.spongepowered:mixingradle:0.7.+'
     }
 }
@@ -14,14 +11,13 @@ plugins {
     id 'java'
     id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'net.minecraftforge.gradle' version '5.1.+'
+    id 'org.parchmentmc.librarian.forgegradle' version '1.+'
+    id 'org.spongepowered.mixin' version '0.7.+'
 }
-apply plugin: 'net.minecraftforge.gradle'
-// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
-apply plugin: 'org.spongepowered.mixin'
 
 version = project.mod_version
 group = project.maven_group
-archivesBaseName = "${project.archives_base_name}-${project.minecraft_version}"
 
 repositories {
     maven {
@@ -69,7 +65,7 @@ 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 {
-    mappings channel: 'official', version: snapshot
+    mappings channel: mappings_channel, version: mappings_version
 
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@@ -88,11 +84,6 @@ minecraft {
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
-            //args '--mixin', 'mixins.dsurround.json'
-            //args '--mixin', 'mixins.sndctrl.json'
-            //args '--mixin', 'mixins.mobeffects.json'
-            //args '--mixin', 'mixins.environs.json'
-
             mods {
                 dsurround {
                     source sourceSets.main
@@ -160,45 +151,20 @@ dependencies {
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
-    annotationProcessor 'org.spongepowered:mixin:0.8.4:processor'
-
-    // You may put jars on which you depend on in ./libs or you may define them like so..
-    // compile "some.group:artifact:version:classifier"
-    // compile "some.group:artifact:version"
-
-    // Real examples
-    // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
 
-    // These dependencies get remapped to your current MCP mappings
-    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    // implementation fg.deobf("curse.maven:SereneSeasons-291874:3621343")
+    implementation fg.deobf("me.shedaniel.cloth:cloth-config-forge:${cloth_config_version}")
 
-    // For more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
-    implementation fg.deobf("curse.maven:SereneSeasons-291874:3621343")
-    implementation fg.deobf("curse.maven:clothAPI-348521:3641133")
-
-    runtimeOnly fg.deobf("curse.maven:jei-238222:3723162")
-    runtimeOnly fg.deobf("curse.maven:TheOneProbe-245211:3665852")
+    runtimeOnly fg.deobf("curse.maven:jei-238222:${jei_file_id}")
+    runtimeOnly fg.deobf("curse.maven:the-one-probe-245211:${the_one_probe_file_id}")
 
     // Capability Syncer
     shadow fg.deobf("dev._100media.capabilitysyncer:capabilitysyncer:${capabilitysyncer_version}")
 }
 
-processResources {
-    duplicatesStrategy = DuplicatesStrategy.FAIL
-    filesMatching("META-INF/mods.toml") {
-        expand 'version': project.version
-    }
-}
-
 jar {
-
+    archiveClassifier = 'slim'
     from(configurations.embed.collect { it.isDirectory() ? it : zipTree(it) }) {
         exclude "LICENSE.txt", "META-INF/MANIFSET.MF", "META-INF/maven/**", "META-INF/*.RSA", "META-INF/*.SF"
     }
@@ -210,17 +176,15 @@ jar {
 
     manifest {
         attributes([
-                //"MixinConfigs": "mixins.dsurround.json,mixins.sndctrl.json,mixins.mobeffects.json,mixins.environs.json",
                 "Specification-Title": "${mod_id}",
                 "Specification-Vendor": "OreCruncher",
                 "Specification-Version": "1", // We are version 1 of ourselves
                 "Implementation-Title": project.name,
-                "Implementation-Version": "${version}",
+                "Implementation-Version": project.version,
                 "Implementation-Vendor" : "OreCruncher",
                 "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
-
 }
 
 def relocateTargets = ['dev._100media.capabilitysyncer']
@@ -233,9 +197,7 @@ shadowJar {
     finalizedBy 'reobfShadowJar'
 }
 
-artifacts {
-    shadowJar
-}
+assemble.dependsOn shadowJar
 
 reobf {
     shadowJar {}
@@ -252,6 +214,10 @@ jar.finalizedBy('reobfJar')
 // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
 // publish.dependsOn('reobfJar')
 
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+}
+
 publishing {
     publications {
         mavenJava(MavenPublication) {

configuration.gradle

@@ -2,15 +2,22 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-# Base Forge info
-minecraft_version=1.18.1
-forge_version=39.1.0
-snapshot=1.18.1
+
+# Base Forge Info
+minecraft_version=1.18.2
+forge_version=40.1.0
+mappings_channel=parchment
+mappings_version=2022.05.22-1.18.2
+
 # Mod Properties
 mod_id=dsurround
 mod_version=4.0.5.0
 maven_group=org.orecruncher
-archives_base_name=DynamicSurroundings
-updateurl=https://raw.githubusercontent.com/OreCruncher/DynamicSurroundings2/master/version.json
-capabilitysyncer_version=1.18.2-2.0.7
+mod_name=DynamicSurroundings
 
+# Dependencies
+mixin_version=0.8.5
+capabilitysyncer_version=1.18.2-2.0.7
+cloth_config_version=6.2.62
+jei_file_id=3723913
+the_one_probe_file_id=3671753

gradle.properties

@@ -0,0 +1,22 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name 'MinecraftForge'
+            url 'https://maven.minecraftforge.net/'
+        }
+        maven {
+            name 'ParchmentMC'
+            url 'https://maven.parchmentmc.org'
+        }
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.toString() == 'org.spongepowered.mixin') {
+                useModule("org.spongepowered:mixingradle:${requested.version}")
+            }
+        }
+    }
+}
+
+rootProject.name = mod_name

settings.gradle

@@ -48,7 +48,6 @@ public static void register(@Nonnull final CommandDispatcher<CommandSourceStack>
                 .then(Commands.literal("acoustics").executes(cmd -> dumpAcoustics(cmd.getSource())))
                 .then(Commands.literal("audioeffects").executes(cmd -> dumpAudioEffects(cmd.getSource())))
                 .then(Commands.literal("blocks").executes(cmd -> dumpBlocks(cmd.getSource())))
-                .then(Commands.literal("blocktags").executes(cmd -> dumpBlockTags(cmd.getSource())))
                 .then(Commands.literal("biomes").executes(cmd -> dumpBiomes(cmd.getSource())))
                 .then(Commands.literal("items").executes(cmd -> dumpItems(cmd.getSource())))
                 .then(Commands.literal("footsteps").executes(cmd -> dumpFootsteps(cmd.getSource())))
@@ -69,10 +68,6 @@ private static int dumpBlocks(@Nonnull final CommandSourceStack source) {
         return handle(source, "dump.blocks", DumpCommand::tbd);
     }
 
-    private static int dumpBlockTags(@Nonnull final CommandSourceStack source) {
-        return handle(source, "dump.blocktags", TagUtils::dumpBlockTags);
-    }
-
     private static int dumpBiomes(@Nonnull final CommandSourceStack source) {
         return handle(source, "dump.biomes", DumpCommand::tbd);
     }

src/main/java/org/orecruncher/dsurround/commands/dump/DumpCommand.java

@@ -60,7 +60,7 @@ public FogResult calculate(@Nonnull final EntityViewRenderEvent.RenderFogEvent e
         final BiomeManager biomemanager = world.getBiomeManager();
         final Vec3 origin = GameUtils.getMC().gameRenderer.getMainCamera().getPosition().subtract(2.0D, 2.0D, 2.0D).scale(0.25D);
         final Vec3 visibilitySurvey = CubicSampler.gaussianSampleVec3(origin, (x, y, z) -> {
-            final Biome b = biomemanager.getNoiseBiomeAtQuart(x, y, z);
+            final Biome b = biomemanager.getNoiseBiomeAtQuart(x, y, z).value();
             final BiomeInfo info = BiomeUtil.getBiomeData(b);
             return new Vec3(info.getVisibility(), 0, 0);
         });

src/main/java/org/orecruncher/environs/fog/BiomeFogRangeCalculator.java

@@ -21,10 +21,12 @@
 import com.google.gson.reflect.TypeToken;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import net.minecraft.core.BlockPos;
-import net.minecraft.data.worldgen.biome.Biomes;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.Biomes;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.dsurround.DynamicSurroundings;
@@ -125,7 +127,7 @@ static void initFromConfig(@Nonnull final List<BiomeConfig> cfg) {
 
 	@Nonnull
 	public static BiomeInfo getPlayerBiome(@Nonnull final Player player, final boolean getTrue) {
-		final Biome biome = player.getCommandSenderWorld().getBiome(new BlockPos(player.getX(), 0, player.getZ()));
+		final Biome biome = player.getCommandSenderWorld().getBiome(new BlockPos(player.getX(), 0, player.getZ())).value();
 		BiomeInfo info = BiomeUtil.getBiomeData(biome);
 
 		if (!getTrue) {
@@ -181,9 +183,10 @@ public void start() {
 				BiomeUtil.setBiomeData(b, new BiomeInfo(handler));
 			});
 
-			// Make sure the default biomes are set
-			BiomeUtil.getBiomeData(Biomes.PLAINS);
-			BiomeUtil.getBiomeData(Biomes.THE_VOID);
+            Registry<Biome> biomeRegistry = RegistryAccess.BUILTIN.get().registryOrThrow(Registry.BIOME_REGISTRY);
+            // Make sure the default biomes are set
+            BiomeUtil.getBiomeData(biomeRegistry.get(Biomes.PLAINS));
+            BiomeUtil.getBiomeData(biomeRegistry.get(Biomes.THE_VOID));
 
 			final Collection<IResourceAccessor> configs = ResourceUtils.findConfigs(DynamicSurroundings.MOD_ID, DynamicSurroundings.DATA_PATH, "biomes.json");
 
@@ -203,8 +206,9 @@ public void log() {
 		@Override
 		public void stop() {
 			ForgeUtils.getBiomes().forEach(b -> BiomeUtil.setBiomeData(b, null));
-			BiomeUtil.setBiomeData(Biomes.PLAINS, null);
-			BiomeUtil.setBiomeData(Biomes.THE_VOID, null);
+            Registry<Biome> biomeRegistry = RegistryAccess.BUILTIN.get().registryOrThrow(Registry.BIOME_REGISTRY);
+            BiomeUtil.setBiomeData(biomeRegistry.get(Biomes.PLAINS), null);
+            BiomeUtil.setBiomeData(biomeRegistry.get(Biomes.THE_VOID), null);
 		}
 	}
 

src/main/java/org/orecruncher/environs/library/BiomeLibrary.java

@@ -21,12 +21,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.gson.reflect.TypeToken;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.registries.tags.ITag;
 import org.apache.commons.lang3.StringUtils;
 import org.orecruncher.dsurround.DynamicSurroundings;
 import org.orecruncher.environs.Environs;
@@ -143,11 +143,9 @@ private static void register(@Nonnull final BlockConfig entry) {
     private static Collection<BlockStateMatcher> expand(@Nonnull final String blockName) {
         if (blockName.startsWith(TAG_SPECIFIER)) {
             final String tagName = blockName.substring(1);
-            final Tag<Block> tag = TagUtils.getBlockTag(tagName);
-            if (tag != null) {
-                return tag.getValues().stream().map(BlockStateMatcher::create).filter(m -> !m.isEmpty()).collect(Collectors.toList());
-            }
-            LOGGER.debug("Unknown block tag '%s' in Block specification", tagName);
+            final ITag<Block> tag = TagUtils.getBlockTag(tagName);
+
+            return tag.stream().map(BlockStateMatcher::create).filter(m -> !m.isEmpty()).collect(Collectors.toList());
         } else {
             final BlockStateMatcher matcher = BlockStateMatcher.create(blockName);
             if (!matcher.isEmpty()) {

src/main/java/org/orecruncher/environs/library/BlockStateLibrary.java

@@ -27,7 +27,7 @@
 
 import javax.annotation.Nonnull;
 
-@Mixin(targets = {"net.minecraft.client.particle.DripParticle$FallingLiquidParticle"})
+@Mixin(targets = {"net.minecraft.client.particle.DripParticle$FallAndLandParticle"})
 public class MixinDripParticleDripping {
 
     @Inject(method = "postMoveUpdate", at = @At("HEAD"))

src/main/java/org/orecruncher/environs/mixins/MixinDripParticleDripping.java

@@ -21,13 +21,15 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Vec3i;
 import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.Tags;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.tags.ITagManager;
 import org.orecruncher.environs.handlers.CommonState;
 import org.orecruncher.environs.library.DimensionInfo;
 import org.orecruncher.environs.library.DimensionLibrary;
@@ -54,7 +56,7 @@ public final class CeilingCoverage {
 	private static final float INSIDE_THRESHOLD = 1.0F - 65.0F / 176.0F;
 	private static final Cell[] cells;
 	private static final float TOTAL_POINTS;
-	private static final ObjectArray<Tag<Block>> NON_CEILING = new ObjectArray<>();
+	private static final ObjectArray<TagKey<Block>> NON_CEILING = new ObjectArray<>();
 
 	static {
 
@@ -176,8 +178,9 @@ private boolean actsAsCeiling(@Nonnull final BlockState state) {
 
 			// Test the block tags in our NON_CEILING set to see if any match
 			final Block block = state.getBlock();
-			for (final Tag<Block> tag : NON_CEILING) {
-				if (tag.contains(block))
+            ITagManager<Block> blockTags = ForgeRegistries.BLOCKS.tags();
+			for (final TagKey<Block> tagKey : NON_CEILING) {
+                if (blockTags.getTag(tagKey).contains(block))
 					return false;
 			}
 			return true;