Update deps and adjust to MC changes for looking at helpers

Author: pupnewfster

build.gradle

@@ -12,7 +12,7 @@ import java.util.function.Consumer
 
 plugins {
     id 'org.ajoberstar.grgit.service' version '5.2.2'
-    id 'net.darkhax.curseforgegradle' version '1.1.18'
+    id 'net.darkhax.curseforgegradle' version '1.1.23'
     id "com.modrinth.minotaur" version "2.+"
     id 'java'
     id 'eclipse'
@@ -479,13 +479,12 @@ dependencies {
     compileOnly("top.theillusivec4.curios:curios-neoforge:${curios_version}:api")
     compileOnly("com.blamejared.recipestages:RecipeStages:${recipe_stages_version}")
     compileOnly("curse.maven:opencomputers2-437654:${oc2_id}")
-    compileOnly("cc.tweaked:cc-tweaked-${previous_minor_minecraft_version}-forge-api:${cc_tweaked_version}")
+    compileOnly("cc.tweaked:cc-tweaked-1.20.5-forge-api:${cc_tweaked_version}")
     //localRuntime("cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cc_tweaked_version}")
     compileOnly("curse.maven:female-gender-forge-481655:${wildfire_gender_mod_id}")
 
     //Dependencies for data generators for mod compat reference
-    //TODO - 1.20.5: Switch back to datagenMainImplementation
-    datagenMainCompileOnly("appeng:appliedenergistics2-neoforge:${ae2_version}")
+    datagenMainImplementation("appeng:appliedenergistics2-neoforge:${ae2_version}")
     //TODO - 1.20.5: Switch back to datagenMainImplementation
     //datagenMainRuntimeOnly("com.github.glitchfiend:GlitchCore-neoforge:${previous_minor_minecraft_version}-${glitchcore_version}")
     //datagenMainRuntimeOnly("com.github.glitchfiend:TerraBlender-neoforge:${previous_minor_minecraft_version}-${terrablender_version}")

gradle.properties

@@ -8,11 +8,11 @@ minecraft_version=1.20.6
 previous_minecraft_version=1.20.1
 previous_minor_minecraft_version=1.20.4
 loader_version_range=[2,)
-forge_version=20.6.18-beta
+forge_version=20.6.22-beta
 mod_version=10.5.20
 #This determines the minimum version of forge required to use Mekanism
 # Only bump it whenever we need access to a feature in forge that is not available in earlier versions
-forge_version_range=[20.6.18-beta,)
+forge_version_range=[20.6.22-beta,)
 minecraft_version_range=[1.20.6]
 #This specifies what type of release it will be uploaded to CurseForge and Modrinth as
 # options are: alpha, beta, release
@@ -23,8 +23,8 @@ junit_version=5.10.2
 quicktheories_version=0.26
 
 #Parchment settings
-neogradle.subsystems.parchment.minecraftVersion=1.20.4
-neogradle.subsystems.parchment.mappingsVersion=2024.02.25
+neogradle.subsystems.parchment.minecraftVersion=1.20.6
+neogradle.subsystems.parchment.mappingsVersion=2024.05.01
 
 #misc settings
 # recipe viewer, currently accepts: jei, emi, hybrid
@@ -34,15 +34,12 @@ recipe_viewer=emi
 yamlops_version=1.2.0
 
 #Mod dependencies
-crafttweaker_version=17.0.3
-curios_version=7.3.4+1.20.4
+cc_tweaked_version=1.110.3
 emi_version=1.1.6
-jade_api_id=5111969
-jade_id=5109393
-jei_version=17.3.0.49
-json_things_version=0.10.0
-top_version=1.20.4_neo-11.0.1-2
-wthit_version=10.4.0
+jade_api_id=5288706
+jade_id=5288504
+top_version=1.20.5_neo-11.1.1-2
+wthit_version=11.1.3
 
 #Mod dependency min version ranges
 
@@ -51,25 +48,28 @@ wthit_version=10.4.0
 
 
 #Mod dependencies for recipes (only used by our data generators)
-ae2_version=17.12.0-beta
-biomesoplenty_version=19.0.0.71
-glitchcore_version=1.0.0.59
-terrablender_version=3.3.0.12
+ae2_version=18.1.1-alpha
 
 #Outdated mod dependencies
-cc_tweaked_version=1.110.0
+crafttweaker_version=17.0.3
+curios_version=7.4.0+1.20.4
 ctm_version=1.1.7+11
-flux_networks_id=4651164
+flux_networks_id=5234697
+jei_version=17.3.0.52
 jeitweaker_version=8.0.5
+json_things_version=0.10.0
 oc2_id=3896581
 projecte_api_id=4860862
 recipe_stages_version=8.0.0.1
 wildfire_gender_mod_id=4603538
 
 #Outdated mod dependencies for recipes
+biomesoplenty_version=19.0.0.89
 byg_id=5110925
 farmers_delight_id=5051242
+glitchcore_version=1.0.0.59
 ilikewood_id=4742845
 ilikewood_bop_id=4810696
 ilikewood_byg_id=4068511
 projecte_id=4860859
+terrablender_version=3.3.0.12

src/api/java/mekanism/api/chemical/ChemicalStack.java

@@ -30,7 +30,6 @@
 import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.codec.ByteBufCodecs;
@@ -545,18 +544,6 @@ public String getTranslationKey() {
         return getChemical().getTranslationKey();
     }
 
-    /**
-     * Writes this ChemicalStack to a Packet Buffer.
-     *
-     * @param buffer - Buffer to write to.
-     */
-    public void writeToPacket(FriendlyByteBuf buffer) {
-        buffer.writeById(getRegistry()::getId, getChemical());
-        if (!isEmpty()) {
-            buffer.writeVarLong(getAmount());
-        }
-    }
-
     /**
      * Checks if the two chemical stacks have the same chemical type. Ignores amount.
      *

src/api/java/mekanism/api/chemical/gas/GasStack.java

@@ -14,7 +14,6 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.world.item.ItemStack;
@@ -141,14 +140,6 @@ protected Gas getEmptyChemical() {
         return MekanismAPI.EMPTY_GAS;
     }
 
-    public static GasStack readFromPacket(FriendlyByteBuf buf) {
-        Gas gas = buf.readById(MekanismAPI.GAS_REGISTRY::byId);
-        if (gas == null || gas.isEmptyType()) {
-            return EMPTY;
-        }
-        return new GasStack(gas, buf.readVarLong());
-    }
-
     /**
      * Returns a copied form of this GasStack.
      *

src/api/java/mekanism/api/chemical/infuse/InfusionStack.java

@@ -14,7 +14,6 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.world.item.ItemStack;
@@ -136,14 +135,6 @@ protected InfuseType getEmptyChemical() {
         return MekanismAPI.EMPTY_INFUSE_TYPE;
     }
 
-    public static InfusionStack readFromPacket(FriendlyByteBuf buf) {
-        InfuseType infuseType = buf.readById(MekanismAPI.INFUSE_TYPE_REGISTRY::byId);
-        if (infuseType == null || infuseType.isEmptyType()) {
-            return EMPTY;
-        }
-        return new InfusionStack(infuseType, buf.readVarLong());
-    }
-
     /**
      * Returns a copied form of this InfusionStack.
      *

src/api/java/mekanism/api/chemical/pigment/PigmentStack.java

@@ -14,7 +14,6 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.world.item.ItemStack;
@@ -136,14 +135,6 @@ protected Pigment getEmptyChemical() {
         return MekanismAPI.EMPTY_PIGMENT;
     }
 
-    public static PigmentStack readFromPacket(FriendlyByteBuf buf) {
-        Pigment pigment = buf.readById(MekanismAPI.PIGMENT_REGISTRY::byId);
-        if (pigment == null || pigment.isEmptyType()) {
-            return EMPTY;
-        }
-        return new PigmentStack(pigment, buf.readVarLong());
-    }
-
     /**
      * Returns a copied form of this PigmentStack.
      *

src/api/java/mekanism/api/chemical/slurry/SlurryStack.java

@@ -14,7 +14,6 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.world.item.ItemStack;
@@ -136,14 +135,6 @@ protected Slurry getEmptyChemical() {
         return MekanismAPI.EMPTY_SLURRY;
     }
 
-    public static SlurryStack readFromPacket(FriendlyByteBuf buf) {
-        Slurry slurry = buf.readById(MekanismAPI.SLURRY_REGISTRY::byId);
-        if (slurry == null || slurry.isEmptyType()) {
-            return EMPTY;
-        }
-        return new SlurryStack(slurry, buf.readVarLong());
-    }
-
     /**
      * Returns a copied form of this SlurryStack.
      *

src/api/java/mekanism/api/math/FloatingLong.java

@@ -178,17 +178,6 @@ public static FloatingLong createConst(long value, short decimal) {
         return new FloatingLong(value, clampDecimal(decimal), true);
     }
 
-    /**
-     * Reads an immutable {@link FloatingLong} from a buffer
-     *
-     * @param buffer The {@link FriendlyByteBuf} to read from
-     *
-     * @return An immutable {@link FloatingLong}
-     */
-    public static FloatingLong readFromBuffer(FriendlyByteBuf buffer) {
-        return createConst(buffer.readVarLong(), buffer.readShort());
-    }
-
     private final boolean isConstant;
     private long value;
     private short decimal;
@@ -1082,16 +1071,6 @@ public FloatingLong absDifference(FloatingLong other) {
         return add(other);
     }
 
-    /**
-     * Writes this {@link FloatingLong} to the given buffer
-     *
-     * @param buffer The {@link FriendlyByteBuf} to write to.
-     */
-    public void writeToBuffer(FriendlyByteBuf buffer) {
-        buffer.writeVarLong(value);
-        buffer.writeShort(decimal);
-    }
-
     @Override
     public String toString() {
         return toString(DECIMAL_DIGITS);

src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java

@@ -623,10 +623,7 @@ private void addJade() {
         addJadeConfigTooltip(JadeConstants.TOOLTIP_RENDERER, "Jade tooltip renderer");
         addJadeConfigTooltip(LookingAtUtils.ENERGY, "Energy");
         addJadeConfigTooltip(LookingAtUtils.FLUID, "Fluid");
-        addJadeConfigTooltip(LookingAtUtils.GAS, "Gas");
-        addJadeConfigTooltip(LookingAtUtils.INFUSE_TYPE, "Infuse Type");
-        addJadeConfigTooltip(LookingAtUtils.PIGMENT, "Pigment");
-        addJadeConfigTooltip(LookingAtUtils.SLURRY, "Slurry");
+        addJadeConfigTooltip(LookingAtUtils.CHEMICAL, "Chemical");
     }
 
     private void addJadeConfigTooltip(ResourceLocation location, String value) {

src/datagen/main/java/mekanism/client/state/BaseBlockStateProvider.java

@@ -5,7 +5,6 @@
 import mekanism.api.providers.IBlockProvider;
 import mekanism.client.model.BaseBlockModelProvider;
 import mekanism.common.DataGenJsonConstants;
-import mekanism.common.lib.FieldReflectionHelper;
 import mekanism.common.registration.impl.FluidDeferredRegister;
 import mekanism.common.registration.impl.FluidDeferredRegister.MekanismFluidType;
 import mekanism.common.util.RegistryUtils;
@@ -17,7 +16,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.world.level.material.FlowingFluid;
 import net.neoforged.neoforge.client.model.generators.BlockStateProvider;
 import net.neoforged.neoforge.client.model.generators.ConfiguredModel;
 import net.neoforged.neoforge.client.model.generators.ModelFile;
@@ -27,9 +25,6 @@
 
 public abstract class BaseBlockStateProvider<PROVIDER extends BaseBlockModelProvider> extends BlockStateProvider {
 
-    //Note: We use reflection rather than an AT to help prevent accidentally using the field outside datagen
-    private static final FieldReflectionHelper<LiquidBlock, FlowingFluid> FLUID = new FieldReflectionHelper<>(LiquidBlock.class, "fluid", () -> null);
-
     private final String modid;
     private final PROVIDER modelProvider;