Deleted base package, moved some classes

src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java

@@ -19,10 +19,10 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import de.florianmichael.viafabricplus.base.ViaJarReplacer;
-import de.florianmichael.viafabricplus.base.event.FinishMinecraftLoadCallback;
-import de.florianmichael.viafabricplus.base.event.PreLoadCallback;
-import de.florianmichael.viafabricplus.base.settings.SettingsSystem;
+import de.florianmichael.viafabricplus.protocolhack.util.ViaJarReplacer;
+import de.florianmichael.viafabricplus.event.FinishMinecraftLoadCallback;
+import de.florianmichael.viafabricplus.event.PreLoadCallback;
+import de.florianmichael.viafabricplus.settings.SettingsSystem;
 import de.florianmichael.viafabricplus.definition.ClientsideFixes;
 import de.florianmichael.viafabricplus.definition.account.BedrockAccountHandler;
 import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler;
@@ -32,7 +32,7 @@
 import de.florianmichael.viafabricplus.mappings.ItemReleaseVersionMappings;
 import de.florianmichael.viafabricplus.mappings.PackFormatsMappings;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
-import de.florianmichael.viafabricplus.screen.ClassicItemSelectionScreen;
+import de.florianmichael.viafabricplus.definition.classic.screen.ClassicItemSelectionScreen;
 import net.raphimc.vialoader.util.VersionEnum;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/de/florianmichael/viafabricplus/definition/boat/BoatRenderer_1_8.java → src/main/java/de/florianmichael/viafabricplus/definition/BoatRenderer_1_8.java

@@ -15,8 +15,9 @@
  * 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 de.florianmichael.viafabricplus.definition.boat;
+package de.florianmichael.viafabricplus.definition;
 
+import de.florianmichael.viafabricplus.definition.model.BoatModel_1_8;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.VertexConsumerProvider;

src/main/java/de/florianmichael/viafabricplus/definition/ClientsideFixes.java

@@ -19,9 +19,9 @@
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.ArmorType;
-import de.florianmichael.viafabricplus.base.event.ChangeProtocolVersionCallback;
-import de.florianmichael.viafabricplus.base.event.FinishMinecraftLoadCallback;
-import de.florianmichael.viafabricplus.base.event.LoadClassicProtocolExtensionCallback;
+import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback;
+import de.florianmichael.viafabricplus.event.FinishMinecraftLoadCallback;
+import de.florianmichael.viafabricplus.event.LoadClassicProtocolExtensionCallback;
 import de.florianmichael.viafabricplus.injection.MixinPlugin;
 import de.florianmichael.viafabricplus.injection.access.IFontStorage;
 import net.minecraft.block.Block;

src/main/java/de/florianmichael/viafabricplus/definition/account/ClassiCubeAccountHandler.java

@@ -19,7 +19,7 @@
 
 import com.google.gson.JsonObject;
 import de.florianmichael.classic4j.model.classicube.account.CCAccount;
-import de.florianmichael.viafabricplus.base.event.DisconnectConnectionCallback;
+import de.florianmichael.viafabricplus.event.DisconnectConnectionCallback;
 import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
 import de.florianmichael.viafabricplus.util.FileSaver;
 

src/main/java/de/florianmichael/viafabricplus/definition/classic/CustomClassicProtocolExtensions.java

@@ -18,8 +18,8 @@
 package de.florianmichael.viafabricplus.definition.classic;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.viafabricplus.screen.ClassicItemSelectionScreen;
-import de.florianmichael.viafabricplus.base.event.LoadClassicProtocolExtensionCallback;
+import de.florianmichael.viafabricplus.definition.classic.screen.ClassicItemSelectionScreen;
+import de.florianmichael.viafabricplus.event.LoadClassicProtocolExtensionCallback;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
 import io.netty.buffer.ByteBuf;
 import net.lenni0451.reflect.Enums;

src/main/java/de/florianmichael/viafabricplus/screen/ClassicItemSelectionScreen.java → src/main/java/de/florianmichael/viafabricplus/definition/classic/screen/ClassicItemSelectionScreen.java

@@ -15,10 +15,10 @@
  * 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 de.florianmichael.viafabricplus.screen;
+package de.florianmichael.viafabricplus.definition.classic.screen;
 
-import de.florianmichael.viafabricplus.base.event.ChangeProtocolVersionCallback;
-import de.florianmichael.viafabricplus.base.screen.VFPScreen;
+import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback;
+import de.florianmichael.viafabricplus.screen.VFPScreen;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/de/florianmichael/viafabricplus/definition/boat/BoatModel_1_8.java → src/main/java/de/florianmichael/viafabricplus/definition/model/BoatModel_1_8.java

@@ -15,7 +15,7 @@
  * 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 de.florianmichael.viafabricplus.definition.boat;
+package de.florianmichael.viafabricplus.definition.model;
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.client.model.*;

src/main/java/de/florianmichael/viafabricplus/definition/BuiltinEmptyGlyph1_12_2.java → src/main/java/de/florianmichael/viafabricplus/definition/model/BuiltinEmptyGlyph1_12_2.java

@@ -15,7 +15,7 @@
  * 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 de.florianmichael.viafabricplus.definition;
+package de.florianmichael.viafabricplus.definition.model;
 
 import net.minecraft.client.font.Glyph;
 import net.minecraft.client.font.GlyphRenderer;

src/main/java/de/florianmichael/viafabricplus/definition/classic/model/WeatherTypes.java → src/main/java/de/florianmichael/viafabricplus/definition/model/KeyPairResponse1_19_0.java

@@ -15,11 +15,20 @@
  * 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 de.florianmichael.viafabricplus.definition.classic.model;
+package de.florianmichael.viafabricplus.definition.model;
 
-public class WeatherTypes {
+import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
 
-    public final static byte SUNNY = 0;
-    public final static byte RAINING = 1;
-    public final static byte SNOWING = 2;
+import java.nio.ByteBuffer;
+
+/*
+This class is part of the AuthLib, we are overwriting this class to add a new field.
+ */
+
+public record KeyPairResponse1_19_0(
+        KeyPairResponse.KeyPair keyPair,
+        ByteBuffer publicKeySignatureV2,
+        ByteBuffer publicKeySignature /* removed in 1.20-rc1 */,
+        String expiresAt,
+        String refreshedAfter) {
 }

src/main/java/de/florianmichael/viafabricplus/definition/tracker/bedrock/JoinGameTracker.java → src/main/java/de/florianmichael/viafabricplus/definition/tracker/JoinGameTracker.java

@@ -15,7 +15,7 @@
  * 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 de.florianmichael.viafabricplus.definition.tracker.bedrock;
+package de.florianmichael.viafabricplus.definition.tracker;
 
 import com.viaversion.viaversion.api.connection.StoredObject;
 import com.viaversion.viaversion.api.connection.UserConnection;

src/main/java/de/florianmichael/viafabricplus/base/event/ChangeProtocolVersionCallback.java → src/main/java/de/florianmichael/viafabricplus/event/ChangeProtocolVersionCallback.java

@@ -15,7 +15,7 @@
  * 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 de.florianmichael.viafabricplus.base.event;
+package de.florianmichael.viafabricplus.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

src/main/java/de/florianmichael/viafabricplus/base/event/DisconnectConnectionCallback.java → src/main/java/de/florianmichael/viafabricplus/event/DisconnectConnectionCallback.java

@@ -15,7 +15,7 @@
  * 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 de.florianmichael.viafabricplus.base.event;
+package de.florianmichael.viafabricplus.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

src/main/java/de/florianmichael/viafabricplus/base/event/FinishMinecraftLoadCallback.java → src/main/java/de/florianmichael/viafabricplus/event/FinishMinecraftLoadCallback.java

@@ -15,7 +15,7 @@
  * 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 de.florianmichael.viafabricplus.base.event;
+package de.florianmichael.viafabricplus.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

src/main/java/de/florianmichael/viafabricplus/base/event/FinishViaVersionStartupCallback.java → src/main/java/de/florianmichael/viafabricplus/event/FinishViaVersionStartupCallback.java

@@ -15,7 +15,7 @@
  * 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 de.florianmichael.viafabricplus.base.event;
+package de.florianmichael.viafabricplus.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

src/main/java/de/florianmichael/viafabricplus/base/event/InitializeSettingsCallback.java → src/main/java/de/florianmichael/viafabricplus/event/InitializeSettingsCallback.java

@@ -15,7 +15,7 @@
  * 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 de.florianmichael.viafabricplus.base.event;
+package de.florianmichael.viafabricplus.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

src/main/java/de/florianmichael/viafabricplus/base/event/LoadClassicProtocolExtensionCallback.java → src/main/java/de/florianmichael/viafabricplus/event/LoadClassicProtocolExtensionCallback.java

@@ -15,7 +15,7 @@
  * 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 de.florianmichael.viafabricplus.base.event;
+package de.florianmichael.viafabricplus.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

src/main/java/de/florianmichael/viafabricplus/base/event/PreLoadCallback.java → src/main/java/de/florianmichael/viafabricplus/event/PreLoadCallback.java

@@ -15,7 +15,7 @@
  * 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 de.florianmichael.viafabricplus.base.event;
+package de.florianmichael.viafabricplus.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

src/main/java/de/florianmichael/viafabricplus/information/impl/BedrockInformation.java

@@ -19,7 +19,7 @@
 
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.viafabricplus.definition.tracker.bedrock.JoinGameTracker;
+import de.florianmichael.viafabricplus.definition.tracker.JoinGameTracker;
 import de.florianmichael.viafabricplus.information.AbstractInformationGroup;
 import de.florianmichael.viafabricplus.protocolhack.provider.viabedrock.ViaFabricPlusBlobCacheProvider;
 import net.lenni0451.reflect.stream.RStream;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinAddServerScreen.java

@@ -17,9 +17,9 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.base;
 
-import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings;
+import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
 import de.florianmichael.viafabricplus.injection.access.IServerInfo;
-import de.florianmichael.viafabricplus.screen.base.ForceVersionScreen;
+import de.florianmichael.viafabricplus.screen.common.ForceVersionScreen;
 import net.minecraft.client.gui.screen.AddServerScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientConnection.java

@@ -17,8 +17,8 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.base;
 
-import de.florianmichael.viafabricplus.base.event.ChangeProtocolVersionCallback;
-import de.florianmichael.viafabricplus.base.event.DisconnectConnectionCallback;
+import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback;
+import de.florianmichael.viafabricplus.event.DisconnectConnectionCallback;
 import de.florianmichael.viafabricplus.injection.access.IClientConnection;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
 import de.florianmichael.viafabricplus.protocolhack.netty.ViaFabricPlusVLLegacyPipeline;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinConnectScreen_1.java

@@ -17,7 +17,7 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.base;
 
-import de.florianmichael.viafabricplus.base.event.ChangeProtocolVersionCallback;
+import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback;
 import de.florianmichael.viafabricplus.definition.ClientsideFixes;
 import de.florianmichael.viafabricplus.injection.access.IServerInfo;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinDebugHud.java

@@ -21,7 +21,7 @@
 import de.florianmichael.viafabricplus.ViaFabricPlus;
 import de.florianmichael.viafabricplus.information.AbstractInformationGroup;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
-import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings;
+import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
 import de.florianmichael.viafabricplus.util.ChatUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.DebugHud;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinDownloadingTerrainScreenAndConnectScreen.java

@@ -17,7 +17,7 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.base;
 
-import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings;
+import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
 import de.florianmichael.viafabricplus.util.ChatUtil;
 import net.minecraft.client.gui.DrawContext;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMinecraftClient.java

@@ -18,8 +18,8 @@
 package de.florianmichael.viafabricplus.injection.mixin.base;
 
 import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.base.event.ChangeProtocolVersionCallback;
-import de.florianmichael.viafabricplus.base.event.FinishMinecraftLoadCallback;
+import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback;
+import de.florianmichael.viafabricplus.event.FinishMinecraftLoadCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.RunArgs;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerScreen.java

@@ -17,8 +17,8 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.base;
 
-import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen;
-import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings;
+import de.florianmichael.viafabricplus.screen.common.ProtocolSelectionScreen;
+import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerServerListWidget_ServerEntry.java

@@ -17,7 +17,7 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.base;
 
-import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings;
+import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
 import de.florianmichael.viafabricplus.injection.access.IServerInfo;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinOptionsScreen.java

@@ -17,7 +17,7 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.base;
 
-import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings;
+import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinSharedConstants.java

@@ -17,7 +17,7 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.base;
 
-import de.florianmichael.viafabricplus.screen.thirdparty.classicube.ClassiCubeLoginScreen;
+import de.florianmichael.viafabricplus.screen.classic4j.classicube.ClassiCubeLoginScreen;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.MinecraftClient;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/sodium/MixinChunkTracker.java

@@ -17,7 +17,7 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.compat.sodium;
 
-import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings;
+import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
 import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java

@@ -20,7 +20,7 @@
 import com.mojang.authlib.minecraft.client.MinecraftClient;
 import com.mojang.authlib.yggdrasil.YggdrasilUserApiService;
 import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
-import de.florianmichael.viafabricplus.definition.authlib.KeyPairResponse1_19_0;
+import de.florianmichael.viafabricplus.definition.model.KeyPairResponse1_19_0;
 import de.florianmichael.viafabricplus.injection.access.IKeyPairResponse;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinBipedEntityModel.java

@@ -17,7 +17,7 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings;
+import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.entity.model.BipedEntityModel;
 import net.minecraft.entity.LivingEntity;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java

@@ -17,7 +17,7 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.base.settings.groups.DebugSettings;
+import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
 import net.minecraft.client.render.Camera;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java

@@ -17,9 +17,8 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings;
-import de.florianmichael.viafabricplus.definition.BuiltinEmptyGlyph1_12_2;
-import de.florianmichael.viafabricplus.definition.ClientsideFixes;
+import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import de.florianmichael.viafabricplus.definition.model.BuiltinEmptyGlyph1_12_2;
 import de.florianmichael.viafabricplus.injection.access.IFontStorage;
 import de.florianmichael.viafabricplus.mappings.CharacterMappings;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.java

@@ -18,7 +18,7 @@
 package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings;
+import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.entity.JumpingMount;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinItemRenderer.java

@@ -17,7 +17,7 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings;
+import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.render.item.ItemModels;
 import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.render.model.BakedModel;

src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java

@@ -27,7 +27,7 @@
 import de.florianmichael.viafabricplus.ViaFabricPlus;
 import de.florianmichael.viafabricplus.injection.access.IMinecraftClient;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
-import de.florianmichael.viafabricplus.base.settings.groups.DebugSettings;
+import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
 import net.raphimc.vialoader.util.VersionEnum;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;