From aa275f08c3b8e5c2e6856a0ba8fdcc8407c94ddf Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Sun, 26 Nov 2023 21:23:43 +0100 Subject: [PATCH] Fixed game start --- .../viafabricplus/fixes/BlockFixes.java | 74 +++++++++++++++++++ .../viafabricplus/fixes/ClientsideFixes.java | 56 ++------------ 2 files changed, 80 insertions(+), 50 deletions(-) create mode 100644 src/main/java/de/florianmichael/viafabricplus/fixes/BlockFixes.java diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/BlockFixes.java b/src/main/java/de/florianmichael/viafabricplus/fixes/BlockFixes.java new file mode 100644 index 00000000..d8cfb6fe --- /dev/null +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/BlockFixes.java @@ -0,0 +1,74 @@ +/* + * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus + * Copyright (C) 2021-2023 FlorianMichael/EnZaXD + * Copyright (C) 2023 RK_01/RaphiMC and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package de.florianmichael.viafabricplus.fixes; + +import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback; +import net.minecraft.block.*; +import net.minecraft.client.MinecraftClient; +import net.minecraft.registry.Registries; +import net.raphimc.vialoader.util.VersionEnum; + +public class BlockFixes { + + private static final float DEFAULT_SOUL_SAND_VELOCITY_MULTIPLIER = Blocks.SOUL_SAND.getVelocityMultiplier(); + private static final float _1_14_4_SOUL_SAND_VELOCITY_MULTIPLIER = 1F; + + public static void init() { + ChangeProtocolVersionCallback.EVENT.register((oldVersion, newVersion) -> MinecraftClient.getInstance().execute(() -> { + // Soul sand velocity multiplier + if (isNewerThan(oldVersion, newVersion, VersionEnum.r1_14_4)) { + Blocks.SOUL_SAND.velocityMultiplier = DEFAULT_SOUL_SAND_VELOCITY_MULTIPLIER; + } + if (isOlderThanOrEqualTo(oldVersion, newVersion, VersionEnum.r1_14_4)) { + Blocks.SOUL_SAND.velocityMultiplier = _1_14_4_SOUL_SAND_VELOCITY_MULTIPLIER; + } + + // Reloads all bounding boxes + for (Block block : Registries.BLOCK) { + if (block instanceof AnvilBlock || block instanceof BedBlock || block instanceof BrewingStandBlock + || block instanceof CarpetBlock || block instanceof CauldronBlock || block instanceof ChestBlock + || block instanceof EnderChestBlock || block instanceof EndPortalBlock || block instanceof EndPortalFrameBlock + || block instanceof FarmlandBlock || block instanceof FenceBlock || block instanceof FenceGateBlock + || block instanceof HopperBlock || block instanceof LadderBlock || block instanceof LeavesBlock + || block instanceof LilyPadBlock || block instanceof PaneBlock || block instanceof PistonBlock + || block instanceof PistonHeadBlock || block instanceof SnowBlock || block instanceof WallBlock + || block instanceof CropBlock || block instanceof FlowerbedBlock + ) { + for (BlockState state : block.getStateManager().getStates()) { + state.initShapeCache(); + } + } + } + })); + } + + private static boolean isOlderThanOrEqualTo(final VersionEnum oldVersion, final VersionEnum newVersion, final VersionEnum toCheck) { + return oldVersion.isNewerThan(toCheck) && newVersion.isOlderThanOrEqualTo(toCheck); + } + + private static boolean isNewerThan(final VersionEnum oldVersion, final VersionEnum newVersion, final VersionEnum toCheck) { + return newVersion.isNewerThan(toCheck) && oldVersion.isOlderThanOrEqualTo(toCheck); + } + + private static boolean didCrossBoundary(final VersionEnum oldVersion, final VersionEnum newVersion, final VersionEnum toCheck) { + return isNewerThan(oldVersion, newVersion, toCheck) || isOlderThanOrEqualTo(oldVersion, newVersion, toCheck); + } + +} diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java b/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java index cd51339e..6fffdcf8 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java @@ -21,18 +21,16 @@ package de.florianmichael.viafabricplus.fixes; import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback; import de.florianmichael.viafabricplus.event.LoadClassicProtocolExtensionCallback; +import de.florianmichael.viafabricplus.event.PostGameLoadCallback; import de.florianmichael.viafabricplus.fixes.classic.CustomClassicProtocolExtensions; import de.florianmichael.viafabricplus.fixes.classic.screen.ClassicItemSelectionScreen; import de.florianmichael.viafabricplus.injection.ViaFabricPlusMixinPlugin; -import net.minecraft.block.*; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.FontStorage; import net.minecraft.network.PacketByteBuf; -import net.minecraft.registry.Registries; import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension; import net.raphimc.vialoader.util.VersionEnum; -import java.util.List; import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; @@ -43,11 +41,6 @@ import java.util.function.Consumer; */ public class ClientsideFixes { - /** - * A list of blocks that need to be reloaded when the protocol version changes to change bounding boxes - */ - private static List RELOADABLE_BLOCKS; - /** * Contains all tasks that are waiting for a packet to be received, this system can be used to sync ViaVersion tasks with the correct thread */ @@ -58,9 +51,6 @@ public class ClientsideFixes { */ public static final String PACKET_SYNC_IDENTIFIER = UUID.randomUUID() + ":" + UUID.randomUUID(); - private static final float DEFAULT_SOUL_SAND_VELOCITY_MULTIPLIER = Blocks.SOUL_SAND.getVelocityMultiplier(); - private static final float _1_14_4_SOUL_SAND_VELOCITY_MULTIPLIER = 1F; - /** * The current chat limit */ @@ -68,36 +58,14 @@ public class ClientsideFixes { public static void init() { CustomClassicProtocolExtensions.create(); - EntityHitboxUpdateListener.init(); - ArmorUpdateListener.init(); + PostGameLoadCallback.EVENT.register(() -> { + EntityHitboxUpdateListener.init(); + ArmorUpdateListener.init(); + BlockFixes.init(); + }); // Reloads some clientside stuff when the protocol version changes ChangeProtocolVersionCallback.EVENT.register((oldVersion, newVersion) -> MinecraftClient.getInstance().execute(() -> { - // Soul sand velocity multiplier - if (isNewerThan(oldVersion, newVersion, VersionEnum.r1_14_4)) { - Blocks.SOUL_SAND.velocityMultiplier = DEFAULT_SOUL_SAND_VELOCITY_MULTIPLIER; - } - if (isOlderThanOrEqualTo(oldVersion, newVersion, VersionEnum.r1_14_4)) { - Blocks.SOUL_SAND.velocityMultiplier = _1_14_4_SOUL_SAND_VELOCITY_MULTIPLIER; - } - - // Reloads all bounding boxes - for (Block block : Registries.BLOCK) { - if (block instanceof AnvilBlock || block instanceof BedBlock || block instanceof BrewingStandBlock - || block instanceof CarpetBlock || block instanceof CauldronBlock || block instanceof ChestBlock - || block instanceof EnderChestBlock || block instanceof EndPortalBlock || block instanceof EndPortalFrameBlock - || block instanceof FarmlandBlock || block instanceof FenceBlock || block instanceof FenceGateBlock - || block instanceof HopperBlock || block instanceof LadderBlock || block instanceof LeavesBlock - || block instanceof LilyPadBlock || block instanceof PaneBlock || block instanceof PistonBlock - || block instanceof PistonHeadBlock || block instanceof SnowBlock || block instanceof WallBlock - || block instanceof CropBlock || block instanceof FlowerbedBlock - ) { - for (BlockState state : block.getStateManager().getStates()) { - state.initShapeCache(); - } - } - } - // Calculates the current chat length limit if (newVersion.isOlderThanOrEqualTo(VersionEnum.c0_28toc0_30)) { currentChatLength = 64 - (MinecraftClient.getInstance().getSession().getUsername().length() + 2); @@ -157,16 +125,4 @@ public class ClientsideFixes { return currentChatLength; } - private static boolean isOlderThanOrEqualTo(final VersionEnum oldVersion, final VersionEnum newVersion, final VersionEnum toCheck) { - return oldVersion.isNewerThan(toCheck) && newVersion.isOlderThanOrEqualTo(toCheck); - } - - private static boolean isNewerThan(final VersionEnum oldVersion, final VersionEnum newVersion, final VersionEnum toCheck) { - return newVersion.isNewerThan(toCheck) && oldVersion.isOlderThanOrEqualTo(toCheck); - } - - private static boolean didCrossBoundary(final VersionEnum oldVersion, final VersionEnum newVersion, final VersionEnum toCheck) { - return isNewerThan(oldVersion, newVersion, toCheck) || isOlderThanOrEqualTo(oldVersion, newVersion, toCheck); - } - }