Update Forge to 1.17.1 RB

- Update Forge to 37.1.0, Parchment to 2021.10.31
- Update mods.toml to lock this release to Forge 37.x since
  38.x contains refactoring that will break this mod in 1.18
- Update constant value locations to remove deprecated references.
- Fully qualify `net.minecraft.tags.Tag` in javadocs to prevent
  collision with `net.minecraft.nbt.Tag`. Thanks Mojang for identically
  naming two separate classes that could so easily collide.
- Remove redundant finals from a couple of declarations.

Signed-off-by: srs-bsns <[email protected]>

gradle.properties

@@ -1,6 +1,6 @@
 vendor = srsCode
 
 mc_version        = 1.17.1
-forge_version     = 37.0.59
-parchment_version = 2021.08.29-1.17.1
+forge_version     = 37.1.0
+parchment_version = 2021.10.31-1.17.1
 mixinAP_version   = 0.8.4

src/main/java/srscode/fallthru/BlockConfigMap.java

@@ -53,14 +53,13 @@
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.Tag;
 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.material.Material;
 
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.registries.ForgeRegistries;
 
@@ -201,7 +200,7 @@ void fromNBT(final CompoundTag blocklist)
     {
         addAll(
             blocklist
-                .getList(NBT_CONFIG_TAG, Constants.NBT.TAG_COMPOUND)
+                .getList(NBT_CONFIG_TAG, Tag.TAG_COMPOUND)
                 .stream()
                 .map(CompoundTag.class::cast)
                 .map(BlockConfig::fromNBT)
@@ -307,7 +306,7 @@ private static int getHash(@Nonnull final Block block)
      * A class to store the configuration of passable blocks.
      * With the exception of the {@link Block} referenced, all of the class members are immutable.
      */
-    public final record BlockConfig(@Nonnull Block block, double speedMult, double damageMult, boolean allowNative, boolean hasCollision, boolean canOcclude)
+    public record BlockConfig(@Nonnull Block block, double speedMult, double damageMult, boolean allowNative, boolean hasCollision, boolean canOcclude)
     {
         public BlockConfig
         {
@@ -316,7 +315,7 @@ public final record BlockConfig(@Nonnull Block block, double speedMult, double d
 
         /**
          * An enum for discerning if a configuration string from {@link CommonConfig#passableBlocks}
-         * is for a {@link Tag} or a {@link Block}.
+         * is for a {@link net.minecraft.tags.Tag} or a {@link Block}.
          */
         enum ItemType
         {
@@ -370,9 +369,9 @@ static BlockConfig.ItemType get(final String type)
         };
 
         /**
-         * A {@link Comparator} to sort the config strings so that all {@link Tag} entries are processed before {@link Block}
-         * entries, so that if a Block entry is also the member of a Tag entry, the singular Block entry will take precedence
-         * and override the Tag entry. This is so that users can special-case some blocks if they want to.
+         * A {@link Comparator} to sort the config strings so that all {@link net.minecraft.tags.Tag} entries are processed before {@link Block}
+         * entries, so that if a Block entry is also the member of a BlockTag, the singular Block entry will take precedence
+         * and override the BlockTag entry. This is so that users can special-case some blocks if they want to.
          */
         static final Comparator<String> CFGSTR_SORTER = (cfgstr1, cfgstr2) -> {
             final var pattern = Pattern.compile("^\\s*" + BlockConfig.PATTERN_ITEMTYPE + "\\/\\w.*$", Pattern.CASE_INSENSITIVE);
@@ -435,7 +434,7 @@ static BlockConfig.ItemType get(final String type)
                         })
                         .collect(Collectors.toSet());
                     if (tagBlocks.isEmpty()) {
-                        FallThru.LOGGER.error(MARKER_BLOCKCFG, "Could not find any blocks for Tag, or Tag does not exist: {}", resloc);
+                        FallThru.LOGGER.error(MARKER_BLOCKCFG, "Could not find any blocks for BlockTag, or BlockTag does not exist: {}", resloc);
                     }
                     blocks.addAll(tagBlocks);
                 }

src/main/java/srscode/fallthru/S2CFallThruUpdatePacket.java

@@ -72,7 +72,7 @@ static S2CFallThruUpdatePacket decode(final FriendlyByteBuf input)
      *
      * @param output The {@link FriendlyByteBuf} to write the serialized BlockConfigMap to.
      */
-    final void encode(final FriendlyByteBuf output)
+    void encode(final FriendlyByteBuf output)
     {
         output.writeNbt(configBlocks);
     }

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

@@ -1,5 +1,5 @@
 modLoader       = "javafml"
-loaderVersion   = "[37,)"
+loaderVersion   = "[37,38)"
 license         = "MIT License"
 issueTrackerURL = "https://github.com/srscode/FallThru/issues/"
 
@@ -21,13 +21,13 @@ The configuration is versatile and each block can be configured individually.
 [[dependencies.fallthru]]
 modId           = "forge"
 mandatory       = true
-versionRange    = "[37.0.59,)" # 37.0.59 is the minimum version for Mixin
+versionRange    = "[37.0.59,38)" # 37.0.59 is the minimum version for Mixin, 38.x contains breaking refactors
 ordering        = "NONE"
 side            = "BOTH"
 
 [[dependencies.fallthru]]
 modId           = "minecraft"
 mandatory       = true
-versionRange    = "[1.17.1,)"
+versionRange    = "[1.17.1,1.18)"
 ordering        = "NONE"
 side            = "BOTH"