Initial sorting of mixins per features

Moves out mixin classes to feature packages to combine util classes and mixins
ViaVersion · Dec 23, 2024 · 61b8228 · 61b8228
1 parent ddf1880
commit 61b8228
Show file tree

Hide file tree

Showing 216 changed files with 698 additions and 525 deletions.
diff --git a/src/main/java/com/viaversion/viafabricplus/ViaFabricPlus.java b/src/main/java/com/viaversion/viafabricplus/ViaFabricPlus.java
@@ -22,7 +22,7 @@
 package com.viaversion.viafabricplus;
 
 import com.viaversion.viafabricplus.event.PostGameLoadCallback;
-import com.viaversion.viafabricplus.features.ClientsideFixes;
+import com.viaversion.viafabricplus.features.ClientsideFeatures;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viafabricplus.save.SaveManager;
 import com.viaversion.viafabricplus.settings.SettingsManager;
@@ -84,7 +84,7 @@ public void init() {
         settingsManager = new SettingsManager();
         saveManager = new SaveManager(settingsManager);
 
-        ClientsideFixes.init(); // Init clientside related fixes
+        ClientsideFeatures.init(); // Init clientside related fixes
         loadingFuture = ProtocolTranslator.init(directory); // Init ViaVersion protocol translator platform
 
         // Block game loading until ViaVersion has loaded

diff --git a/...afabricplus/features/ClientsideFixes.java → ...bricplus/features/ClientsideFeatures.java b/...afabricplus/features/ClientsideFixes.java → ...bricplus/features/ClientsideFeatures.java
@@ -61,7 +61,7 @@
 /**
  * This class contains random fields and methods that are used to fix bugs on the client side
  */
-public class ClientsideFixes {
+public class ClientsideFeatures {
 
     /**
      * 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

diff --git a/.../java/com/viaversion/viafabricplus/features/versioned/visual/BuiltinEmptyGlyph1_12_2.java b/.../java/com/viaversion/viafabricplus/features/versioned/visual/BuiltinEmptyGlyph1_12_2.java
@@ -21,7 +21,7 @@
 
 package com.viaversion.viafabricplus.features.versioned.visual;
 
-import com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.MixinFontStorage;
+import com.viaversion.viafabricplus.injection.mixin.features.text_rendering.MixinFontStorage;
 import net.minecraft.client.font.BakedGlyph;
 import net.minecraft.client.font.Glyph;
 import net.minecraft.client.font.RenderableGlyph;

diff --git a/...n/base/integration/MixinChunkTracker.java → .../mixin/base/access/MixinChunkTracker.java b/...n/base/integration/MixinChunkTracker.java → .../mixin/base/access/MixinChunkTracker.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.access;
 
 import com.viaversion.viafabricplus.injection.access.IChunkTracker;
 import net.raphimc.viabedrock.api.chunk.BedrockChunk;

diff --git a/...on/MixinMultiValueDebugSampleLogImpl.java → ...ss/MixinMultiValueDebugSampleLogImpl.java b/...on/MixinMultiValueDebugSampleLogImpl.java → ...ss/MixinMultiValueDebugSampleLogImpl.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.perserverversion;
+package com.viaversion.viafabricplus.injection.mixin.base.access;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.injection.access.IMultiValueDebugSampleLogImpl;

diff --git a/...ase/integration/MixinRakSessionCodec.java → ...xin/base/access/MixinRakSessionCodec.java b/...ase/integration/MixinRakSessionCodec.java → ...xin/base/access/MixinRakSessionCodec.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.access;
 
 import com.viaversion.viafabricplus.injection.access.IRakSessionCodec;
 import io.netty.util.collection.IntObjectMap;

diff --git a/...n/base/connect/MixinClientConnection.java → ...ase/connection/MixinClientConnection.java b/...n/base/connect/MixinClientConnection.java → ...ase/connection/MixinClientConnection.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.connect;
+package com.viaversion.viafabricplus.injection.mixin.base.connection;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;

diff --git a/...base/connect/MixinClientConnection_1.java → ...e/connection/MixinClientConnection_1.java b/...base/connect/MixinClientConnection_1.java → ...e/connection/MixinClientConnection_1.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.connect;
+package com.viaversion.viafabricplus.injection.mixin.base.connection;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import io.netty.channel.Channel;

diff --git a/...nnect/MixinClientLoginNetworkHandler.java → ...ction/MixinClientLoginNetworkHandler.java b/...nnect/MixinClientLoginNetworkHandler.java → ...ction/MixinClientLoginNetworkHandler.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.connect;
+package com.viaversion.viafabricplus.injection.mixin.base.connection;
 
 import com.viaversion.viafabricplus.injection.access.IClientConnection;
 import net.minecraft.client.network.ClientLoginNetworkHandler;

diff --git a/...in/base/connect/MixinConnectScreen_1.java → ...base/connection/MixinConnectScreen_1.java b/...in/base/connect/MixinConnectScreen_1.java → ...base/connection/MixinConnectScreen_1.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.connect;
+package com.viaversion.viafabricplus.injection.mixin.base.connection;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

diff --git a/.../mixin/base/connect/MixinGameOptions.java → ...xin/base/connection/MixinGameOptions.java b/.../mixin/base/connect/MixinGameOptions.java → ...xin/base/connection/MixinGameOptions.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.connect;
+package com.viaversion.viafabricplus.injection.mixin.base.connection;
 
 import com.viaversion.viafabricplus.ViaFabricPlus;
 import net.minecraft.client.option.GameOptions;

diff --git a/...va/com/viaversion/viafabricplus/injection/mixin/base/connection/MixinMinecraftClient.java b/...va/com/viaversion/viafabricplus/injection/mixin/base/connection/MixinMinecraftClient.java
@@ -0,0 +1,45 @@
+/*
+ * This file is part of ViaFabricPlus - https://github.com/ViaVersion/ViaFabricPlus
+ * Copyright (C) 2021-2024 the original authors
+ *                         - FlorianMichael/EnZaXD <[email protected]>
+ *                         - RK_01/RaphiMC
+ * Copyright (C) 2023-2024 ViaVersion 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.viaversion.viafabricplus.injection.mixin.base.connection;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.network.ClientConnection;
+import net.minecraft.resource.ResourcePackManager;
+import net.minecraft.server.SaveLoader;
+import net.minecraft.world.level.storage.LevelStorage;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MinecraftClient.class)
+public class MixinMinecraftClient {
+
+    @Inject(method = "startIntegratedServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;connect(Ljava/lang/String;ILnet/minecraft/network/listener/ClientLoginPacketListener;)V", shift = At.Shift.BEFORE))
+    private void disableProtocolTranslator(LevelStorage.Session session, ResourcePackManager dataPackManager, SaveLoader saveLoader, boolean newWorld, CallbackInfo ci, @Local ClientConnection clientConnection) {
+        ProtocolTranslator.setTargetVersion(ProtocolTranslator.NATIVE_VERSION, true);
+        ProtocolTranslator.injectPreviousVersionReset(clientConnection.channel);
+    }
+
+}
diff --git a/...ion/MixinMultiplayerServerListPinger.java → ...ion/MixinMultiplayerServerListPinger.java b/...ion/MixinMultiplayerServerListPinger.java → ...ion/MixinMultiplayerServerListPinger.java
@@ -19,16 +19,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.perserverversion;
+package com.viaversion.viafabricplus.injection.mixin.base.connection;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
-import com.viaversion.viafabricplus.features.ClientsideFixes;
 import com.viaversion.viafabricplus.injection.access.IMultiValueDebugSampleLogImpl;
 import com.viaversion.viafabricplus.injection.access.IServerInfo;
 import net.minecraft.client.network.MultiplayerServerListPinger;
-import net.minecraft.client.network.ServerAddress;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.util.profiler.MultiValueDebugSampleLogImpl;
@@ -38,13 +36,7 @@
 import java.net.InetSocketAddress;
 
 @Mixin(MultiplayerServerListPinger.class)
-public abstract class MixinMultiplayerServerListPinger {
-
-    @WrapOperation(method = "add", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerAddress;parse(Ljava/lang/String;)Lnet/minecraft/client/network/ServerAddress;"))
-    private ServerAddress replaceDefaultPort(String address, Operation<ServerAddress> original, @Local(argsOnly = true) ServerInfo entry) {
-        // Replace port when pinging the server and the forced version is set
-        return original.call(ClientsideFixes.replaceDefaultPort(address, ((IServerInfo) entry).viaFabricPlus$forcedVersion()));
-    }
+public class MixinMultiplayerServerListPinger {
 
     @WrapOperation(method = "add", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;connect(Ljava/net/InetSocketAddress;ZLnet/minecraft/util/profiler/MultiValueDebugSampleLogImpl;)Lnet/minecraft/network/ClientConnection;"))
     private ClientConnection setForcedVersion(InetSocketAddress address, boolean useEpoll, MultiValueDebugSampleLogImpl packetSizeLog, Operation<ClientConnection> original, @Local(argsOnly = true) ServerInfo serverInfo) {

diff --git a/...a/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMinecraftClient.java b/...a/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMinecraftClient.java
@@ -21,15 +21,9 @@
 
 package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
-import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viafabricplus.event.PostGameLoadCallback;
-import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.RunArgs;
-import net.minecraft.network.ClientConnection;
-import net.minecraft.resource.ResourcePackManager;
-import net.minecraft.server.SaveLoader;
-import net.minecraft.world.level.storage.LevelStorage;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -43,10 +37,4 @@ private void callPostGameLoadEvent(RunArgs args, CallbackInfo ci) {
         PostGameLoadCallback.EVENT.invoker().postGameLoad();
     }
 
-    @Inject(method = "startIntegratedServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;connect(Ljava/lang/String;ILnet/minecraft/network/listener/ClientLoginPacketListener;)V", shift = At.Shift.BEFORE))
-    private void disableProtocolTranslator(LevelStorage.Session session, ResourcePackManager dataPackManager, SaveLoader saveLoader, boolean newWorld, CallbackInfo ci, @Local ClientConnection clientConnection) {
-        ProtocolTranslator.setTargetVersion(ProtocolTranslator.NATIVE_VERSION, true);
-        ProtocolTranslator.injectPreviousVersionReset(clientConnection.channel);
-    }
-
 }
diff --git a/...serverversion/MixinMultiplayerScreen.java → ...ion/MixinMultiplayerServerListPinger.java b/...serverversion/MixinMultiplayerScreen.java → ...ion/MixinMultiplayerServerListPinger.java
@@ -19,26 +19,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.perserverversion;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
+import com.viaversion.viafabricplus.features.ClientsideFeatures;
 import com.viaversion.viafabricplus.injection.access.IServerInfo;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
+import net.minecraft.client.network.MultiplayerServerListPinger;
+import net.minecraft.client.network.ServerAddress;
 import net.minecraft.client.network.ServerInfo;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
-@Mixin(MultiplayerScreen.class)
-public abstract class MixinMultiplayerScreen {
+@Mixin(MultiplayerServerListPinger.class)
+public abstract class MixinMultiplayerServerListPinger {
 
-    @Shadow protected abstract void connect(ServerInfo entry);
-
-    @WrapOperation(method = "directConnect", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerScreen;connect(Lnet/minecraft/client/network/ServerInfo;)V"))
-    private void storeDirectConnectionPhase(MultiplayerScreen instance, ServerInfo entry, Operation<Void> original) {
-        ((IServerInfo) entry).viaFabricPlus$passDirectConnectScreen(true);
-        original.call(instance, entry);
+    @WrapOperation(method = "add", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerAddress;parse(Ljava/lang/String;)Lnet/minecraft/client/network/ServerAddress;"))
+    private ServerAddress replaceDefaultPort(String address, Operation<ServerAddress> original, @Local(argsOnly = true) ServerInfo entry) {
+        // Replace port when pinging the server and the forced version is set
+        return original.call(ClientsideFeatures.replaceDefaultPort(address, ((IServerInfo) entry).viaFabricPlus$forcedVersion()));
     }
 
 }
diff --git a/...ase/perserverversion/MixinServerInfo.java → ...xin/base/integration/MixinServerInfo.java b/...ase/perserverversion/MixinServerInfo.java → ...xin/base/integration/MixinServerInfo.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.perserverversion;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

diff --git a/...ase/integration/MixinAddServerScreen.java → ...n/mixin/base/ui/MixinAddServerScreen.java b/...ase/integration/MixinAddServerScreen.java → ...n/mixin/base/ui/MixinAddServerScreen.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.ui;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.injection.access.IServerInfo;

diff --git a/.../base/integration/MixinConfirmScreen.java → ...ion/mixin/base/ui/MixinConfirmScreen.java b/.../base/integration/MixinConfirmScreen.java → ...ion/mixin/base/ui/MixinConfirmScreen.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.ui;
 
 import com.viaversion.viafabricplus.injection.access.IConfirmScreen;
 import net.minecraft.client.gui.screen.ConfirmScreen;

diff --git a/...ase/integration/MixinConnectScreen_1.java → ...n/mixin/base/ui/MixinConnectScreen_1.java b/...ase/integration/MixinConnectScreen_1.java → ...n/mixin/base/ui/MixinConnectScreen_1.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.ui;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

diff --git a/...integration/MixinDirectConnectScreen.java → ...xin/base/ui/MixinDirectConnectScreen.java b/...integration/MixinDirectConnectScreen.java → ...xin/base/ui/MixinDirectConnectScreen.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.ui;
 
 import com.viaversion.viafabricplus.screen.base.ProtocolSelectionScreen;
 import com.viaversion.viafabricplus.settings.impl.GeneralSettings;

diff --git a/...ration/MixinDownloadingTerrainScreen.java → ...ase/ui/MixinDownloadingTerrainScreen.java b/...ration/MixinDownloadingTerrainScreen.java → ...ase/ui/MixinDownloadingTerrainScreen.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.ui;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;

diff --git a/...e/integration/MixinMultiplayerScreen.java → ...mixin/base/ui/MixinMultiplayerScreen.java b/...e/integration/MixinMultiplayerScreen.java → ...mixin/base/ui/MixinMultiplayerScreen.java
@@ -19,13 +19,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.ui;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import com.viaversion.viafabricplus.features.ClientsideFixes;
+import com.viaversion.viafabricplus.features.ClientsideFeatures;
 import com.viaversion.viafabricplus.injection.access.IServerInfo;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viafabricplus.screen.base.ProtocolSelectionScreen;
@@ -70,7 +70,13 @@ private ServerAddress replaceDefaultPort(String address, Operation<ServerAddress
         } else {
             version = mixinServerInfo.viaFabricPlus$forcedVersion();
         }
-        return original.call(ClientsideFixes.replaceDefaultPort(address, version));
+        return original.call(ClientsideFeatures.replaceDefaultPort(address, version));
+    }
+
+    @WrapOperation(method = "directConnect", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerScreen;connect(Lnet/minecraft/client/network/ServerInfo;)V"))
+    private void storeDirectConnectionPhase(MultiplayerScreen instance, ServerInfo entry, Operation<Void> original) {
+        ((IServerInfo) entry).viaFabricPlus$passDirectConnectScreen(true);
+        original.call(instance, entry);
     }
 
 }
diff --git a/...s/minecraft/MixinClientCommandSource.java → ...res/bedrock/MixinClientCommandSource.java b/...s/minecraft/MixinClientCommandSource.java → ...res/bedrock/MixinClientCommandSource.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.features.bedrock;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.network.ClientCommandSource;

diff --git a/...in/fixes/minecraft/MixinTextRenderer.java → ...ck/allow_new_lines/MixinTextRenderer.java b/...in/fixes/minecraft/MixinTextRenderer.java → ...ck/allow_new_lines/MixinTextRenderer.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.features.bedrock.allow_new_lines;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;

diff --git a/...in/fixes/minecraft/MixinGameRenderer.java → ...ach_around_raycast/MixinGameRenderer.java b/...in/fixes/minecraft/MixinGameRenderer.java → ...ach_around_raycast/MixinGameRenderer.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.features.bedrock.reach_around_raycast;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;

diff --git a/...necraft/block/MixinAbstractRailBlock.java → ...lision_shapes/MixinAbstractRailBlock.java b/...necraft/block/MixinAbstractRailBlock.java → ...lision_shapes/MixinAbstractRailBlock.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;

diff --git a/...ixes/minecraft/block/MixinAnvilBlock.java → ...ock/collision_shapes/MixinAnvilBlock.java b/...ixes/minecraft/block/MixinAnvilBlock.java → ...ock/collision_shapes/MixinAnvilBlock.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin;