Update to 1.20.6 and rename 1.20.5 branch to 1.20.6 as they are basically the same except for neo changes

Author: pupnewfster

.github/workflows/codeql.yml

@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "1.20.5" ]
+    branches: [ "1.20.6" ]
   pull_request:
-    branches: [ "1.20.5" ]
+    branches: [ "1.20.6" ]
     types:
       - synchronize
       - opened

.github/workflows/gametests.yml

@@ -2,9 +2,9 @@ name: "Run Game Tests"
 
 on:
   push:
-    branches: [ "1.20.5" ]
+    branches: [ "1.20.6" ]
   pull_request:
-    branches: [ "1.20.5" ]
+    branches: [ "1.20.6" ]
     types:
       - synchronize
       - opened

build.gradle

@@ -18,7 +18,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.116'//https://projects.neoforged.net/neoforged/neogradle
+    id 'net.neoforged.gradle.userdev' version '7.0.119'//https://projects.neoforged.net/neoforged/neogradle
 }
 
 tasks.named('wrapper', Wrapper).configure {

docs/Development.md

@@ -1,6 +1,6 @@
 # Development
 
-Mekanism is developed for Minecraft 1.20.5 using NeoForge.
+Mekanism is developed for Minecraft 1.20.6 using NeoForge.
 
 ## Prerequisites
 

gradle.properties

@@ -3,17 +3,17 @@
 org.gradle.jvmargs=-Xmx4G
 
 java_version=21
-minecraft_version=1.20.5
+minecraft_version=1.20.6
 #Used as a helper for porting when deps we use have not updated yet
 previous_minecraft_version=1.20.1
 previous_minor_minecraft_version=1.20.4
 loader_version_range=[2,)
-forge_version=20.5.16-beta
+forge_version=20.6.18-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.5.21-beta,)
-minecraft_version_range=[1.20.5]
+forge_version_range=[20.6.18-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
 release_type=beta

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

@@ -58,7 +58,7 @@ protected VariantBlockStateBuilder getVariantBuilder(IBlockProvider blockProvide
     protected void registerFluidBlockStates(FluidDeferredRegister register) {
         for (Holder<Block> blockEntry : register.getBlockEntries()) {
             //Note: We expect this to always be the case
-            if (blockEntry.value() instanceof LiquidBlock block && FLUID.getValue(block).getFluidType() instanceof MekanismFluidType fluidType) {
+            if (blockEntry.value() instanceof LiquidBlock block && block.fluid.getFluidType() instanceof MekanismFluidType fluidType) {
                 simpleBlock(block, models().getBuilder(RegistryUtils.getPath(block)).texture(DataGenJsonConstants.PARTICLE, fluidType.stillTexture));
             }
         }

src/main/java/mekanism/client/gui/item/GuiSeismicReader.java

@@ -61,10 +61,12 @@ public GuiSeismicReader(SeismicReaderContainer container, Inventory inv, Compone
             ItemStack stack = state.getCloneItemStack(new BlockHitResult(p.getCenter().relative(Direction.UP, 0.5), Direction.UP, p, false), level, p, player);
             if (stack.isEmpty()) {
                 Fluid fluid = Fluids.EMPTY;
-                if (state.getBlock() instanceof LiquidBlock || state.getBlock() instanceof BubbleColumnBlock) {
-                    fluid = level.getFluidState(p).getType();
+                if (state.getBlock() instanceof LiquidBlock liquidBlock) {
+                    fluid = liquidBlock.fluid;
                 } else if (state.getBlock() instanceof IFluidBlock fluidBlock) {
                     fluid = fluidBlock.getFluid();
+                } else if (state.getBlock() instanceof BubbleColumnBlock) {
+                    fluid = level.getFluidState(p).getType();
                 }
                 if (fluid == Fluids.EMPTY) {
                     blockList.add(new BlockInfo<>(state, state, null));

src/main/java/mekanism/common/item/block/machine/ItemBlockFluidTank.java

@@ -16,7 +16,6 @@
 import mekanism.common.block.basic.BlockFluidTank;
 import mekanism.common.block.prefab.BlockTile;
 import mekanism.common.capabilities.Capabilities;
-import mekanism.common.item.ItemConfigurator.ConfiguratorMode;
 import mekanism.common.item.block.ItemBlockTooltip;
 import mekanism.common.item.interfaces.IModeItem.IAttachmentBasedModeItem;
 import mekanism.common.lib.security.ItemSecurityUtils;
@@ -215,7 +214,7 @@ public InteractionResultHolder<ItemStack> use(@NotNull Level world, Player playe
                                 return InteractionResultHolder.pass(stack);
                             } else if (pickedUpStack.getItem() instanceof BucketItem bucket) {
                                 //This isn't the best validation check given it may not return a bucket, but it is good enough for now
-                                fluid = bucket.getFluid();
+                                fluid = bucket.content;
                                 //Update the fluid stack in case something somehow changed about the type
                                 // making sure that we replace to heavy water if we got heavy water
                                 fluidStack = new FluidStack(fluid, FluidType.BUCKET_VOLUME);
@@ -357,7 +356,7 @@ public ItemStack execute(@NotNull BlockSource source, @NotNull ItemStack stack)
                             return super.execute(source, stack);
                         } else if (pickedUpStack.getItem() instanceof BucketItem bucket) {
                             //This isn't the best validation check given it may not return a bucket, but it is good enough for now
-                            fluid = bucket.getFluid();
+                            fluid = bucket.content;
                             //Update the fluid stack in case something somehow changed about the type
                             // making sure that we replace to heavy water if we got heavy water
                             fluidStack = new FluidStack(fluid, FluidType.BUCKET_VOLUME);

src/main/java/mekanism/common/lib/MekAnnotationScanner.java

@@ -19,7 +19,7 @@
 import mekanism.common.Mekanism;
 import mekanism.common.inventory.container.sync.dynamic.SyncMapper;
 import net.neoforged.fml.ModList;
-import net.neoforged.fml.loading.moddiscovery.ModAnnotation;
+import net.neoforged.fml.loading.modscan.ModAnnotation;
 import net.neoforged.neoforgespi.language.IModFileInfo;
 import net.neoforged.neoforgespi.language.ModFileScanData;
 import net.neoforged.neoforgespi.language.ModFileScanData.AnnotationData;

src/main/java/mekanism/common/tile/machine/TileEntityElectricPump.java

@@ -248,7 +248,7 @@ private boolean suck(BlockPos pos, boolean hasFilter, boolean addRecurring) {
                                 return false;
                             } else if (pickedUpStack.getItem() instanceof BucketItem bucket) {
                                 //This isn't the best validation check given it may not return a bucket, but it is good enough for now
-                                sourceFluid = bucket.getFluid();
+                                sourceFluid = bucket.content;
                                 //Update the fluid stack in case something somehow changed about the type
                                 // making sure that we replace to heavy water if we got heavy water
                                 fluidStack = getOutput(sourceFluid, hasFilter);