Update Neo and adjust for the breaking changes

Author: pupnewfster

gradle.properties

@@ -8,11 +8,11 @@ minecraft_version=1.20.5
 previous_minecraft_version=1.20.1
 previous_minor_minecraft_version=1.20.4
 loader_version_range=[2,)
-forge_version=20.5.3-beta
+forge_version=20.5.16-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.1-beta,)
+forge_version_range=[20.5.14-beta,)
 minecraft_version_range=[1.20.5]
 #This specifies what type of release it will be uploaded to CurseForge and Modrinth as
 # options are: alpha, beta, release

src/additions/java/mekanism/additions/common/block/plastic/BlockPlasticStairs.java

@@ -29,7 +29,7 @@ public class BlockPlasticStairs extends StairBlock implements IColoredBlock, ISt
     private final EnumColor color;
 
     public BlockPlasticStairs(IBlockProvider blockProvider, EnumColor color, UnaryOperator<Properties> propertyModifier) {
-        super(blockProvider::defaultState, BlockStateHelper.applyLightLevelAdjustments(propertyModifier.apply(BlockBehaviour.Properties.of()
+        super(blockProvider.defaultState(), BlockStateHelper.applyLightLevelAdjustments(propertyModifier.apply(BlockBehaviour.Properties.of()
               .mapColor(color.getMapColor()).strength(5, 6))));
         this.color = color;
         //Uses getDefaultState as starting state to take into account the stuff from super

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

@@ -5,6 +5,7 @@
 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;
@@ -16,6 +17,7 @@
 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;
@@ -25,6 +27,9 @@
 
 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;
 
@@ -53,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 && block.getFluid().getFluidType() instanceof MekanismFluidType fluidType) {
+            if (blockEntry.value() instanceof LiquidBlock block && FLUID.getValue(block).getFluidType() instanceof MekanismFluidType fluidType) {
                 simpleBlock(block, models().getBuilder(RegistryUtils.getPath(block)).texture(DataGenJsonConstants.PARTICLE, fluidType.stillTexture));
             }
         }

src/main/java/mekanism/client/ClientTickHandler.java

@@ -57,12 +57,11 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.material.FogType;
 import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.client.event.InputEvent.MouseScrollingEvent;
 import net.neoforged.neoforge.client.event.RecipesUpdatedEvent;
 import net.neoforged.neoforge.client.event.RenderLivingEvent;
 import net.neoforged.neoforge.client.event.ViewportEvent;
-import net.neoforged.neoforge.event.TickEvent.ClientTickEvent;
-import net.neoforged.neoforge.event.TickEvent.Phase;
 import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent;
 
 /**
@@ -141,13 +140,7 @@ public void onStartTracking(EntityJoinLevelEvent event) {
     }
 
     @SubscribeEvent
-    public void onTick(ClientTickEvent event) {
-        if (event.phase == Phase.START) {
-            tickStart();
-        }
-    }
-
-    public void tickStart() {
+    public void onTick(ClientTickEvent.Pre event) {
         if (firstTick && minecraft.level != null) {
             MekanismClient.launchClient();
             firstTick = false;

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

@@ -61,12 +61,10 @@ 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 liquidBlock) {
-                    fluid = liquidBlock.getFluid();
+                if (state.getBlock() instanceof LiquidBlock || state.getBlock() instanceof BubbleColumnBlock) {
+                    fluid = level.getFluidState(p).getType();
                 } 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/client/render/RenderTickHandler.java

@@ -81,6 +81,7 @@
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.client.ClientHooks;
+import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.client.event.RenderArmEvent;
 import net.neoforged.neoforge.client.event.RenderGuiLayerEvent;
 import net.neoforged.neoforge.client.event.RenderHighlightEvent;
@@ -90,8 +91,6 @@
 import net.neoforged.neoforge.client.gui.VanillaGuiLayers;
 import net.neoforged.neoforge.client.model.data.ModelData;
 import net.neoforged.neoforge.common.util.Lazy;
-import net.neoforged.neoforge.event.TickEvent.ClientTickEvent;
-import net.neoforged.neoforge.event.TickEvent.Phase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix3f;
@@ -223,81 +222,79 @@ public void renderArm(RenderArmEvent event) {
     }
 
     @SubscribeEvent
-    public void tickEnd(ClientTickEvent event) {
-        if (event.phase == Phase.END) {
-            //Note: We check that the game mode is not null as if it is that means the world is unloading, and we don't actually want to be rendering
-            // as our data may be out of date or invalid. For example configs could unload while it is still unloading
-            if (minecraft.player != null && minecraft.player.level() != null && !minecraft.isPaused() && minecraft.gameMode != null) {
-                Player player = minecraft.player;
-                Level world = minecraft.player.level();
-                //Traverse active jetpacks and do animations
-                for (UUID uuid : Mekanism.playerState.getActiveJetpacks()) {
-                    Player p = world.getPlayerByUUID(uuid);
-                    if (p != null) {
-                        Pos3D playerPos = new Pos3D(p).translate(0, p.getEyeHeight(), 0);
-                        Vec3 playerMotion = p.getDeltaMovement();
-                        float random = (world.random.nextFloat() - 0.5F) * 0.1F;
-                        //This positioning code is somewhat cursed, but it seems to be mostly working and entity pose code seems cursed in general
-                        float xRot;
-                        if (p.isCrouching()) {
-                            xRot = 20;
-                            playerPos = playerPos.translate(0, 0.125, 0);
+    public void tickEnd(ClientTickEvent.Post event) {
+        //Note: We check that the game mode is not null as if it is that means the world is unloading, and we don't actually want to be rendering
+        // as our data may be out of date or invalid. For example configs could unload while it is still unloading
+        if (minecraft.player != null && minecraft.player.level() != null && !minecraft.isPaused() && minecraft.gameMode != null) {
+            Player player = minecraft.player;
+            Level world = minecraft.player.level();
+            //Traverse active jetpacks and do animations
+            for (UUID uuid : Mekanism.playerState.getActiveJetpacks()) {
+                Player p = world.getPlayerByUUID(uuid);
+                if (p != null) {
+                    Pos3D playerPos = new Pos3D(p).translate(0, p.getEyeHeight(), 0);
+                    Vec3 playerMotion = p.getDeltaMovement();
+                    float random = (world.random.nextFloat() - 0.5F) * 0.1F;
+                    //This positioning code is somewhat cursed, but it seems to be mostly working and entity pose code seems cursed in general
+                    float xRot;
+                    if (p.isCrouching()) {
+                        xRot = 20;
+                        playerPos = playerPos.translate(0, 0.125, 0);
+                    } else {
+                        float f = p.getSwimAmount(minecraft.getPartialTick());
+                        if (p.isFallFlying()) {
+                            float f1 = (float) p.getFallFlyingTicks() + minecraft.getPartialTick();
+                            float f2 = Mth.clamp(f1 * f1 / 100.0F, 0.0F, 1.0F);
+                            xRot = f2 * (-90.0F - p.getXRot());
                         } else {
-                            float f = p.getSwimAmount(minecraft.getPartialTick());
-                            if (p.isFallFlying()) {
-                                float f1 = (float) p.getFallFlyingTicks() + minecraft.getPartialTick();
-                                float f2 = Mth.clamp(f1 * f1 / 100.0F, 0.0F, 1.0F);
-                                xRot = f2 * (-90.0F - p.getXRot());
-                            } else {
-                                float f3 = p.isInWater() ? -90.0F - p.getXRot() : -90.0F;
-                                xRot = Mth.lerp(f, 0.0F, f3);
-                            }
-                            xRot = -xRot;
-                            Pos3D eyeAdjustments;
-                            if (p.isFallFlying() && (p != player || !minecraft.options.getCameraType().isFirstPerson())) {
-                                eyeAdjustments = new Pos3D(0, p.getEyeHeight(Pose.STANDING), 0).xRot(xRot).yRot(p.yBodyRot);
-                            } else if (p.isVisuallySwimming()) {
-                                eyeAdjustments = new Pos3D(0, p.getEyeHeight(), 0).xRot(xRot).yRot(p.yBodyRot).translate(0, 0.5, 0);
-                            } else {
-                                eyeAdjustments = new Pos3D(0, p.getEyeHeight(), 0).xRot(xRot).yRot(p.yBodyRot);
-                            }
-                            playerPos = new Pos3D(p.getX() + eyeAdjustments.x, p.getY() + eyeAdjustments.y, p.getZ() + eyeAdjustments.z);
+                            float f3 = p.isInWater() ? -90.0F - p.getXRot() : -90.0F;
+                            xRot = Mth.lerp(f, 0.0F, f3);
+                        }
+                        xRot = -xRot;
+                        Pos3D eyeAdjustments;
+                        if (p.isFallFlying() && (p != player || !minecraft.options.getCameraType().isFirstPerson())) {
+                            eyeAdjustments = new Pos3D(0, p.getEyeHeight(Pose.STANDING), 0).xRot(xRot).yRot(p.yBodyRot);
+                        } else if (p.isVisuallySwimming()) {
+                            eyeAdjustments = new Pos3D(0, p.getEyeHeight(), 0).xRot(xRot).yRot(p.yBodyRot).translate(0, 0.5, 0);
+                        } else {
+                            eyeAdjustments = new Pos3D(0, p.getEyeHeight(), 0).xRot(xRot).yRot(p.yBodyRot);
                         }
-                        Pos3D vLeft = new Pos3D(-0.43, -0.55, -0.54).xRot(xRot).yRot(p.yBodyRot);
-                        renderJetpackSmoke(world, playerPos.translate(vLeft, playerMotion), vLeft.scale(0.2).translate(playerMotion, vLeft.scale(random)));
-                        Pos3D vRight = new Pos3D(0.43, -0.55, -0.54).xRot(xRot).yRot(p.yBodyRot);
-                        renderJetpackSmoke(world, playerPos.translate(vRight, playerMotion), vRight.scale(0.2).translate(playerMotion, vRight.scale(random)));
-                        Pos3D vCenter = new Pos3D((world.random.nextFloat() - 0.5) * 0.4, -0.86, -0.30).xRot(xRot).yRot(p.yBodyRot);
-                        renderJetpackSmoke(world, playerPos.translate(vCenter, playerMotion), vCenter.scale(0.2).translate(playerMotion));
+                        playerPos = new Pos3D(p.getX() + eyeAdjustments.x, p.getY() + eyeAdjustments.y, p.getZ() + eyeAdjustments.z);
                     }
+                    Pos3D vLeft = new Pos3D(-0.43, -0.55, -0.54).xRot(xRot).yRot(p.yBodyRot);
+                    renderJetpackSmoke(world, playerPos.translate(vLeft, playerMotion), vLeft.scale(0.2).translate(playerMotion, vLeft.scale(random)));
+                    Pos3D vRight = new Pos3D(0.43, -0.55, -0.54).xRot(xRot).yRot(p.yBodyRot);
+                    renderJetpackSmoke(world, playerPos.translate(vRight, playerMotion), vRight.scale(0.2).translate(playerMotion, vRight.scale(random)));
+                    Pos3D vCenter = new Pos3D((world.random.nextFloat() - 0.5) * 0.4, -0.86, -0.30).xRot(xRot).yRot(p.yBodyRot);
+                    renderJetpackSmoke(world, playerPos.translate(vCenter, playerMotion), vCenter.scale(0.2).translate(playerMotion));
                 }
+            }
 
-                if (world.getGameTime() % 4 == 0) {
-                    //Traverse active scuba masks and do animations
-                    for (UUID uuid : Mekanism.playerState.getActiveScubaMasks()) {
-                        Player p = world.getPlayerByUUID(uuid);
-                        if (p != null && p.isInWater()) {
-                            Pos3D vec = new Pos3D(0.4, 0.4, 0.4).multiply(p.getViewVector(1)).translate(0, -0.2, 0);
-                            Pos3D motion = vec.scale(0.2).translate(p.getDeltaMovement());
-                            Pos3D v = new Pos3D(p).translate(0, p.getEyeHeight(), 0).translate(vec);
-                            world.addParticle(MekanismParticleTypes.SCUBA_BUBBLE.get(), v.x, v.y, v.z, motion.x, motion.y + 0.2, motion.z);
-                        }
+            if (world.getGameTime() % 4 == 0) {
+                //Traverse active scuba masks and do animations
+                for (UUID uuid : Mekanism.playerState.getActiveScubaMasks()) {
+                    Player p = world.getPlayerByUUID(uuid);
+                    if (p != null && p.isInWater()) {
+                        Pos3D vec = new Pos3D(0.4, 0.4, 0.4).multiply(p.getViewVector(1)).translate(0, -0.2, 0);
+                        Pos3D motion = vec.scale(0.2).translate(p.getDeltaMovement());
+                        Pos3D v = new Pos3D(p).translate(0, p.getEyeHeight(), 0).translate(vec);
+                        world.addParticle(MekanismParticleTypes.SCUBA_BUBBLE.get(), v.x, v.y, v.z, motion.x, motion.y + 0.2, motion.z);
                     }
-                    //Traverse players and do animations for idle flamethrowers
-                    for (Player p : world.players()) {
-                        if (!p.swinging) {
-                            if (player.isUsingItem()) {
-                                InteractionHand usedHand = player.getUsedItemHand();
-                                if (!(player.getItemInHand(usedHand).getItem() instanceof ItemFlamethrower)) {
-                                    //If we the used item isn't a flamethrower, grab the other hand's item for checks
-                                    // if it was an active flamethrower we just skip adding the idle particles
-                                    tryAddIdleFlamethrowerParticles(minecraft, p, usedHand == InteractionHand.MAIN_HAND ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND);
-                                }
-                            } else if (!tryAddIdleFlamethrowerParticles(minecraft, p, InteractionHand.MAIN_HAND)) {
-                                //If the player isn't using an item, try to first add particles for a flamethrower in the main hand
-                                // and then add particles for a flamethrower in the offhand if we failed
-                                tryAddIdleFlamethrowerParticles(minecraft, p, InteractionHand.OFF_HAND);
+                }
+                //Traverse players and do animations for idle flamethrowers
+                for (Player p : world.players()) {
+                    if (!p.swinging) {
+                        if (player.isUsingItem()) {
+                            InteractionHand usedHand = player.getUsedItemHand();
+                            if (!(player.getItemInHand(usedHand).getItem() instanceof ItemFlamethrower)) {
+                                //If we the used item isn't a flamethrower, grab the other hand's item for checks
+                                // if it was an active flamethrower we just skip adding the idle particles
+                                tryAddIdleFlamethrowerParticles(minecraft, p, usedHand == InteractionHand.MAIN_HAND ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND);
                             }
+                        } else if (!tryAddIdleFlamethrowerParticles(minecraft, p, InteractionHand.MAIN_HAND)) {
+                            //If the player isn't using an item, try to first add particles for a flamethrower in the main hand
+                            // and then add particles for a flamethrower in the offhand if we failed
+                            tryAddIdleFlamethrowerParticles(minecraft, p, InteractionHand.OFF_HAND);
                         }
                     }
                 }

src/main/java/mekanism/common/CommonPlayerTickHandler.java

@@ -46,13 +46,12 @@
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.common.NeoForgeMod;
-import net.neoforged.neoforge.event.TickEvent.Phase;
-import net.neoforged.neoforge.event.TickEvent.PlayerTickEvent;
 import net.neoforged.neoforge.event.entity.living.LivingAttackEvent;
 import net.neoforged.neoforge.event.entity.living.LivingEvent.LivingJumpEvent;
 import net.neoforged.neoforge.event.entity.living.LivingFallEvent;
 import net.neoforged.neoforge.event.entity.living.LivingHurtEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent.BreakSpeed;
+import net.neoforged.neoforge.event.tick.PlayerTickEvent;
 import org.jetbrains.annotations.Nullable;
 
 public class CommonPlayerTickHandler {
@@ -92,9 +91,9 @@ public static float getSwimBoost(Player player) {
     }
 
     @SubscribeEvent
-    public void onTick(PlayerTickEvent event) {
-        if (event.phase == Phase.END && event.side.isServer()) {
-            tickEnd(event.player);
+    public void onTick(PlayerTickEvent.Post event) {
+        if (!event.getEntity().level().isClientSide()) {
+            tickEnd(event.getEntity());
         }
     }