From adddcca7cee9e834fa7a8769f4a1fef9dd87f102 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Thu, 2 Nov 2023 08:37:22 +0100 Subject: [PATCH] Deleted base package, moved some classes --- .../viafabricplus/ViaFabricPlus.java | 10 +++++----- .../{boat => }/BoatRenderer_1_8.java | 3 ++- .../definition/ClientsideFixes.java | 6 +++--- .../account/ClassiCubeAccountHandler.java | 2 +- .../authlib/KeyPairResponse1_19_0.java | 17 ----------------- .../CustomClassicProtocolExtensions.java | 4 ++-- .../screen/ClassicItemSelectionScreen.java | 6 +++--- .../{boat => model}/BoatModel_1_8.java | 2 +- .../{ => model}/BuiltinEmptyGlyph1_12_2.java | 2 +- .../KeyPairResponse1_19_0.java} | 19 ++++++++++++++----- .../{bedrock => }/JoinGameTracker.java | 2 +- .../event/ChangeProtocolVersionCallback.java | 2 +- .../event/DisconnectConnectionCallback.java | 2 +- .../event/FinishMinecraftLoadCallback.java | 2 +- .../FinishViaVersionStartupCallback.java | 2 +- .../event/InitializeSettingsCallback.java | 2 +- .../LoadClassicProtocolExtensionCallback.java | 2 +- .../{base => }/event/PreLoadCallback.java | 2 +- .../information/impl/BedrockInformation.java | 2 +- .../mixin/base/MixinAddServerScreen.java | 4 ++-- .../mixin/base/MixinClientConnection.java | 4 ++-- .../mixin/base/MixinConnectScreen_1.java | 2 +- .../injection/mixin/base/MixinDebugHud.java | 2 +- ...nloadingTerrainScreenAndConnectScreen.java | 2 +- .../mixin/base/MixinMinecraftClient.java | 4 ++-- .../mixin/base/MixinMultiplayerScreen.java | 4 ++-- ...ltiplayerServerListWidget_ServerEntry.java | 2 +- .../mixin/base/MixinOptionsScreen.java | 2 +- .../mixin/base/MixinSharedConstants.java | 2 +- .../compat/sodium/MixinChunkTracker.java | 2 +- .../authlib/MixinYggdrasilUserApiService.java | 2 +- .../minecraft/MixinBipedEntityModel.java | 2 +- .../mixin/fixes/minecraft/MixinCamera.java | 2 +- .../fixes/minecraft/MixinFontStorage.java | 5 ++--- .../mixin/fixes/minecraft/MixinInGameHud.java | 2 +- .../fixes/minecraft/MixinItemRenderer.java | 2 +- .../fixes/minecraft/MixinMinecraftClient.java | 2 +- .../minecraft/MixinPendingUpdateManager.java | 2 +- .../minecraft/block/MixinAbstractBlock.java | 2 +- .../minecraft/entity/MixinBoatEntity.java | 2 +- .../entity/MixinClientPlayerEntity.java | 4 ++-- .../minecraft/entity/MixinEntityModels.java | 2 +- .../entity/MixinEntityRenderDispatcher.java | 4 ++-- .../minecraft/entity/MixinLivingEntity.java | 2 +- .../minecraft/entity/MixinPlayerEntity.java | 2 +- .../fixes/minecraft/input/MixinKeyboard.java | 3 +-- .../fixes/minecraft/input/MixinMouse.java | 2 +- .../minecraft/item/MixinHeldItemRenderer.java | 2 +- .../item/MixinItemCooldownManager.java | 2 +- .../item/MixinItemGroup_EntriesImpl.java | 2 +- .../fixes/minecraft/item/MixinItemGroups.java | 2 +- .../fixes/minecraft/item/MixinItemStack.java | 4 +--- .../MixinClientPlayNetworkHandler.java | 6 +----- .../fixes/minecraft/screen/MixinChatHud.java | 2 +- .../minecraft/screen/MixinChatScreen.java | 2 +- .../screen/MixinCommandBlockScreen.java | 2 +- .../screen/MixinConnectScreen_1.java | 2 +- .../screen/MixinCreativeInventoryScreen.java | 4 ++-- .../screen/MixinJigsawBlockScreen.java | 3 +-- .../screen/merchant/MixinMerchantScreen.java | 2 +- .../viabedrock/MixinBedrockProtocol.java | 2 +- .../fixes/viabedrock/MixinJoinPackets.java | 2 +- ...MixinExtensionProtocolMetadataStorage.java | 2 +- .../MixinProtocolc0_30toc0_30cpe.java | 7 +++---- .../fixes/vialegacy/MixinViaLegacyConfig.java | 2 +- .../mappings/ItemReleaseVersionMappings.java | 2 +- .../protocolhack/ProtocolHack.java | 4 ++-- .../impl/ViaFabricPlusVLViaConfig.java | 2 +- .../viaversion/ViaFabricPlusViaDecoder.java | 2 +- .../ViaFabricPlusTransferProvider.java | 2 +- .../ViaFabricPlusClassicMPPassProvider.java | 2 +- .../ViaFabricPlusOldAuthProvider.java | 3 +-- .../ViaFabricPlusBaseVersionProvider.java | 2 +- .../util}/ViaJarReplacer.java | 2 +- .../{base => }/screen/MappedSlotEntry.java | 2 +- .../{base => }/screen/VFPScreen.java | 2 +- .../BetaCraftScreen.java | 6 +++--- .../classicube/ClassiCubeLoginScreen.java | 6 +++--- .../classicube/ClassiCubeMFAScreen.java | 6 +++--- .../ClassiCubeServerListScreen.java | 10 +++++----- .../{base => common}/ForceVersionScreen.java | 4 ++-- .../ProtocolSelectionScreen.java | 12 +++++------- .../screen/settings/SettingsScreen.java | 8 ++++---- .../BooleanSettingRenderer.java | 4 ++-- .../ButtonSettingRenderer.java | 4 ++-- .../settingrenderer/ModeSettingRenderer.java | 4 ++-- .../ProtocolSyncBooleanSettingRenderer.java | 4 ++-- .../settingrenderer/meta/TitleRenderer.java | 2 +- .../base => settings}/AbstractSetting.java | 4 ++-- .../base => settings}/SettingGroup.java | 4 +++- .../{base => }/settings/SettingsSystem.java | 8 +++----- .../impl}/AuthenticationSettings.java | 6 +++--- .../impl}/BedrockSettings.java | 8 ++++---- .../impl}/DebugSettings.java | 10 +++------- .../impl}/ExperimentalSettings.java | 6 +++--- .../impl}/GeneralSettings.java | 8 ++++---- .../impl}/VisualSettings.java | 6 +++--- .../type}/BooleanSetting.java | 8 ++++---- .../type}/ButtonSetting.java | 8 ++++---- .../type}/ModeSetting.java | 8 ++++---- .../type}/ProtocolSyncBooleanSetting.java | 8 ++++---- 101 files changed, 187 insertions(+), 211 deletions(-) rename src/main/java/de/florianmichael/viafabricplus/definition/{boat => }/BoatRenderer_1_8.java (96%) delete mode 100644 src/main/java/de/florianmichael/viafabricplus/definition/authlib/KeyPairResponse1_19_0.java rename src/main/java/de/florianmichael/viafabricplus/{ => definition/classic}/screen/ClassicItemSelectionScreen.java (97%) rename src/main/java/de/florianmichael/viafabricplus/definition/{boat => model}/BoatModel_1_8.java (98%) rename src/main/java/de/florianmichael/viafabricplus/definition/{ => model}/BuiltinEmptyGlyph1_12_2.java (97%) rename src/main/java/de/florianmichael/viafabricplus/definition/{classic/model/WeatherTypes.java => model/KeyPairResponse1_19_0.java} (62%) rename src/main/java/de/florianmichael/viafabricplus/definition/tracker/{bedrock => }/JoinGameTracker.java (95%) rename src/main/java/de/florianmichael/viafabricplus/{base => }/event/ChangeProtocolVersionCallback.java (96%) rename src/main/java/de/florianmichael/viafabricplus/{base => }/event/DisconnectConnectionCallback.java (96%) rename src/main/java/de/florianmichael/viafabricplus/{base => }/event/FinishMinecraftLoadCallback.java (96%) rename src/main/java/de/florianmichael/viafabricplus/{base => }/event/FinishViaVersionStartupCallback.java (96%) rename src/main/java/de/florianmichael/viafabricplus/{base => }/event/InitializeSettingsCallback.java (96%) rename src/main/java/de/florianmichael/viafabricplus/{base => }/event/LoadClassicProtocolExtensionCallback.java (96%) rename src/main/java/de/florianmichael/viafabricplus/{base => }/event/PreLoadCallback.java (95%) rename src/main/java/de/florianmichael/viafabricplus/{base => protocolhack/util}/ViaJarReplacer.java (97%) rename src/main/java/de/florianmichael/viafabricplus/{base => }/screen/MappedSlotEntry.java (98%) rename src/main/java/de/florianmichael/viafabricplus/{base => }/screen/VFPScreen.java (99%) rename src/main/java/de/florianmichael/viafabricplus/screen/{thirdparty => classic4j}/BetaCraftScreen.java (96%) rename src/main/java/de/florianmichael/viafabricplus/screen/{thirdparty => classic4j}/classicube/ClassiCubeLoginScreen.java (95%) rename src/main/java/de/florianmichael/viafabricplus/screen/{thirdparty => classic4j}/classicube/ClassiCubeMFAScreen.java (94%) rename src/main/java/de/florianmichael/viafabricplus/screen/{thirdparty => classic4j}/classicube/ClassiCubeServerListScreen.java (95%) rename src/main/java/de/florianmichael/viafabricplus/screen/{base => common}/ForceVersionScreen.java (97%) rename src/main/java/de/florianmichael/viafabricplus/screen/{base => common}/ProtocolSelectionScreen.java (94%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/base => settings}/AbstractSetting.java (94%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/base => settings}/SettingGroup.java (93%) rename src/main/java/de/florianmichael/viafabricplus/{base => }/settings/SettingsSystem.java (89%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/groups => settings/impl}/AuthenticationSettings.java (90%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/groups => settings/impl}/BedrockSettings.java (94%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/groups => settings/impl}/DebugSettings.java (89%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/groups => settings/impl}/ExperimentalSettings.java (87%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/groups => settings/impl}/GeneralSettings.java (91%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/groups => settings/impl}/VisualSettings.java (94%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/type_impl => settings/type}/BooleanSetting.java (85%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/type_impl => settings/type}/ButtonSetting.java (84%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/type_impl => settings/type}/ModeSetting.java (88%) rename src/main/java/de/florianmichael/viafabricplus/{base/settings/type_impl => settings/type}/ProtocolSyncBooleanSetting.java (90%) diff --git a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java index 3aaf38cfb..f4776baaf 100644 --- a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/boat/BoatRenderer_1_8.java b/src/main/java/de/florianmichael/viafabricplus/definition/BoatRenderer_1_8.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/definition/boat/BoatRenderer_1_8.java rename to src/main/java/de/florianmichael/viafabricplus/definition/BoatRenderer_1_8.java index a5823cae7..c5170d21a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/boat/BoatRenderer_1_8.java +++ b/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 . */ -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; diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/ClientsideFixes.java b/src/main/java/de/florianmichael/viafabricplus/definition/ClientsideFixes.java index 735f6e87b..4a13c9065 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/ClientsideFixes.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/account/ClassiCubeAccountHandler.java b/src/main/java/de/florianmichael/viafabricplus/definition/account/ClassiCubeAccountHandler.java index d20b7bddd..4384d3a0f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/account/ClassiCubeAccountHandler.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/authlib/KeyPairResponse1_19_0.java b/src/main/java/de/florianmichael/viafabricplus/definition/authlib/KeyPairResponse1_19_0.java deleted file mode 100644 index 574df037c..000000000 --- a/src/main/java/de/florianmichael/viafabricplus/definition/authlib/KeyPairResponse1_19_0.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.florianmichael.viafabricplus.definition.authlib; - -import com.mojang.authlib.yggdrasil.response.KeyPairResponse; - -import java.nio.ByteBuffer; - -/* -This library 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) { -} diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/classic/CustomClassicProtocolExtensions.java b/src/main/java/de/florianmichael/viafabricplus/definition/classic/CustomClassicProtocolExtensions.java index f16db8abb..ac84dc4b2 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/classic/CustomClassicProtocolExtensions.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/ClassicItemSelectionScreen.java b/src/main/java/de/florianmichael/viafabricplus/definition/classic/screen/ClassicItemSelectionScreen.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/screen/ClassicItemSelectionScreen.java rename to src/main/java/de/florianmichael/viafabricplus/definition/classic/screen/ClassicItemSelectionScreen.java index 9a959239d..1a745b8e0 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/ClassicItemSelectionScreen.java +++ b/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 . */ -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; diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/boat/BoatModel_1_8.java b/src/main/java/de/florianmichael/viafabricplus/definition/model/BoatModel_1_8.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/definition/boat/BoatModel_1_8.java rename to src/main/java/de/florianmichael/viafabricplus/definition/model/BoatModel_1_8.java index 10f8dbc22..8798850d2 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/boat/BoatModel_1_8.java +++ b/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 . */ -package de.florianmichael.viafabricplus.definition.boat; +package de.florianmichael.viafabricplus.definition.model; import com.google.common.collect.ImmutableList; import net.minecraft.client.model.*; diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/BuiltinEmptyGlyph1_12_2.java b/src/main/java/de/florianmichael/viafabricplus/definition/model/BuiltinEmptyGlyph1_12_2.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/definition/BuiltinEmptyGlyph1_12_2.java rename to src/main/java/de/florianmichael/viafabricplus/definition/model/BuiltinEmptyGlyph1_12_2.java index 9f6cb254b..35e10d596 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/BuiltinEmptyGlyph1_12_2.java +++ b/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 . */ -package de.florianmichael.viafabricplus.definition; +package de.florianmichael.viafabricplus.definition.model; import net.minecraft.client.font.Glyph; import net.minecraft.client.font.GlyphRenderer; diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/classic/model/WeatherTypes.java b/src/main/java/de/florianmichael/viafabricplus/definition/model/KeyPairResponse1_19_0.java similarity index 62% rename from src/main/java/de/florianmichael/viafabricplus/definition/classic/model/WeatherTypes.java rename to src/main/java/de/florianmichael/viafabricplus/definition/model/KeyPairResponse1_19_0.java index cc6010673..0eda0f044 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/classic/model/WeatherTypes.java +++ b/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 . */ -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) { } diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/tracker/bedrock/JoinGameTracker.java b/src/main/java/de/florianmichael/viafabricplus/definition/tracker/JoinGameTracker.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/definition/tracker/bedrock/JoinGameTracker.java rename to src/main/java/de/florianmichael/viafabricplus/definition/tracker/JoinGameTracker.java index b8736fb1e..4ec936233 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/tracker/bedrock/JoinGameTracker.java +++ b/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 . */ -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; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/event/ChangeProtocolVersionCallback.java b/src/main/java/de/florianmichael/viafabricplus/event/ChangeProtocolVersionCallback.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/base/event/ChangeProtocolVersionCallback.java rename to src/main/java/de/florianmichael/viafabricplus/event/ChangeProtocolVersionCallback.java index 416bc2b25..eeef74f51 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/event/ChangeProtocolVersionCallback.java +++ b/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 . */ -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; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/event/DisconnectConnectionCallback.java b/src/main/java/de/florianmichael/viafabricplus/event/DisconnectConnectionCallback.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/base/event/DisconnectConnectionCallback.java rename to src/main/java/de/florianmichael/viafabricplus/event/DisconnectConnectionCallback.java index 62b889cfc..1bf7196d5 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/event/DisconnectConnectionCallback.java +++ b/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 . */ -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; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/event/FinishMinecraftLoadCallback.java b/src/main/java/de/florianmichael/viafabricplus/event/FinishMinecraftLoadCallback.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/base/event/FinishMinecraftLoadCallback.java rename to src/main/java/de/florianmichael/viafabricplus/event/FinishMinecraftLoadCallback.java index d4aa9fb86..0dc4fa539 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/event/FinishMinecraftLoadCallback.java +++ b/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 . */ -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; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/event/FinishViaVersionStartupCallback.java b/src/main/java/de/florianmichael/viafabricplus/event/FinishViaVersionStartupCallback.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/base/event/FinishViaVersionStartupCallback.java rename to src/main/java/de/florianmichael/viafabricplus/event/FinishViaVersionStartupCallback.java index 184124f31..d7ee35b11 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/event/FinishViaVersionStartupCallback.java +++ b/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 . */ -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; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/event/InitializeSettingsCallback.java b/src/main/java/de/florianmichael/viafabricplus/event/InitializeSettingsCallback.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/base/event/InitializeSettingsCallback.java rename to src/main/java/de/florianmichael/viafabricplus/event/InitializeSettingsCallback.java index 9e1939c61..ceb50a223 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/event/InitializeSettingsCallback.java +++ b/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 . */ -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; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/event/LoadClassicProtocolExtensionCallback.java b/src/main/java/de/florianmichael/viafabricplus/event/LoadClassicProtocolExtensionCallback.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/base/event/LoadClassicProtocolExtensionCallback.java rename to src/main/java/de/florianmichael/viafabricplus/event/LoadClassicProtocolExtensionCallback.java index 58198f9d5..34775217f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/event/LoadClassicProtocolExtensionCallback.java +++ b/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 . */ -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; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/event/PreLoadCallback.java b/src/main/java/de/florianmichael/viafabricplus/event/PreLoadCallback.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/base/event/PreLoadCallback.java rename to src/main/java/de/florianmichael/viafabricplus/event/PreLoadCallback.java index 9059a475f..5ad4696a8 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/event/PreLoadCallback.java +++ b/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 . */ -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; diff --git a/src/main/java/de/florianmichael/viafabricplus/information/impl/BedrockInformation.java b/src/main/java/de/florianmichael/viafabricplus/information/impl/BedrockInformation.java index f0101b0d6..0811750ee 100644 --- a/src/main/java/de/florianmichael/viafabricplus/information/impl/BedrockInformation.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinAddServerScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinAddServerScreen.java index 57eb108d4..57f3a8edc 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinAddServerScreen.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientConnection.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientConnection.java index dcbdac04c..d4339673e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientConnection.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinConnectScreen_1.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinConnectScreen_1.java index 185a29a8a..5548b256e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinConnectScreen_1.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinDebugHud.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinDebugHud.java index f4f635b76..14e106836 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinDebugHud.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinDownloadingTerrainScreenAndConnectScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinDownloadingTerrainScreenAndConnectScreen.java index 6626254c4..141a92c07 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinDownloadingTerrainScreenAndConnectScreen.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMinecraftClient.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMinecraftClient.java index e2e1437e8..888021baa 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMinecraftClient.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerScreen.java index f258e1cf3..5ee66efe1 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerScreen.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerServerListWidget_ServerEntry.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerServerListWidget_ServerEntry.java index 208be1ee4..f57aad111 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerServerListWidget_ServerEntry.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinOptionsScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinOptionsScreen.java index 13bd449e1..c6dca6f8a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinOptionsScreen.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinSharedConstants.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinSharedConstants.java index 207f93a03..2ea5fe5a1 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinSharedConstants.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/sodium/MixinChunkTracker.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/sodium/MixinChunkTracker.java index bf178276a..4be960ca5 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/sodium/MixinChunkTracker.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java index 602cd6e1f..c31573566 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinBipedEntityModel.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinBipedEntityModel.java index 63527b387..9e4d7ba46 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinBipedEntityModel.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java index 09ff94be6..171e44094 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java index 6b87ebed8..3899d75da 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.java index c3717f380..e75d1c4c7 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinItemRenderer.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinItemRenderer.java index 13c1a3359..0e9a8b410 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinItemRenderer.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java index 46d15c6c4..a151a6480 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java +++ b/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; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPendingUpdateManager.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPendingUpdateManager.java index fa4d48f60..7bb49fbb6 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPendingUpdateManager.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPendingUpdateManager.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.network.PendingUpdateManager; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java index d6873eeb9..1365a827a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; -import de.florianmichael.viafabricplus.base.settings.groups.DebugSettings; +import de.florianmichael.viafabricplus.settings.impl.DebugSettings; import net.minecraft.block.AbstractBlock; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java index 3e4105335..5c8a4dc05 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java @@ -1,6 +1,6 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; -import de.florianmichael.viafabricplus.base.settings.groups.ExperimentalSettings; +import de.florianmichael.viafabricplus.settings.impl.ExperimentalSettings; import de.florianmichael.viafabricplus.definition.EntityHeightOffsetsPre1_20_2; import de.florianmichael.viafabricplus.injection.access.IBoatEntity; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java index 4a4f7bc74..b30e161f0 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java @@ -21,9 +21,9 @@ import de.florianmichael.viafabricplus.definition.ClientsideFixes; import net.minecraft.world.GameMode; import net.raphimc.vialoader.util.VersionEnum; -import de.florianmichael.viafabricplus.base.settings.groups.DebugSettings; +import de.florianmichael.viafabricplus.settings.impl.DebugSettings; import de.florianmichael.viafabricplus.injection.access.IClientPlayerEntity; -import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings; +import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.client.MinecraftClient; import net.minecraft.client.input.Input; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java index acebbc2ad..93d315961 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java @@ -18,7 +18,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.google.common.collect.ImmutableMap; -import de.florianmichael.viafabricplus.definition.boat.BoatModel_1_8; +import de.florianmichael.viafabricplus.definition.model.BoatModel_1_8; import net.minecraft.client.model.TexturedModelData; import net.minecraft.client.render.entity.model.EntityModelLayer; import net.minecraft.client.render.entity.model.EntityModels; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java index bbf49fef1..076f4bfb0 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java @@ -17,8 +17,8 @@ */ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; -import de.florianmichael.viafabricplus.base.settings.groups.ExperimentalSettings; -import de.florianmichael.viafabricplus.definition.boat.BoatRenderer_1_8; +import de.florianmichael.viafabricplus.settings.impl.ExperimentalSettings; +import de.florianmichael.viafabricplus.definition.BoatRenderer_1_8; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.EntityRenderer; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java index 97339454f..f537545c0 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java @@ -18,7 +18,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.llamalad7.mixinextras.injector.WrapWithCondition; -import de.florianmichael.viafabricplus.base.settings.groups.ExperimentalSettings; +import de.florianmichael.viafabricplus.settings.impl.ExperimentalSettings; import de.florianmichael.viafabricplus.definition.EntityHeightOffsetsPre1_20_2; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.block.BlockState; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java index c3cdd3856..1e12239fd 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java @@ -20,7 +20,7 @@ import net.minecraft.entity.*; import net.minecraft.util.Hand; import net.raphimc.vialoader.util.VersionEnum; -import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings; +import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.PlayerAbilities; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinKeyboard.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinKeyboard.java index 351d9c37a..48de8069c 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinKeyboard.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinKeyboard.java @@ -18,9 +18,8 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.input; import net.raphimc.vialoader.util.VersionEnum; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.viafabricplus.injection.access.IMinecraftClient; -import de.florianmichael.viafabricplus.base.settings.groups.DebugSettings; +import de.florianmichael.viafabricplus.settings.impl.DebugSettings; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.client.Keyboard; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinMouse.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinMouse.java index ba2a3d210..b44254f00 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinMouse.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinMouse.java @@ -18,7 +18,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.input; import de.florianmichael.viafabricplus.injection.access.IMinecraftClient; -import de.florianmichael.viafabricplus.base.settings.groups.DebugSettings; +import de.florianmichael.viafabricplus.settings.impl.DebugSettings; import net.minecraft.client.MinecraftClient; import net.minecraft.client.Mouse; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java index 2e2783277..f81e48bb7 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java @@ -23,7 +23,7 @@ */ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; -import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings; +import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import net.minecraft.util.Arm; import net.raphimc.vialoader.util.VersionEnum; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java index 80a1fb3ce..90b410b50 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; -import de.florianmichael.viafabricplus.base.settings.groups.DebugSettings; +import de.florianmichael.viafabricplus.settings.impl.DebugSettings; import net.minecraft.entity.player.ItemCooldownManager; import net.minecraft.item.Item; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java index 00f8e42f9..736ab9e6a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java @@ -18,7 +18,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import de.florianmichael.viafabricplus.mappings.ItemReleaseVersionMappings; -import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings; +import de.florianmichael.viafabricplus.settings.impl.GeneralSettings; import net.minecraft.client.MinecraftClient; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java index 42a52b536..3a18022ae 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; -import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings; +import de.florianmichael.viafabricplus.settings.impl.GeneralSettings; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroups; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java index 92b1bcd7e..ef14b01a6 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java @@ -20,8 +20,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.raphimc.vialoader.util.VersionEnum; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import de.florianmichael.viafabricplus.base.settings.groups.DebugSettings; +import de.florianmichael.viafabricplus.settings.impl.DebugSettings; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; @@ -33,7 +32,6 @@ import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.injection.*; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.util.OptionalDouble; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java index ecdc5c02d..a46f6ccc8 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java @@ -19,19 +19,15 @@ import com.llamalad7.mixinextras.injector.WrapWithCondition; import de.florianmichael.viafabricplus.ViaFabricPlus; -import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings; +import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import de.florianmichael.viafabricplus.injection.access.IBoatEntity; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; -import net.minecraft.client.ClientBrandRetriever; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.DownloadingTerrainScreen; import net.minecraft.client.network.*; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.vehicle.BoatEntity; import net.minecraft.network.ClientConnection; -import net.minecraft.network.packet.BrandCustomPayload; -import net.minecraft.network.packet.c2s.common.ClientOptionsC2SPacket; -import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket; import net.minecraft.network.packet.s2c.play.*; import net.raphimc.vialoader.util.VersionEnum; import org.slf4j.Logger; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatHud.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatHud.java index 961b47ef2..e96355432 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatHud.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatHud.java @@ -19,7 +19,7 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings; +import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import net.minecraft.client.gui.hud.ChatHud; import net.minecraft.client.gui.hud.ChatHudLine; import net.minecraft.client.gui.hud.MessageIndicator; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java index bcd880602..8846b2e5f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; -import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings; +import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import de.florianmichael.viafabricplus.definition.ClientsideFixes; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.hud.ChatHud; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java index aea8e06eb..450ca3eee 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; -import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings; +import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import net.minecraft.block.entity.CommandBlockBlockEntity; import net.minecraft.client.gui.screen.ingame.CommandBlockScreen; import net.minecraft.client.gui.widget.CyclingButtonWidget; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java index 29e5d1bcd..666272135 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java @@ -29,7 +29,7 @@ import de.florianmichael.viafabricplus.injection.access.IPublicKeyData; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider; -import de.florianmichael.viafabricplus.base.settings.groups.AuthenticationSettings; +import de.florianmichael.viafabricplus.settings.impl.AuthenticationSettings; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ConnectScreen; import net.minecraft.client.network.ServerAddress; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java index 4a0a99810..454423210 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java @@ -17,8 +17,8 @@ */ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; -import de.florianmichael.viafabricplus.screen.ClassicItemSelectionScreen; -import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings; +import de.florianmichael.viafabricplus.definition.classic.screen.ClassicItemSelectionScreen; +import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java index 038114f07..e160f986b 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; -import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings; +import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import net.minecraft.block.entity.JigsawBlockEntity; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; @@ -25,7 +25,6 @@ import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.gui.widget.CyclingButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/merchant/MixinMerchantScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/merchant/MixinMerchantScreen.java index 4384b1ab2..119f760f7 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/merchant/MixinMerchantScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/merchant/MixinMerchantScreen.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.merchant; -import de.florianmichael.viafabricplus.base.settings.groups.DebugSettings; +import de.florianmichael.viafabricplus.settings.impl.DebugSettings; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.gui.screen.ingame.MerchantScreen; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viabedrock/MixinBedrockProtocol.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viabedrock/MixinBedrockProtocol.java index 5947aa50b..936739659 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viabedrock/MixinBedrockProtocol.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viabedrock/MixinBedrockProtocol.java @@ -18,7 +18,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.viabedrock; import com.viaversion.viaversion.api.connection.UserConnection; -import de.florianmichael.viafabricplus.definition.tracker.bedrock.JoinGameTracker; +import de.florianmichael.viafabricplus.definition.tracker.JoinGameTracker; import net.raphimc.viabedrock.protocol.BedrockProtocol; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viabedrock/MixinJoinPackets.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viabedrock/MixinJoinPackets.java index 7ed9d5d6e..27428d522 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viabedrock/MixinJoinPackets.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viabedrock/MixinJoinPackets.java @@ -19,7 +19,7 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import de.florianmichael.viafabricplus.definition.tracker.bedrock.JoinGameTracker; +import de.florianmichael.viafabricplus.definition.tracker.JoinGameTracker; import net.raphimc.viabedrock.protocol.packets.JoinPackets; import net.raphimc.viabedrock.protocol.types.primitive.LongLEType; import net.raphimc.viabedrock.protocol.types.primitive.StringType; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinExtensionProtocolMetadataStorage.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinExtensionProtocolMetadataStorage.java index 97c174b2b..00d8da6af 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinExtensionProtocolMetadataStorage.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinExtensionProtocolMetadataStorage.java @@ -18,7 +18,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.vialegacy; import de.florianmichael.viafabricplus.injection.access.IExtensionProtocolMetadataStorage; -import de.florianmichael.viafabricplus.base.event.LoadClassicProtocolExtensionCallback; +import de.florianmichael.viafabricplus.event.LoadClassicProtocolExtensionCallback; import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension; import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30toc0_30cpe.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30toc0_30cpe.java index df7fe7188..e78d5b307 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30toc0_30cpe.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30toc0_30cpe.java @@ -24,7 +24,6 @@ import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4; import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.Protocol1_19_4To1_19_3; import de.florianmichael.viafabricplus.definition.classic.CustomClassicProtocolExtensions; -import de.florianmichael.viafabricplus.definition.classic.model.WeatherTypes; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.ClientboundPacketsc0_28; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.ServerboundPacketsc0_28; import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.ClientboundPacketsc0_30cpe; @@ -48,14 +47,14 @@ public void register() { final byte weatherType = wrapper.read(Type.BYTE); final PacketWrapper changeRainState = PacketWrapper.create(ClientboundPackets1_19_4.GAME_EVENT, wrapper.user()); - changeRainState.write(Type.BYTE, weatherType == WeatherTypes.SUNNY ? (byte) 2 : (byte) 1); // start raining + changeRainState.write(Type.BYTE, weatherType == 0 /* sunny */ ? (byte) 2 : (byte) 1); // start raining changeRainState.write(Type.FLOAT, 0F); // unused changeRainState.send(Protocol1_19_4To1_19_3.class); - if (weatherType == WeatherTypes.RAINING || weatherType == WeatherTypes.SNOWING) { + if (weatherType == 1 /* raining */ || weatherType == 2 /* snowing */) { final PacketWrapper changeRainType = PacketWrapper.create(ClientboundPackets1_19_4.GAME_EVENT, wrapper.user()); changeRainType.write(Type.BYTE, (byte) 7); - changeRainType.write(Type.FLOAT, weatherType == WeatherTypes.RAINING ? 0F : 1F); + changeRainType.write(Type.FLOAT, weatherType == 1 /* raining */ ? 0F : 1F); changeRainType.send(Protocol1_19_4To1_19_3.class); } }); diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinViaLegacyConfig.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinViaLegacyConfig.java index b6e925e67..7e0333328 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinViaLegacyConfig.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinViaLegacyConfig.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.injection.mixin.fixes.vialegacy; -import de.florianmichael.viafabricplus.base.settings.groups.AuthenticationSettings; +import de.florianmichael.viafabricplus.settings.impl.AuthenticationSettings; import net.raphimc.vialegacy.ViaLegacyConfig; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/de/florianmichael/viafabricplus/mappings/ItemReleaseVersionMappings.java b/src/main/java/de/florianmichael/viafabricplus/mappings/ItemReleaseVersionMappings.java index 35c09fc65..60acb4eb5 100644 --- a/src/main/java/de/florianmichael/viafabricplus/mappings/ItemReleaseVersionMappings.java +++ b/src/main/java/de/florianmichael/viafabricplus/mappings/ItemReleaseVersionMappings.java @@ -19,7 +19,7 @@ import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.raphimc.vialoader.util.VersionEnum; -import de.florianmichael.viafabricplus.base.event.ChangeProtocolVersionCallback; +import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback; import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.registry.Registries; diff --git a/src/main/java/de/florianmichael/viafabricplus/protocolhack/ProtocolHack.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/ProtocolHack.java index 7a16a0d6b..0d8b686a9 100644 --- a/src/main/java/de/florianmichael/viafabricplus/protocolhack/ProtocolHack.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/ProtocolHack.java @@ -27,8 +27,8 @@ import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.storage.InventoryTracker1_16; import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.storage.ConfigurationState; import de.florianmichael.viafabricplus.ViaFabricPlus; -import de.florianmichael.viafabricplus.base.event.ChangeProtocolVersionCallback; -import de.florianmichael.viafabricplus.base.event.FinishViaVersionStartupCallback; +import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback; +import de.florianmichael.viafabricplus.event.FinishViaVersionStartupCallback; import de.florianmichael.viafabricplus.injection.access.IServerInfo; import de.florianmichael.viafabricplus.protocolhack.command.ViaFabricPlusVLCommandHandler; import de.florianmichael.viafabricplus.protocolhack.impl.ViaFabricPlusVLInjector; diff --git a/src/main/java/de/florianmichael/viafabricplus/protocolhack/impl/ViaFabricPlusVLViaConfig.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/impl/ViaFabricPlusVLViaConfig.java index a13900780..38364d7af 100644 --- a/src/main/java/de/florianmichael/viafabricplus/protocolhack/impl/ViaFabricPlusVLViaConfig.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/impl/ViaFabricPlusVLViaConfig.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.protocolhack.impl; -import de.florianmichael.viafabricplus.base.settings.groups.ExperimentalSettings; +import de.florianmichael.viafabricplus.settings.impl.ExperimentalSettings; import net.raphimc.vialoader.impl.viaversion.VLViaConfig; import java.io.File; diff --git a/src/main/java/de/florianmichael/viafabricplus/protocolhack/netty/viaversion/ViaFabricPlusViaDecoder.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/netty/viaversion/ViaFabricPlusViaDecoder.java index 3b601b22a..5470ce02d 100644 --- a/src/main/java/de/florianmichael/viafabricplus/protocolhack/netty/viaversion/ViaFabricPlusViaDecoder.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/netty/viaversion/ViaFabricPlusViaDecoder.java @@ -19,7 +19,7 @@ import com.viaversion.viaversion.api.connection.UserConnection; import de.florianmichael.viafabricplus.ViaFabricPlus; -import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings; +import de.florianmichael.viafabricplus.settings.impl.GeneralSettings; import de.florianmichael.viafabricplus.util.ChatUtil; import io.netty.channel.ChannelHandlerContext; import net.minecraft.text.Text; diff --git a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viabedrock/ViaFabricPlusTransferProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viabedrock/ViaFabricPlusTransferProvider.java index 182533941..5256b210f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viabedrock/ViaFabricPlusTransferProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viabedrock/ViaFabricPlusTransferProvider.java @@ -18,7 +18,7 @@ package de.florianmichael.viafabricplus.protocolhack.provider.viabedrock; import com.viaversion.viaversion.api.connection.UserConnection; -import de.florianmichael.viafabricplus.base.settings.groups.BedrockSettings; +import de.florianmichael.viafabricplus.settings.impl.BedrockSettings; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.ConnectScreen; diff --git a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java index 30c56fe45..678e0f6f9 100644 --- a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java @@ -21,7 +21,7 @@ import de.florianmichael.classic4j.BetaCraftHandler; import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.integration.Classic4JImpl; -import de.florianmichael.viafabricplus.base.settings.groups.AuthenticationSettings; +import de.florianmichael.viafabricplus.settings.impl.AuthenticationSettings; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicMPPassProvider; import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.storage.HandshakeStorage; diff --git a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusOldAuthProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusOldAuthProvider.java index abcffa416..2e8ff68a1 100644 --- a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusOldAuthProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusOldAuthProvider.java @@ -20,11 +20,10 @@ import com.viaversion.viaversion.api.connection.UserConnection; import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; -import de.florianmichael.viafabricplus.base.settings.groups.AuthenticationSettings; +import de.florianmichael.viafabricplus.settings.impl.AuthenticationSettings; import de.florianmichael.viafabricplus.util.ChatUtil; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; -import net.minecraft.util.Formatting; import net.raphimc.vialegacy.protocols.release.protocol1_3_1_2to1_2_4_5.providers.OldAuthProvider; public class ViaFabricPlusOldAuthProvider extends OldAuthProvider { diff --git a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusBaseVersionProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusBaseVersionProvider.java index 60d91d798..87a2c9925 100644 --- a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusBaseVersionProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusBaseVersionProvider.java @@ -24,7 +24,7 @@ import com.viaversion.viaversion.protocols.base.BaseVersionProvider; import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; -import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings; +import de.florianmichael.viafabricplus.settings.impl.GeneralSettings; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; import io.netty.channel.epoll.Epoll; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/ViaJarReplacer.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/util/ViaJarReplacer.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/base/ViaJarReplacer.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/util/ViaJarReplacer.java index 4ba61ad19..2d9626e75 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/ViaJarReplacer.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/util/ViaJarReplacer.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base; +package de.florianmichael.viafabricplus.protocolhack.util; import de.florianmichael.viafabricplus.ViaFabricPlus; import net.lenni0451.reflect.ClassLoaders; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/screen/MappedSlotEntry.java b/src/main/java/de/florianmichael/viafabricplus/screen/MappedSlotEntry.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/base/screen/MappedSlotEntry.java rename to src/main/java/de/florianmichael/viafabricplus/screen/MappedSlotEntry.java index c5b8bdf00..2c2f6ba60 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/screen/MappedSlotEntry.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/MappedSlotEntry.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.screen; +package de.florianmichael.viafabricplus.screen; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/screen/VFPScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/VFPScreen.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/base/screen/VFPScreen.java rename to src/main/java/de/florianmichael/viafabricplus/screen/VFPScreen.java index 02078f2a4..7549b3c0b 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/screen/VFPScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/VFPScreen.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.screen; +package de.florianmichael.viafabricplus.screen; import com.mojang.blaze3d.systems.RenderSystem; import de.florianmichael.viafabricplus.ViaFabricPlus; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/BetaCraftScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/BetaCraftScreen.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/BetaCraftScreen.java rename to src/main/java/de/florianmichael/viafabricplus/screen/classic4j/BetaCraftScreen.java index 6d215754a..2bc9538cf 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/BetaCraftScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/BetaCraftScreen.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.screen.thirdparty; +package de.florianmichael.viafabricplus.screen.classic4j; import de.florianmichael.classic4j.model.betacraft.BCServerInfoSpec; import de.florianmichael.classic4j.model.betacraft.BCServerList; import de.florianmichael.classic4j.model.betacraft.BCVersionCategory; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; -import de.florianmichael.viafabricplus.base.screen.VFPScreen; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.screen.VFPScreen; import de.florianmichael.viafabricplus.screen.settings.settingrenderer.meta.TitleRenderer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeLoginScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/classicube/ClassiCubeLoginScreen.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeLoginScreen.java rename to src/main/java/de/florianmichael/viafabricplus/screen/classic4j/classicube/ClassiCubeLoginScreen.java index 963a0f39a..e0f8fe41b 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeLoginScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/classicube/ClassiCubeLoginScreen.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.screen.thirdparty.classicube; +package de.florianmichael.viafabricplus.screen.classic4j.classicube; import com.mojang.blaze3d.systems.RenderSystem; import de.florianmichael.classic4j.ClassiCubeHandler; import de.florianmichael.classic4j.api.LoginProcessHandler; import de.florianmichael.classic4j.model.classicube.account.CCAccount; -import de.florianmichael.viafabricplus.base.screen.VFPScreen; +import de.florianmichael.viafabricplus.screen.VFPScreen; import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler; -import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen; +import de.florianmichael.viafabricplus.screen.common.ProtocolSelectionScreen; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ConfirmLinkScreen; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeMFAScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/classicube/ClassiCubeMFAScreen.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeMFAScreen.java rename to src/main/java/de/florianmichael/viafabricplus/screen/classic4j/classicube/ClassiCubeMFAScreen.java index 530d4a912..6c7f3323f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeMFAScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/classicube/ClassiCubeMFAScreen.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.screen.thirdparty.classicube; +package de.florianmichael.viafabricplus.screen.classic4j.classicube; import com.mojang.blaze3d.systems.RenderSystem; import de.florianmichael.classic4j.ClassiCubeHandler; import de.florianmichael.classic4j.api.LoginProcessHandler; import de.florianmichael.classic4j.model.classicube.CCError; import de.florianmichael.classic4j.model.classicube.account.CCAccount; -import de.florianmichael.viafabricplus.base.screen.VFPScreen; +import de.florianmichael.viafabricplus.screen.VFPScreen; import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler; import de.florianmichael.viafabricplus.integration.Classic4JImpl; -import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen; +import de.florianmichael.viafabricplus.screen.common.ProtocolSelectionScreen; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeServerListScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/classicube/ClassiCubeServerListScreen.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeServerListScreen.java rename to src/main/java/de/florianmichael/viafabricplus/screen/classic4j/classicube/ClassiCubeServerListScreen.java index 1f7baf295..9d4b4bf25 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeServerListScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/classicube/ClassiCubeServerListScreen.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.screen.thirdparty.classicube; +package de.florianmichael.viafabricplus.screen.classic4j.classicube; import com.mojang.blaze3d.systems.RenderSystem; import de.florianmichael.classic4j.ClassiCubeHandler; import de.florianmichael.classic4j.api.LoginProcessHandler; import de.florianmichael.classic4j.model.classicube.server.CCServerInfo; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; -import de.florianmichael.viafabricplus.base.screen.VFPScreen; -import de.florianmichael.viafabricplus.base.settings.groups.AuthenticationSettings; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.screen.VFPScreen; +import de.florianmichael.viafabricplus.settings.impl.AuthenticationSettings; import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler; import de.florianmichael.viafabricplus.injection.access.IServerInfo; import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider; -import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen; +import de.florianmichael.viafabricplus.screen.common.ProtocolSelectionScreen; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/base/ForceVersionScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/common/ForceVersionScreen.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/screen/base/ForceVersionScreen.java rename to src/main/java/de/florianmichael/viafabricplus/screen/common/ForceVersionScreen.java index 8f73b3f41..935ae5ace 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/base/ForceVersionScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/common/ForceVersionScreen.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.screen.base; +package de.florianmichael.viafabricplus.screen.common; -import de.florianmichael.viafabricplus.base.screen.VFPScreen; +import de.florianmichael.viafabricplus.screen.VFPScreen; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/base/ProtocolSelectionScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/common/ProtocolSelectionScreen.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/screen/base/ProtocolSelectionScreen.java rename to src/main/java/de/florianmichael/viafabricplus/screen/common/ProtocolSelectionScreen.java index a91642796..1c60df6fe 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/base/ProtocolSelectionScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/common/ProtocolSelectionScreen.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.screen.base; +package de.florianmichael.viafabricplus.screen.common; import de.florianmichael.classic4j.BetaCraftHandler; -import de.florianmichael.viafabricplus.base.screen.VFPScreen; +import de.florianmichael.viafabricplus.screen.VFPScreen; import de.florianmichael.viafabricplus.definition.account.ClassiCubeAccountHandler; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.viafabricplus.screen.settings.SettingsScreen; -import de.florianmichael.viafabricplus.screen.thirdparty.BetaCraftScreen; -import de.florianmichael.viafabricplus.screen.thirdparty.classicube.ClassiCubeLoginScreen; -import de.florianmichael.viafabricplus.screen.thirdparty.classicube.ClassiCubeServerListScreen; +import de.florianmichael.viafabricplus.screen.classic4j.BetaCraftScreen; +import de.florianmichael.viafabricplus.screen.classic4j.classicube.ClassiCubeLoginScreen; +import de.florianmichael.viafabricplus.screen.classic4j.classicube.ClassiCubeServerListScreen; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; @@ -54,7 +54,6 @@ protected void init() { this.addDrawableChild(ButtonWidget.builder(Text.translatable("misc.viafabricplus.settings"), button -> SettingsScreen.INSTANCE.open(this)).position(width - 98 - 5, 5).size(98, 20).build()); // ClassiCube - final boolean loggedIn = ClassiCubeAccountHandler.INSTANCE.getAccount() != null; ButtonWidget.Builder classiCubeBuilder = ButtonWidget.builder(Text.literal("ClassiCube"), button -> { @@ -70,7 +69,6 @@ protected void init() { this.addDrawableChild(classiCubeBuilder.build()); // BetaCraft - ButtonWidget.Builder betaCraftBuilder = ButtonWidget.builder(Text.literal("BetaCraft"), button -> { if (BetaCraftScreen.SERVER_LIST == null) { betaCraftButton = button; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java index f6e1032f2..fd070d7ca 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java @@ -18,10 +18,10 @@ package de.florianmichael.viafabricplus.screen.settings; import de.florianmichael.viafabricplus.ViaFabricPlus; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; -import de.florianmichael.viafabricplus.base.screen.VFPScreen; -import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.screen.VFPScreen; +import de.florianmichael.viafabricplus.settings.AbstractSetting; +import de.florianmichael.viafabricplus.settings.SettingGroup; import de.florianmichael.viafabricplus.screen.settings.settingrenderer.meta.TitleRenderer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/BooleanSettingRenderer.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/BooleanSettingRenderer.java index b383b2b39..df821b3b9 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/BooleanSettingRenderer.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/BooleanSettingRenderer.java @@ -17,8 +17,8 @@ */ package de.florianmichael.viafabricplus.screen.settings.settingrenderer; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; -import de.florianmichael.viafabricplus.base.settings.type_impl.BooleanSetting; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.settings.type.BooleanSetting; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ButtonSettingRenderer.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ButtonSettingRenderer.java index 3acb7a795..10d4a4964 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ButtonSettingRenderer.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ButtonSettingRenderer.java @@ -17,8 +17,8 @@ */ package de.florianmichael.viafabricplus.screen.settings.settingrenderer; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; -import de.florianmichael.viafabricplus.base.settings.type_impl.ButtonSetting; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.settings.type.ButtonSetting; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ModeSettingRenderer.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ModeSettingRenderer.java index b8006333c..6c003484e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ModeSettingRenderer.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ModeSettingRenderer.java @@ -17,8 +17,8 @@ */ package de.florianmichael.viafabricplus.screen.settings.settingrenderer; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; -import de.florianmichael.viafabricplus.base.settings.type_impl.ModeSetting; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.settings.type.ModeSetting; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java index 812b40a3f..51f7d3c58 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java @@ -17,8 +17,8 @@ */ package de.florianmichael.viafabricplus.screen.settings.settingrenderer; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; -import de.florianmichael.viafabricplus.base.settings.type_impl.ProtocolSyncBooleanSetting; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.settings.type.ProtocolSyncBooleanSetting; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/meta/TitleRenderer.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/meta/TitleRenderer.java index e9da1854c..ca2c76197 100644 --- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/meta/TitleRenderer.java +++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/meta/TitleRenderer.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.screen.settings.settingrenderer.meta; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/base/AbstractSetting.java b/src/main/java/de/florianmichael/viafabricplus/settings/AbstractSetting.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/base/AbstractSetting.java rename to src/main/java/de/florianmichael/viafabricplus/settings/AbstractSetting.java index eee8a75c2..295519428 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/base/AbstractSetting.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/AbstractSetting.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.base; +package de.florianmichael.viafabricplus.settings; import com.google.gson.JsonObject; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; import net.minecraft.text.MutableText; import net.minecraft.text.TranslatableTextContent; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/base/SettingGroup.java b/src/main/java/de/florianmichael/viafabricplus/settings/SettingGroup.java similarity index 93% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/base/SettingGroup.java rename to src/main/java/de/florianmichael/viafabricplus/settings/SettingGroup.java index abbc70af8..28ca904cc 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/base/SettingGroup.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/SettingGroup.java @@ -15,10 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.base; +package de.florianmichael.viafabricplus.settings; import java.util.ArrayList; import java.util.List; + +import de.florianmichael.viafabricplus.settings.AbstractSetting; import net.minecraft.text.Text; /** diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/SettingsSystem.java b/src/main/java/de/florianmichael/viafabricplus/settings/SettingsSystem.java similarity index 89% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/SettingsSystem.java rename to src/main/java/de/florianmichael/viafabricplus/settings/SettingsSystem.java index 501cdbd7c..b23077710 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/SettingsSystem.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/SettingsSystem.java @@ -15,13 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings; +package de.florianmichael.viafabricplus.settings; import com.google.gson.JsonObject; -import de.florianmichael.viafabricplus.base.event.InitializeSettingsCallback; -import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; -import de.florianmichael.viafabricplus.base.settings.groups.*; +import de.florianmichael.viafabricplus.event.InitializeSettingsCallback; +import de.florianmichael.viafabricplus.settings.impl.*; import de.florianmichael.viafabricplus.util.FileSaver; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.raphimc.vialoader.util.VersionEnum; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/AuthenticationSettings.java b/src/main/java/de/florianmichael/viafabricplus/settings/impl/AuthenticationSettings.java similarity index 90% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/groups/AuthenticationSettings.java rename to src/main/java/de/florianmichael/viafabricplus/settings/impl/AuthenticationSettings.java index 8e43ff12d..dfa6ee661 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/AuthenticationSettings.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/impl/AuthenticationSettings.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.groups; +package de.florianmichael.viafabricplus.settings.impl; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; -import de.florianmichael.viafabricplus.base.settings.type_impl.BooleanSetting; +import de.florianmichael.viafabricplus.settings.SettingGroup; +import de.florianmichael.viafabricplus.settings.type.BooleanSetting; import net.minecraft.text.Text; public class AuthenticationSettings extends SettingGroup { diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/BedrockSettings.java b/src/main/java/de/florianmichael/viafabricplus/settings/impl/BedrockSettings.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/groups/BedrockSettings.java rename to src/main/java/de/florianmichael/viafabricplus/settings/impl/BedrockSettings.java index 349ae80f3..c02b6bc5f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/BedrockSettings.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/impl/BedrockSettings.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.groups; +package de.florianmichael.viafabricplus.settings.impl; import com.mojang.blaze3d.systems.RenderSystem; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; -import de.florianmichael.viafabricplus.base.settings.type_impl.BooleanSetting; -import de.florianmichael.viafabricplus.base.settings.type_impl.ButtonSetting; +import de.florianmichael.viafabricplus.settings.SettingGroup; +import de.florianmichael.viafabricplus.settings.type.BooleanSetting; +import de.florianmichael.viafabricplus.settings.type.ButtonSetting; import de.florianmichael.viafabricplus.definition.account.BedrockAccountHandler; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ConfirmScreen; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/DebugSettings.java b/src/main/java/de/florianmichael/viafabricplus/settings/impl/DebugSettings.java similarity index 89% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/groups/DebugSettings.java rename to src/main/java/de/florianmichael/viafabricplus/settings/impl/DebugSettings.java index 6670cccbf..80a933918 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/DebugSettings.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/impl/DebugSettings.java @@ -15,16 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.groups; +package de.florianmichael.viafabricplus.settings.impl; import net.raphimc.vialoader.util.VersionEnum; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; -import de.florianmichael.viafabricplus.base.settings.type_impl.ProtocolSyncBooleanSetting; +import de.florianmichael.viafabricplus.settings.SettingGroup; +import de.florianmichael.viafabricplus.settings.type.ProtocolSyncBooleanSetting; import net.minecraft.text.Text; -import net.raphimc.vialoader.util.VersionEnum; -import net.raphimc.vialegacy.api.LegacyProtocolVersion; -import net.raphimc.vialoader.util.VersionEnum; import net.raphimc.vialoader.util.VersionRange; public class DebugSettings extends SettingGroup { diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/ExperimentalSettings.java b/src/main/java/de/florianmichael/viafabricplus/settings/impl/ExperimentalSettings.java similarity index 87% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/groups/ExperimentalSettings.java rename to src/main/java/de/florianmichael/viafabricplus/settings/impl/ExperimentalSettings.java index d6bd19f74..a2997c646 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/ExperimentalSettings.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/impl/ExperimentalSettings.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.groups; +package de.florianmichael.viafabricplus.settings.impl; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; -import de.florianmichael.viafabricplus.base.settings.type_impl.BooleanSetting; +import de.florianmichael.viafabricplus.settings.SettingGroup; +import de.florianmichael.viafabricplus.settings.type.BooleanSetting; import net.minecraft.text.Text; public class ExperimentalSettings extends SettingGroup { diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/GeneralSettings.java b/src/main/java/de/florianmichael/viafabricplus/settings/impl/GeneralSettings.java similarity index 91% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/groups/GeneralSettings.java rename to src/main/java/de/florianmichael/viafabricplus/settings/impl/GeneralSettings.java index 86681e81d..2648a526e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/GeneralSettings.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/impl/GeneralSettings.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.groups; +package de.florianmichael.viafabricplus.settings.impl; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; -import de.florianmichael.viafabricplus.base.settings.type_impl.BooleanSetting; -import de.florianmichael.viafabricplus.base.settings.type_impl.ModeSetting; +import de.florianmichael.viafabricplus.settings.SettingGroup; +import de.florianmichael.viafabricplus.settings.type.BooleanSetting; +import de.florianmichael.viafabricplus.settings.type.ModeSetting; import net.minecraft.text.Text; public class GeneralSettings extends SettingGroup { diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/VisualSettings.java b/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/groups/VisualSettings.java rename to src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java index 876ec3dd0..27e7ddbc8 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/VisualSettings.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.groups; +package de.florianmichael.viafabricplus.settings.impl; import net.raphimc.vialoader.util.VersionEnum; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; -import de.florianmichael.viafabricplus.base.settings.type_impl.ProtocolSyncBooleanSetting; +import de.florianmichael.viafabricplus.settings.SettingGroup; +import de.florianmichael.viafabricplus.settings.type.ProtocolSyncBooleanSetting; import net.minecraft.text.Text; import net.raphimc.vialoader.util.VersionRange; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/BooleanSetting.java b/src/main/java/de/florianmichael/viafabricplus/settings/type/BooleanSetting.java similarity index 85% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/BooleanSetting.java rename to src/main/java/de/florianmichael/viafabricplus/settings/type/BooleanSetting.java index 21095c27e..d803a888f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/BooleanSetting.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/type/BooleanSetting.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.type_impl; +package de.florianmichael.viafabricplus.settings.type; import com.google.gson.JsonObject; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; import de.florianmichael.viafabricplus.screen.settings.settingrenderer.BooleanSettingRenderer; -import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; +import de.florianmichael.viafabricplus.settings.AbstractSetting; +import de.florianmichael.viafabricplus.settings.SettingGroup; import net.minecraft.text.MutableText; public class BooleanSetting extends AbstractSetting { diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ButtonSetting.java b/src/main/java/de/florianmichael/viafabricplus/settings/type/ButtonSetting.java similarity index 84% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ButtonSetting.java rename to src/main/java/de/florianmichael/viafabricplus/settings/type/ButtonSetting.java index 49ba25931..d07582c13 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ButtonSetting.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/type/ButtonSetting.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.type_impl; +package de.florianmichael.viafabricplus.settings.type; import com.google.gson.JsonObject; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; import de.florianmichael.viafabricplus.screen.settings.settingrenderer.ButtonSettingRenderer; -import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; +import de.florianmichael.viafabricplus.settings.AbstractSetting; +import de.florianmichael.viafabricplus.settings.SettingGroup; import net.minecraft.text.MutableText; public class ButtonSetting extends AbstractSetting { diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ModeSetting.java b/src/main/java/de/florianmichael/viafabricplus/settings/type/ModeSetting.java similarity index 88% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ModeSetting.java rename to src/main/java/de/florianmichael/viafabricplus/settings/type/ModeSetting.java index cfa14806e..ebbcacdf6 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ModeSetting.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/type/ModeSetting.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.type_impl; +package de.florianmichael.viafabricplus.settings.type; import com.google.gson.JsonObject; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; import de.florianmichael.viafabricplus.screen.settings.settingrenderer.ModeSettingRenderer; -import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; +import de.florianmichael.viafabricplus.settings.AbstractSetting; +import de.florianmichael.viafabricplus.settings.SettingGroup; import net.minecraft.text.MutableText; import java.util.Arrays; diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ProtocolSyncBooleanSetting.java b/src/main/java/de/florianmichael/viafabricplus/settings/type/ProtocolSyncBooleanSetting.java similarity index 90% rename from src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ProtocolSyncBooleanSetting.java rename to src/main/java/de/florianmichael/viafabricplus/settings/type/ProtocolSyncBooleanSetting.java index 2fc8ca1f9..c91453301 100644 --- a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ProtocolSyncBooleanSetting.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/type/ProtocolSyncBooleanSetting.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.base.settings.type_impl; +package de.florianmichael.viafabricplus.settings.type; import com.google.gson.JsonObject; -import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting; -import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry; +import de.florianmichael.viafabricplus.settings.AbstractSetting; +import de.florianmichael.viafabricplus.screen.MappedSlotEntry; import de.florianmichael.viafabricplus.screen.settings.settingrenderer.ProtocolSyncBooleanSettingRenderer; -import de.florianmichael.viafabricplus.base.settings.base.SettingGroup; +import de.florianmichael.viafabricplus.settings.SettingGroup; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.text.MutableText; import net.raphimc.vialoader.util.VersionRange;