From 9c3bf70cc17017fc5a866de690403ae99193bc8c Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Wed, 15 Mar 2023 17:35:23 +0100 Subject: [PATCH] reordered some classes and packages --- README.md | 3 +- gradle.properties | 2 +- .../viafabricplus/ViaFabricPlus.java | 4 +- .../c0_30/ClassicProgressRenderer.java | 5 +- .../definition/c0_30/command/ICommand.java | 5 +- .../mixin/base/MixinClientConnection.java | 6 +- .../mixin/base/MixinClientConnection_1.java | 22 +- .../base/MixinClientLoginNetworkHandler.java | 4 +- .../MixinMultiplayerServerListPinger.java | 2 +- .../injection/mixin/bridge/MixinDebugHud.java | 20 +- .../MixinBipedEntityModel.java | 2 +- .../fixes/{ => minecraft}/MixinCamera.java | 2 +- .../MixinClientPlayNetworkHandler.java | 2 +- .../MixinClientPlayerInteractionManager.java | 8 +- .../fixes/{ => minecraft}/MixinInGameHud.java | 2 +- .../{ => minecraft}/MixinItemRenderer.java | 2 +- .../{ => minecraft}/MixinMinecraftClient.java | 7 +- .../MixinPendingUpdateManager.java | 2 +- .../MixinPlayerEntityRenderer.java | 2 +- .../MixinPlayerPublicKey_PublicKeyData.java | 2 +- .../{ => minecraft}/MixinProfileKeysImpl.java | 2 +- .../{ => minecraft}/MixinServerAddress.java | 2 +- .../MixinServerResourcePackProvider.java | 2 +- .../{ => minecraft}/MixinStringHelper.java | 2 +- .../block/MixinAbstractBlock.java | 2 +- ...MixinAbstractBlock_AbstractBlockState.java | 2 +- .../block/MixinAnvilBlock.java | 2 +- .../block/MixinBambooBlock.java | 2 +- .../{ => minecraft}/block/MixinBedBlock.java | 2 +- .../{ => minecraft}/block/MixinBlock.java | 2 +- .../{ => minecraft}/block/MixinBlockView.java | 2 +- .../block/MixinBrewingStandBlock.java | 2 +- .../block/MixinCauldronBlock.java | 2 +- .../block/MixinChestBlock.java | 2 +- .../block/MixinEndPortalBlock.java | 2 +- .../block/MixinEndPortalFrameBlock.java | 2 +- .../block/MixinFarmlandBlock.java | 2 +- .../block/MixinFenceBlock.java | 2 +- .../{ => minecraft}/block/MixinFireBlock.java | 2 +- .../block/MixinFlowerPotBlock.java | 2 +- .../block/MixinHopperBlock.java | 2 +- .../block/MixinLadderBlock.java | 2 +- .../block/MixinLightBlock.java | 2 +- .../block/MixinLilyPadBlock.java | 2 +- .../{ => minecraft}/block/MixinPaneBlock.java | 2 +- .../block/MixinPistonHeadBlock.java | 2 +- .../{ => minecraft}/block/MixinSnowBlock.java | 2 +- .../block/MixinSoulSandBlock.java | 2 +- .../block/MixinSugarCaneBlock.java | 2 +- .../{ => minecraft}/block/MixinWallBlock.java | 2 +- .../entity/MixinAbstractDonkeyEntity.java | 2 +- .../entity/MixinAllayEntity.java | 2 +- .../entity/MixinAnimalEntity.java | 2 +- .../entity/MixinClientPlayerEntity.java | 2 +- .../entity/MixinCowEntity.java | 2 +- .../entity/MixinCreeperEntity.java | 2 +- .../{ => minecraft}/entity/MixinEntity.java | 2 +- .../entity/MixinEntityIndex.java | 2 +- .../entity/MixinEntityPredicates.java | 2 +- .../entity/MixinItemEntity.java | 2 +- .../entity/MixinLivingEntity.java | 2 +- .../entity/MixinOtherClientPlayerEntity.java | 2 +- .../entity/MixinPiglinEntity.java | 2 +- .../entity/MixinPlayerEntity.java | 2 +- .../entity/MixinSquidEntity.java | 2 +- .../entity/MixinVexEntity.java | 2 +- .../entity/MixinWolfEntity.java | 7 +- .../{ => minecraft}/input/MixinKeyboard.java | 2 +- .../input/MixinKeyboardInput.java | 2 +- .../{ => minecraft}/input/MixinMouse.java | 2 +- .../{ => minecraft}/item/MixinAxeItem.java | 2 +- .../{ => minecraft}/item/MixinBlockItem.java | 2 +- .../item/MixinEnderPearlItem.java | 2 +- .../item/MixinFireworkRocketItem.java | 2 +- .../item/MixinHeldItemRenderer.java | 2 +- .../{ => minecraft}/item/MixinHoeItem.java | 2 +- .../item/MixinItemCooldownManager.java | 2 +- .../item/MixinItemGroup_EntriesImpl.java | 2 +- .../{ => minecraft}/item/MixinItemGroups.java | 2 +- .../item/MixinItemPlacementContext.java | 2 +- .../{ => minecraft}/item/MixinItemStack.java | 2 +- .../item/MixinMiningToolItem.java | 2 +- .../item/MixinPickaxeItem.java | 2 +- .../{ => minecraft}/item/MixinShovelItem.java | 2 +- .../{ => minecraft}/item/MixinSwordItem.java | 2 +- .../packet/MixinChatMessageC2SPacket.java | 2 +- .../packet/MixinPacketByteBuf.java | 2 +- .../MixinUpdatePlayerAbilitiesC2SPacket.java | 2 +- .../screen/MixinChatScreen.java | 2 +- .../screen/MixinCommandBlockScreen.java | 2 +- .../screen/MixinConnectScreen_1.java | 7 +- .../screen/MixinCreativeInventoryScreen.java | 2 +- .../screen/MixinDownloadingTerrainScreen.java | 2 +- .../screen/MixinGameModeSelectionScreen.java | 2 +- ...ModeSelectionScreen_GameModeSelection.java | 2 +- .../screen/MixinJigsawBlockScreen.java | 2 +- .../screen/MixinStructureBlockScreen_1.java | 2 +- .../screen/hud/MixinBossBarHud_1.java | 2 +- .../screen/hud/MixinChatHud.java | 2 +- .../screen/merchant/MixinMerchantScreen.java | 2 +- .../merchant/MixinMerchantScreenHandler.java | 2 +- ...xinBrewingStandScreenHandler_FuelSlot.java | 2 +- .../MixinPlayerScreenHandler.java | 2 +- .../screenhandler/MixinScreenHandler.java | 2 +- .../ProtocolHack.java} | 22 +- .../constants/BedrockRakNetConstants.java | 2 +- .../constants/PreNettyConstants.java | 2 +- .../platform/ViaAprilFoolsPlatformImpl.java | 2 +- .../platform/ViaBedrockPlatformImpl.java | 2 +- .../platform/ViaLegacyPlatformImpl.java | 2 +- .../viabedrock/DisconnectHandler.java | 2 +- .../viabedrock/PingEncapsulationCodec.java | 2 +- .../RakMessageEncapsulationCodec.java | 2 +- .../viabedrock/RakNetPingSessions.java | 2 +- .../FixedUnconnectedPingEncoder.java | 2 +- .../FixedUnconnectedPongDecoder.java | 2 +- .../vialegacy/VFPPreNettyDecoder.java | 2 +- .../vialegacy/VFPPreNettyEncoder.java | 2 +- ...ViaFabricPlusCommandArgumentsProvider.java | 2 +- .../ViaFabricPlusNettyPipelineProvider.java | 9 +- ...abricPlusClassicCustomCommandProvider.java | 2 +- .../ViaFabricPlusClassicMPPassProvider.java | 2 +- ...aFabricPlusClassicWorldHeightProvider.java | 2 +- .../ViaFabricPlusEncryptionProvider.java | 7 +- .../ViaFabricPlusGameProfileFetcher.java | 2 +- .../ViaFabricPlusOldAuthProvider.java | 7 +- .../ViaFabricPlusHandItemProvider.java | 2 +- ...FabricPlusMovementTransmitterProvider.java | 2 +- .../replacement/VFPVLBViaDecodeHandler.java | 2 +- src/main/resources/viafabricplus.mixins.json | 188 +++++++++--------- 130 files changed, 266 insertions(+), 291 deletions(-) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinBipedEntityModel.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinCamera.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinClientPlayNetworkHandler.java (99%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinClientPlayerInteractionManager.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinInGameHud.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinItemRenderer.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinMinecraftClient.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinPendingUpdateManager.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinPlayerEntityRenderer.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinPlayerPublicKey_PublicKeyData.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinProfileKeysImpl.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinServerAddress.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinServerResourcePackProvider.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/MixinStringHelper.java (94%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinAbstractBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinAbstractBlock_AbstractBlockState.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinAnvilBlock.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinBambooBlock.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinBedBlock.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinBlockView.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinBrewingStandBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinCauldronBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinChestBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinEndPortalBlock.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinEndPortalFrameBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinFarmlandBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinFenceBlock.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinFireBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinFlowerPotBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinHopperBlock.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinLadderBlock.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinLightBlock.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinLilyPadBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinPaneBlock.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinPistonHeadBlock.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinSnowBlock.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinSoulSandBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinSugarCaneBlock.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/block/MixinWallBlock.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinAbstractDonkeyEntity.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinAllayEntity.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinAnimalEntity.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinClientPlayerEntity.java (99%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinCowEntity.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinCreeperEntity.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinEntity.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinEntityIndex.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinEntityPredicates.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinItemEntity.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinLivingEntity.java (99%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinOtherClientPlayerEntity.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinPiglinEntity.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinPlayerEntity.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinSquidEntity.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinVexEntity.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/entity/MixinWolfEntity.java (82%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/input/MixinKeyboard.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/input/MixinKeyboardInput.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/input/MixinMouse.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinAxeItem.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinBlockItem.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinEnderPearlItem.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinFireworkRocketItem.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinHeldItemRenderer.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinHoeItem.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinItemCooldownManager.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinItemGroup_EntriesImpl.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinItemGroups.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinItemPlacementContext.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinItemStack.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinMiningToolItem.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinPickaxeItem.java (99%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinShovelItem.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/item/MixinSwordItem.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/packet/MixinChatMessageC2SPacket.java (94%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/packet/MixinPacketByteBuf.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/packet/MixinUpdatePlayerAbilitiesC2SPacket.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/MixinChatScreen.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/MixinCommandBlockScreen.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/MixinConnectScreen_1.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/MixinCreativeInventoryScreen.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/MixinDownloadingTerrainScreen.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/MixinGameModeSelectionScreen.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/MixinGameModeSelectionScreen_GameModeSelection.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/MixinJigsawBlockScreen.java (97%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/MixinStructureBlockScreen_1.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/hud/MixinBossBarHud_1.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/hud/MixinChatHud.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/merchant/MixinMerchantScreen.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/merchant/MixinMerchantScreenHandler.java (94%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java (95%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/screenhandler/MixinPlayerScreenHandler.java (96%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/{ => minecraft}/screen/screenhandler/MixinScreenHandler.java (95%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase/ViaLoadingBaseStartup.java => protocolhack/ProtocolHack.java} (87%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/constants/BedrockRakNetConstants.java (95%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/constants/PreNettyConstants.java (93%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/platform/ViaAprilFoolsPlatformImpl.java (95%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/platform/ViaBedrockPlatformImpl.java (95%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/platform/ViaLegacyPlatformImpl.java (95%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/platform/viabedrock/DisconnectHandler.java (94%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/platform/viabedrock/PingEncapsulationCodec.java (96%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/platform/viabedrock/RakMessageEncapsulationCodec.java (96%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/platform/viabedrock/RakNetPingSessions.java (94%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/platform/viabedrock/library_fix/FixedUnconnectedPingEncoder.java (96%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/platform/viabedrock/library_fix/FixedUnconnectedPongDecoder.java (97%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/platform/vialegacy/VFPPreNettyDecoder.java (95%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/platform/vialegacy/VFPPreNettyEncoder.java (95%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/provider/ViaFabricPlusCommandArgumentsProvider.java (96%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java (86%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/provider/vialegacy/ViaFabricPlusClassicCustomCommandProvider.java (97%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java (97%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java (94%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/provider/vialegacy/ViaFabricPlusEncryptionProvider.java (84%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java (97%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/provider/vialegacy/ViaFabricPlusOldAuthProvider.java (79%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/provider/viaversion/ViaFabricPlusHandItemProvider.java (95%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/provider/viaversion/ViaFabricPlusMovementTransmitterProvider.java (94%) rename src/main/java/de/florianmichael/viafabricplus/{vialoadingbase => protocolhack}/replacement/VFPVLBViaDecodeHandler.java (96%) diff --git a/README.md b/README.md index 6e581f14..7c0bfef7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ ViaFabricPlus is structured to interfere with mods as little as possible. It should work fine with most if not all mods and modpacks. ### Known incompatibilities: - - ***[ViaFabric](https://github.com/ViaVersion/ViaFabric)*** - ***[multiconnect](https://github.com/Earthcomputer/multiconnect)*** - ***[Krypton](https://github.com/astei/krypton)*** @@ -79,9 +78,9 @@ ViaFabricPlus uses Gradle, to make sure that it is installed properly you can ch 3. Run `./gradlew genSources`. 4. Open the folder as a Gradle project in your preferred IDE. 5. Run the mod. - ## Settings Settings are optional settings that can turn fixes on and off, originally they were used for debugging
+ ![](/.github/images/settings.png) # Classic stuff diff --git a/gradle.properties b/gradle.properties index 2a3005e3..7eeac80f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.14.14 fabric_api_version=0.74.0+1.19.3 # viafabricplus -mod_version=2.1.0 +mod_version=2.1.1 maven_group=de.florianmichael archives_base_name=viafabricplus diff --git a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java index e4e09a49..76a66140 100644 --- a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java +++ b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java @@ -27,8 +27,8 @@ import de.florianmichael.viafabricplus.definition.v1_8_x.ArmorPointsDefinition; import de.florianmichael.viafabricplus.event.FinishMinecraftLoadCallback; import de.florianmichael.viafabricplus.event.PreLoadCallback; import de.florianmichael.viafabricplus.information.InformationSystem; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.viafabricplus.settings.SettingsSystem; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; import java.io.File; @@ -57,7 +57,7 @@ public class ViaFabricPlus { PreLoadCallback.EVENT.invoker().onLoad(); CustomClassicProtocolExtensions.create(); - new ViaLoadingBaseStartup(); + new ProtocolHack(); } public SettingsSystem getSettingsSystem() { diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/ClassicProgressRenderer.java b/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/ClassicProgressRenderer.java index 98040db4..8247797a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/ClassicProgressRenderer.java +++ b/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/ClassicProgressRenderer.java @@ -18,8 +18,7 @@ package de.florianmichael.viafabricplus.definition.c0_30; import com.viaversion.viaversion.api.connection.UserConnection; -import de.florianmichael.viafabricplus.ViaFabricPlus; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.util.Window; @@ -30,7 +29,7 @@ public class ClassicProgressRenderer extends DrawableHelper { public static void renderProgress(final MatrixStack matrices) { if (MinecraftClient.getInstance().getNetworkHandler() == null) return; - final UserConnection connection = MinecraftClient.getInstance().getNetworkHandler().getConnection().channel.attr(ViaLoadingBaseStartup.LOCAL_VIA_CONNECTION).get(); + final UserConnection connection = MinecraftClient.getInstance().getNetworkHandler().getConnection().channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get(); if (connection == null) return; final ClassicProgressStorage classicProgressStorage = connection.get(ClassicProgressStorage.class); if (classicProgressStorage == null) return; diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/command/ICommand.java b/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/command/ICommand.java index ab32bcc6..9466352e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/command/ICommand.java +++ b/src/main/java/de/florianmichael/viafabricplus/definition/c0_30/command/ICommand.java @@ -19,9 +19,8 @@ package de.florianmichael.viafabricplus.definition.c0_30.command; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; -import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.util.ScreenUtil; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.client.MinecraftClient; import net.minecraft.util.Formatting; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicCustomCommandProvider; @@ -45,7 +44,7 @@ public interface ICommand { } default UserConnection currentViaConnection() { - return MinecraftClient.getInstance().getNetworkHandler().getConnection().channel.attr(ViaLoadingBaseStartup.LOCAL_VIA_CONNECTION).get(); + return MinecraftClient.getInstance().getNetworkHandler().getConnection().channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get(); } void execute(String[] args) throws Exception; 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 eb143a76..ea8125aa 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 @@ -18,9 +18,9 @@ package de.florianmichael.viafabricplus.injection.mixin.base; import de.florianmichael.viafabricplus.injection.access.IClientConnection; -import de.florianmichael.viafabricplus.vialoadingbase.constants.PreNettyConstants; -import de.florianmichael.viafabricplus.vialoadingbase.constants.BedrockRakNetConstants; -import de.florianmichael.viafabricplus.vialoadingbase.platform.viabedrock.RakNetPingSessions; +import de.florianmichael.viafabricplus.protocolhack.constants.PreNettyConstants; +import de.florianmichael.viafabricplus.protocolhack.constants.BedrockRakNetConstants; +import de.florianmichael.viafabricplus.protocolhack.platform.viabedrock.RakNetPingSessions; import de.florianmichael.vialoadingbase.ViaLoadingBase; import de.florianmichael.vialoadingbase.event.PipelineReorderEvent; import io.netty.bootstrap.AbstractBootstrap; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientConnection_1.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientConnection_1.java index 6c2bb65e..bdaaa327 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientConnection_1.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientConnection_1.java @@ -21,15 +21,15 @@ import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.connection.UserConnectionImpl; import com.viaversion.viaversion.protocol.ProtocolPipelineImpl; import de.florianmichael.viafabricplus.injection.access.IClientConnection; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; -import de.florianmichael.viafabricplus.vialoadingbase.constants.BedrockRakNetConstants; -import de.florianmichael.viafabricplus.vialoadingbase.constants.PreNettyConstants; -import de.florianmichael.viafabricplus.vialoadingbase.platform.vialegacy.VFPPreNettyDecoder; -import de.florianmichael.viafabricplus.vialoadingbase.platform.vialegacy.VFPPreNettyEncoder; -import de.florianmichael.viafabricplus.vialoadingbase.replacement.VFPVLBViaDecodeHandler; -import de.florianmichael.viafabricplus.vialoadingbase.platform.viabedrock.*; -import de.florianmichael.viafabricplus.vialoadingbase.platform.viabedrock.library_fix.FixedUnconnectedPingEncoder; -import de.florianmichael.viafabricplus.vialoadingbase.platform.viabedrock.library_fix.FixedUnconnectedPongDecoder; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; +import de.florianmichael.viafabricplus.protocolhack.constants.BedrockRakNetConstants; +import de.florianmichael.viafabricplus.protocolhack.constants.PreNettyConstants; +import de.florianmichael.viafabricplus.protocolhack.platform.vialegacy.VFPPreNettyDecoder; +import de.florianmichael.viafabricplus.protocolhack.platform.vialegacy.VFPPreNettyEncoder; +import de.florianmichael.viafabricplus.protocolhack.replacement.VFPVLBViaDecodeHandler; +import de.florianmichael.viafabricplus.protocolhack.platform.viabedrock.*; +import de.florianmichael.viafabricplus.protocolhack.platform.viabedrock.library_fix.FixedUnconnectedPingEncoder; +import de.florianmichael.viafabricplus.protocolhack.platform.viabedrock.library_fix.FixedUnconnectedPongDecoder; import de.florianmichael.vialoadingbase.ViaLoadingBase; import de.florianmichael.vialoadingbase.netty.VLBViaEncodeHandler; import de.florianmichael.vialoadingbase.netty.NettyConstants; @@ -83,8 +83,8 @@ public class MixinClientConnection_1 { if (channel instanceof SocketChannel || rakNet) { final UserConnection user = new UserConnectionImpl(channel, true); - channel.attr(ViaLoadingBaseStartup.LOCAL_VIA_CONNECTION).set(user); - channel.attr(ViaLoadingBaseStartup.LOCAL_MINECRAFT_CONNECTION).set(field_11663); + channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).set(user); + channel.attr(ProtocolHack.LOCAL_MINECRAFT_CONNECTION).set(field_11663); new ProtocolPipelineImpl(user); diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientLoginNetworkHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientLoginNetworkHandler.java index a67fc3e6..88865f34 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientLoginNetworkHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientLoginNetworkHandler.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.injection.mixin.base; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.vialoadingbase.ViaLoadingBase; import net.minecraft.client.network.ClientLoginNetworkHandler; import net.minecraft.network.ClientConnection; @@ -40,7 +40,7 @@ public class MixinClientLoginNetworkHandler { @Inject(method = "joinServerSession", at = @At("HEAD"), cancellable = true) public void dontVerifySessionIfCracked(String serverId, CallbackInfoReturnable cir) { if (ViaLoadingBase.getClassWrapper().getTargetVersion().isOlderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) { - if (!connection.channel.attr(ViaLoadingBaseStartup.LOCAL_VIA_CONNECTION).get().get(ProtocolMetadataStorage.class).authenticate) { + if (!connection.channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get().get(ProtocolMetadataStorage.class).authenticate) { cir.setReturnValue(null); } } diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerServerListPinger.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerServerListPinger.java index e4869fdd..b32c6d36 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerServerListPinger.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerServerListPinger.java @@ -17,7 +17,7 @@ */ package de.florianmichael.viafabricplus.injection.mixin.base; -import de.florianmichael.viafabricplus.vialoadingbase.platform.viabedrock.RakNetPingSessions; +import de.florianmichael.viafabricplus.protocolhack.platform.viabedrock.RakNetPingSessions; import de.florianmichael.vialoadingbase.ViaLoadingBase; import net.minecraft.client.network.MultiplayerServerListPinger; import net.raphimc.viabedrock.api.BedrockProtocolVersion; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/bridge/MixinDebugHud.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/bridge/MixinDebugHud.java index 4deb42b5..5482625a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/bridge/MixinDebugHud.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/bridge/MixinDebugHud.java @@ -18,27 +18,13 @@ package de.florianmichael.viafabricplus.injection.mixin.bridge; import com.viaversion.viaversion.api.connection.UserConnection; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.information.AbstractInformationGroup; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.viafabricplus.settings.groups.BridgeSettings; import de.florianmichael.viafabricplus.util.ScreenUtil; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; -import de.florianmichael.vialoadingbase.ViaLoadingBase; -import net.lenni0451.reflect.stream.RStream; -import net.lenni0451.reflect.stream.field.FieldStream; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.hud.DebugHud; -import net.raphimc.viabedrock.api.BedrockProtocolVersion; -import net.raphimc.viabedrock.api.chunk.BedrockChunk; -import net.raphimc.viabedrock.api.model.entity.Entity; -import net.raphimc.viabedrock.protocol.BedrockProtocol; -import net.raphimc.viabedrock.protocol.storage.BlobCache; -import net.raphimc.viabedrock.protocol.storage.ChunkTracker; -import net.raphimc.vialegacy.api.LegacyProtocolVersion; -import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage; -import net.raphimc.vialegacy.protocols.release.protocol1_2_1_3to1_1.storage.SeedStorage; -import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.storage.EntityTracker; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -46,8 +32,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.Set; @Mixin(DebugHud.class) public class MixinDebugHud { @@ -58,7 +42,7 @@ public class MixinDebugHud { final List information = new ArrayList<>(); if (MinecraftClient.getInstance().getNetworkHandler() != null) { - final UserConnection userConnection = MinecraftClient.getInstance().getNetworkHandler().getConnection().channel.attr(ViaLoadingBaseStartup.LOCAL_VIA_CONNECTION).get(); + final UserConnection userConnection = MinecraftClient.getInstance().getNetworkHandler().getConnection().channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get(); information.add(""); information.add(ScreenUtil.prefixedMessage("").trim()); diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinBipedEntityModel.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinBipedEntityModel.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinBipedEntityModel.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinBipedEntityModel.java index 64b51b01..b069aaff 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinBipedEntityModel.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinBipedEntityModel.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import de.florianmichael.viafabricplus.settings.groups.VisualSettings; import net.minecraft.client.model.ModelPart; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinCamera.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinCamera.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java index 3e4cb59a..899fd0f9 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinCamera.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import de.florianmichael.viafabricplus.settings.groups.DebugSettings; import net.minecraft.client.render.Camera; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinClientPlayNetworkHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientPlayNetworkHandler.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinClientPlayNetworkHandler.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientPlayNetworkHandler.java index 6744a922..ac3da339 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinClientPlayNetworkHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientPlayNetworkHandler.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import com.mojang.authlib.GameProfile; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinClientPlayerInteractionManager.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientPlayerInteractionManager.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinClientPlayerInteractionManager.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientPlayerInteractionManager.java index 25e0999d..d45e20b1 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinClientPlayerInteractionManager.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientPlayerInteractionManager.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; @@ -24,8 +24,8 @@ import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPac import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4; import de.florianmichael.viafabricplus.injection.access.IClientPlayerEntity; import de.florianmichael.viafabricplus.injection.access.IScreenHandler; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; -import de.florianmichael.viafabricplus.vialoadingbase.provider.viaversion.ViaFabricPlusHandItemProvider; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; +import de.florianmichael.viafabricplus.protocolhack.provider.viaversion.ViaFabricPlusHandItemProvider; import de.florianmichael.viafabricplus.util.ItemTranslator; import de.florianmichael.vialoadingbase.ViaLoadingBase; import net.minecraft.client.MinecraftClient; @@ -110,7 +110,7 @@ public abstract class MixinClientPlayerInteractionManager { else slotItemBeforeModification = viafabricplus_oldItems.get(clickSlot.getSlot()); - final PacketWrapper clickSlotPacket = PacketWrapper.create(ServerboundPackets1_16_2.CLICK_WINDOW, networkHandler.getConnection().channel.attr(ViaLoadingBaseStartup.LOCAL_VIA_CONNECTION).get()); + final PacketWrapper clickSlotPacket = PacketWrapper.create(ServerboundPackets1_16_2.CLICK_WINDOW, networkHandler.getConnection().channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get()); clickSlotPacket.write(Type.UNSIGNED_BYTE, (short) clickSlot.getSyncId()); clickSlotPacket.write(Type.SHORT, (short) clickSlot.getSlot()); diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinInGameHud.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinInGameHud.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.java index 23857fcf..545e22b2 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinInGameHud.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import de.florianmichael.viafabricplus.settings.groups.VisualSettings; import net.minecraft.client.gui.hud.InGameHud; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinItemRenderer.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinItemRenderer.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinItemRenderer.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinItemRenderer.java index eafaf8df..a8efd8bc 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinItemRenderer.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinItemRenderer.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import de.florianmichael.viafabricplus.settings.groups.VisualSettings; import net.minecraft.client.render.item.ItemModels; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinMinecraftClient.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinMinecraftClient.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java index e8da41d8..57b134f2 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinMinecraftClient.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java @@ -15,17 +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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.Protocol1_12To1_11_1; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3; -import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.definition.v1_12_2.SyncInputExecutor; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.viafabricplus.settings.groups.DebugSettings; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; import de.florianmichael.vialoadingbase.ViaLoadingBase; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import net.minecraft.client.MinecraftClient; @@ -107,7 +106,7 @@ public abstract class MixinMinecraftClient { @Inject(method = "handleInputEvents", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;hasRidingInventory()Z")) private void onInventoryKeyPressed(CallbackInfo ci) throws Exception { if (getNetworkHandler() != null && DebugSettings.INSTANCE.sendOpenInventoryPacket.getValue()) { - final UserConnection viaConnection = MinecraftClient.getInstance().getNetworkHandler().getConnection().channel.attr(ViaLoadingBaseStartup.LOCAL_VIA_CONNECTION).get(); + final UserConnection viaConnection = MinecraftClient.getInstance().getNetworkHandler().getConnection().channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get(); if (viaConnection != null && ViaLoadingBase.getClassWrapper().getTargetVersion().isOlderThanOrEqualTo(ProtocolVersion.v1_11_1)) { final PacketWrapper clientStatus = PacketWrapper.create(ServerboundPackets1_9_3.CLIENT_STATUS, viaConnection); diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinPendingUpdateManager.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPendingUpdateManager.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinPendingUpdateManager.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPendingUpdateManager.java index 6bb8f2a1..b858e7b7 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinPendingUpdateManager.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPendingUpdateManager.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import de.florianmichael.viafabricplus.settings.groups.DebugSettings; import net.minecraft.client.network.PendingUpdateManager; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinPlayerEntityRenderer.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerEntityRenderer.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinPlayerEntityRenderer.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerEntityRenderer.java index d24e0270..0d47cc3a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinPlayerEntityRenderer.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerEntityRenderer.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinPlayerPublicKey_PublicKeyData.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerPublicKey_PublicKeyData.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinPlayerPublicKey_PublicKeyData.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerPublicKey_PublicKeyData.java index 3a353d62..720e9f86 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinPlayerPublicKey_PublicKeyData.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerPublicKey_PublicKeyData.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import de.florianmichael.viafabricplus.injection.access.IPublicKeyData; import net.minecraft.network.encryption.PlayerPublicKey; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinProfileKeysImpl.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinProfileKeysImpl.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinProfileKeysImpl.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinProfileKeysImpl.java index 83b3442d..282a8a5d 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinProfileKeysImpl.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinProfileKeysImpl.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import com.mojang.authlib.yggdrasil.response.KeyPairResponse; import de.florianmichael.viafabricplus.injection.access.IPublicKeyData; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinServerAddress.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerAddress.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinServerAddress.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerAddress.java index 6d8b36b0..9487d9e9 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinServerAddress.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerAddress.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinServerResourcePackProvider.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerResourcePackProvider.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinServerResourcePackProvider.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerResourcePackProvider.java index 248c17cd..ebb61c35 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinServerResourcePackProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerResourcePackProvider.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinStringHelper.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStringHelper.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinStringHelper.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStringHelper.java index bab3501d..204dae2a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/MixinStringHelper.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStringHelper.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.injection.mixin.fixes; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import de.florianmichael.viafabricplus.definition.ChatLengthDefinition; import net.minecraft.util.StringHelper; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinAbstractBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinAbstractBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java index 02911e30..662f3bdd 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinAbstractBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import de.florianmichael.viafabricplus.settings.groups.DebugSettings; import net.minecraft.block.AbstractBlock; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinAbstractBlock_AbstractBlockState.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock_AbstractBlockState.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinAbstractBlock_AbstractBlockState.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock_AbstractBlockState.java index 99aa9bfc..70e5ae94 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinAbstractBlock_AbstractBlockState.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock_AbstractBlockState.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinAnvilBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAnvilBlock.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinAnvilBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAnvilBlock.java index 4f215ab1..bdb601a1 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinAnvilBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAnvilBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBambooBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBambooBlock.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBambooBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBambooBlock.java index 79873c78..51813822 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBambooBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBambooBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBedBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBedBlock.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBedBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBedBlock.java index 45ecb671..9c42fb6f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBedBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBedBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBlock.java index 8eaf608d..bf47a21c 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBlockView.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBlockView.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBlockView.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBlockView.java index fba55218..aa2e2b00 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBlockView.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBlockView.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBrewingStandBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBrewingStandBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBrewingStandBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBrewingStandBlock.java index be7ad222..09c969fa 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinBrewingStandBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBrewingStandBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinCauldronBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCauldronBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinCauldronBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCauldronBlock.java index c3907bb9..525dd643 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinCauldronBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCauldronBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinChestBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinChestBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinChestBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinChestBlock.java index 20e2c37e..8ad75750 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinChestBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinChestBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import de.florianmichael.vialoadingbase.ViaLoadingBase; import net.minecraft.block.*; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinEndPortalBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalBlock.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinEndPortalBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalBlock.java index 0dd1e3f3..846a4eab 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinEndPortalBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinEndPortalFrameBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalFrameBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinEndPortalFrameBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalFrameBlock.java index 384f881b..2b8f35ab 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinEndPortalFrameBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalFrameBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFarmlandBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFarmlandBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFarmlandBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFarmlandBlock.java index c2f49aa0..6fd56342 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFarmlandBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFarmlandBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFenceBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceBlock.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFenceBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceBlock.java index 011241eb..a4a535dc 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFenceBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFireBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFireBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFireBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFireBlock.java index af162744..e1994a19 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFireBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFireBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFlowerPotBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerPotBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFlowerPotBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerPotBlock.java index bb7a7c48..5bdf90b3 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinFlowerPotBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerPotBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinHopperBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHopperBlock.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinHopperBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHopperBlock.java index bd92f473..22acee9e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinHopperBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHopperBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinLadderBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLadderBlock.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinLadderBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLadderBlock.java index 034e7afd..3919e60b 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinLadderBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLadderBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinLightBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLightBlock.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinLightBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLightBlock.java index f50198fd..a695c88d 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinLightBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLightBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinLilyPadBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLilyPadBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinLilyPadBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLilyPadBlock.java index a668cac1..fbf30ce0 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinLilyPadBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLilyPadBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinPaneBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPaneBlock.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinPaneBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPaneBlock.java index c052d06c..a969c439 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinPaneBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPaneBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinPistonHeadBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonHeadBlock.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinPistonHeadBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonHeadBlock.java index fc855bcc..54e368c3 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinPistonHeadBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonHeadBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSnowBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSnowBlock.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSnowBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSnowBlock.java index 85ce2049..a44e8f52 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSnowBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSnowBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSoulSandBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSoulSandBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSoulSandBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSoulSandBlock.java index cc2ee789..6a0a5ae8 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSoulSandBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSoulSandBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSugarCaneBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSugarCaneBlock.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSugarCaneBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSugarCaneBlock.java index 75856673..9fe0e6d0 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinSugarCaneBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSugarCaneBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinWallBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinWallBlock.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java index 023c4100..8dd65466 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/block/MixinWallBlock.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.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.injection.mixin.fixes.block; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinAbstractDonkeyEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractDonkeyEntity.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinAbstractDonkeyEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractDonkeyEntity.java index 9ab0f539..1ed5df4a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinAbstractDonkeyEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractDonkeyEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinAllayEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAllayEntity.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinAllayEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAllayEntity.java index 69f74239..f6680aa7 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinAllayEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAllayEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinAnimalEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAnimalEntity.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinAnimalEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAnimalEntity.java index a492e9ee..dc21110f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinAnimalEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAnimalEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinClientPlayerEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinClientPlayerEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java index 1fb27ba0..0026bbfd 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinClientPlayerEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.mojang.authlib.GameProfile; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinCowEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCowEntity.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinCowEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCowEntity.java index 2ddef75a..eaf8e074 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinCowEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCowEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinCreeperEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCreeperEntity.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinCreeperEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCreeperEntity.java index 2305c583..cf2429be 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinCreeperEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCreeperEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java index c039e342..db5d2e80 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinEntityIndex.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityIndex.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinEntityIndex.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityIndex.java index 3f989425..e3ba2102 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinEntityIndex.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityIndex.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinEntityPredicates.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityPredicates.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinEntityPredicates.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityPredicates.java index a99bda17..c770db98 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinEntityPredicates.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityPredicates.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinItemEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinItemEntity.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinItemEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinItemEntity.java index 1cd477cf..8dfb605f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinItemEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinItemEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinLivingEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinLivingEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java index b633d9b9..f1c99bdc 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinLivingEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinOtherClientPlayerEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinOtherClientPlayerEntity.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinOtherClientPlayerEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinOtherClientPlayerEntity.java index d1ff77a4..dad65e81 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinOtherClientPlayerEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinOtherClientPlayerEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.mojang.authlib.GameProfile; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinPiglinEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPiglinEntity.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinPiglinEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPiglinEntity.java index 92d6dada..26c2e745 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinPiglinEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPiglinEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinPlayerEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinPlayerEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java index a910c460..f1c74b18 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinPlayerEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.viafabricplus.definition.LegacySounds; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinSquidEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSquidEntity.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinSquidEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSquidEntity.java index 4309894a..6e64c9a6 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinSquidEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSquidEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinVexEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVexEntity.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinVexEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVexEntity.java index 817b24a2..e9041546 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinVexEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVexEntity.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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinWolfEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinWolfEntity.java similarity index 82% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinWolfEntity.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinWolfEntity.java index d5829feb..baa32209 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/entity/MixinWolfEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinWolfEntity.java @@ -15,12 +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.injection.mixin.fixes.entity; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.definition.v1_14_4.Meta18Storage; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.vialoadingbase.ViaLoadingBase; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.passive.WolfEntity; @@ -36,7 +35,7 @@ public class MixinWolfEntity { public float rewriteHealth(WolfEntity instance) { float health = instance.getHealth(); if (ViaLoadingBase.getClassWrapper().getTargetVersion().isOlderThanOrEqualTo(ProtocolVersion.v1_14_4)) { - return MinecraftClient.getInstance().getNetworkHandler().getConnection().channel.attr(ViaLoadingBaseStartup.LOCAL_VIA_CONNECTION).get().get(Meta18Storage.class).getHealthDataMap().getOrDefault(instance.getId(), health); + return MinecraftClient.getInstance().getNetworkHandler().getConnection().channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get().get(Meta18Storage.class).getHealthDataMap().getOrDefault(instance.getId(), health); } return health; } diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/input/MixinKeyboard.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinKeyboard.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/input/MixinKeyboard.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinKeyboard.java index dfb0aadb..d3829051 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/input/MixinKeyboard.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinKeyboard.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.injection.mixin.fixes.input; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.input; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.viafabricplus.definition.v1_12_2.SyncInputExecutor; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/input/MixinKeyboardInput.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinKeyboardInput.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/input/MixinKeyboardInput.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinKeyboardInput.java index 6c677ca1..96158446 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/input/MixinKeyboardInput.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinKeyboardInput.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.injection.mixin.fixes.input; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.input; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/input/MixinMouse.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinMouse.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/input/MixinMouse.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinMouse.java index 6f91b46f..c2ea148e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/input/MixinMouse.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/input/MixinMouse.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.injection.mixin.fixes.input; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.input; import de.florianmichael.viafabricplus.definition.v1_12_2.SyncInputExecutor; import de.florianmichael.viafabricplus.settings.groups.DebugSettings; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinAxeItem.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinAxeItem.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinAxeItem.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinAxeItem.java index 6b3c4e6d..e65e7428 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinAxeItem.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinAxeItem.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinBlockItem.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBlockItem.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinBlockItem.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBlockItem.java index eb8470eb..57a7e876 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinBlockItem.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBlockItem.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinEnderPearlItem.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderPearlItem.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinEnderPearlItem.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderPearlItem.java index e072a421..8faeba58 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinEnderPearlItem.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderPearlItem.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinFireworkRocketItem.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireworkRocketItem.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinFireworkRocketItem.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireworkRocketItem.java index 0e9343eb..32f1cbbd 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinFireworkRocketItem.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireworkRocketItem.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinHeldItemRenderer.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinHeldItemRenderer.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java index 52950b4f..3701d06b 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinHeldItemRenderer.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinHoeItem.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHoeItem.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinHoeItem.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHoeItem.java index d81a2d8e..e094d719 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinHoeItem.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHoeItem.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.google.common.collect.ImmutableSet; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemCooldownManager.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemCooldownManager.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java index 3ed03130..ebae9b0e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemCooldownManager.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import de.florianmichael.viafabricplus.settings.groups.DebugSettings; import net.minecraft.entity.player.ItemCooldownManager; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemGroup_EntriesImpl.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemGroup_EntriesImpl.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java index 497ea1c4..dd783693 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemGroup_EntriesImpl.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import de.florianmichael.viafabricplus.definition.ItemReleaseVersionDefinition; import de.florianmichael.viafabricplus.settings.groups.GeneralSettings; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemGroups.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemGroups.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java index 67428753..2e180444 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemGroups.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import de.florianmichael.viafabricplus.settings.groups.GeneralSettings; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemPlacementContext.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemPlacementContext.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemPlacementContext.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemPlacementContext.java index bc4da9e9..27caa694 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemPlacementContext.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemPlacementContext.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemStack.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemStack.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java index 4b0c9786..714af2a2 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinItemStack.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinMiningToolItem.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinMiningToolItem.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinMiningToolItem.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinMiningToolItem.java index 66cb848e..3dc6aa3f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinMiningToolItem.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinMiningToolItem.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinPickaxeItem.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinPickaxeItem.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinPickaxeItem.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinPickaxeItem.java index 752692cc..bfc205ff 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinPickaxeItem.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinPickaxeItem.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.google.common.collect.ImmutableSet; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinShovelItem.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinShovelItem.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinShovelItem.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinShovelItem.java index 0a81bcc4..61927110 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinShovelItem.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinShovelItem.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinSwordItem.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinSwordItem.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinSwordItem.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinSwordItem.java index 50f1a662..7d46573a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/item/MixinSwordItem.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinSwordItem.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.injection.mixin.fixes.item; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/packet/MixinChatMessageC2SPacket.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/packet/MixinChatMessageC2SPacket.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/packet/MixinChatMessageC2SPacket.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/packet/MixinChatMessageC2SPacket.java index c84d9fe6..dc746b66 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/packet/MixinChatMessageC2SPacket.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/packet/MixinChatMessageC2SPacket.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.injection.mixin.fixes.packet; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.packet; import de.florianmichael.viafabricplus.definition.ChatLengthDefinition; import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/packet/MixinPacketByteBuf.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/packet/MixinPacketByteBuf.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/packet/MixinPacketByteBuf.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/packet/MixinPacketByteBuf.java index f8a9a371..3fa5f329 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/packet/MixinPacketByteBuf.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/packet/MixinPacketByteBuf.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.injection.mixin.fixes.packet; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.packet; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/packet/MixinUpdatePlayerAbilitiesC2SPacket.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/packet/MixinUpdatePlayerAbilitiesC2SPacket.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/packet/MixinUpdatePlayerAbilitiesC2SPacket.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/packet/MixinUpdatePlayerAbilitiesC2SPacket.java index 1ce53ef1..f2f2b030 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/packet/MixinUpdatePlayerAbilitiesC2SPacket.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/packet/MixinUpdatePlayerAbilitiesC2SPacket.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.injection.mixin.fixes.packet; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.packet; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinChatScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinChatScreen.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java index 33009416..020ebc7f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinChatScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.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.injection.mixin.fixes.screen; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; import de.florianmichael.viafabricplus.definition.ChatLengthDefinition; import de.florianmichael.viafabricplus.settings.groups.VisualSettings; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCommandBlockScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCommandBlockScreen.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java index 1469b4f4..27371519 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCommandBlockScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.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.injection.mixin.fixes.screen; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; import de.florianmichael.viafabricplus.settings.groups.VisualSettings; import net.minecraft.block.entity.CommandBlockBlockEntity; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinConnectScreen_1.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinConnectScreen_1.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java index f858c5e0..4fb7ca89 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinConnectScreen_1.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java @@ -15,16 +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.injection.mixin.fixes.screen; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.ProfileKey; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.injection.access.IPublicKeyData; import de.florianmichael.viafabricplus.definition.v1_19_0.storage.ChatSession1_19_0; import de.florianmichael.viafabricplus.definition.v1_19_2.storage.ChatSession1_19_2; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.vialoadingbase.ViaLoadingBase; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ConnectScreen; @@ -77,7 +76,7 @@ public class MixinConnectScreen_1 { final ClientConnection connection = field_2416.connection; if (connection == null || connection.channel == null) return; - final UserConnection userConnection = connection.channel.attr(ViaLoadingBaseStartup.LOCAL_VIA_CONNECTION).get(); + final UserConnection userConnection = connection.channel.attr(ProtocolHack.LOCAL_VIA_CONNECTION).get(); if (userConnection == null) { ViaLoadingBase.LOGGER.log(Level.WARNING, "ViaVersion userConnection is null"); diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCreativeInventoryScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCreativeInventoryScreen.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java index 02b721f8..c9cc9be4 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinCreativeInventoryScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.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.injection.mixin.fixes.screen; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; import de.florianmichael.viafabricplus.definition.c0_30.ClassicItemSelectionScreen; import de.florianmichael.viafabricplus.settings.groups.VisualSettings; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinDownloadingTerrainScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinDownloadingTerrainScreen.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinDownloadingTerrainScreen.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinDownloadingTerrainScreen.java index 5a4416c1..1ab2dc5a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinDownloadingTerrainScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinDownloadingTerrainScreen.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.injection.mixin.fixes.screen; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinGameModeSelectionScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinGameModeSelectionScreen.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java index 167a41c3..27387fd8 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinGameModeSelectionScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.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.injection.mixin.fixes.screen; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinGameModeSelectionScreen_GameModeSelection.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinGameModeSelectionScreen_GameModeSelection.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java index ea7b1fc5..0c0bdf92 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinGameModeSelectionScreen_GameModeSelection.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.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.injection.mixin.fixes.screen; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinJigsawBlockScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinJigsawBlockScreen.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java index 84da323d..7acd9bb4 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinJigsawBlockScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.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.injection.mixin.fixes.screen; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; import de.florianmichael.viafabricplus.settings.groups.VisualSettings; import net.minecraft.block.entity.JigsawBlockEntity; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinStructureBlockScreen_1.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinStructureBlockScreen_1.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinStructureBlockScreen_1.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinStructureBlockScreen_1.java index c5c47853..93d96117 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/MixinStructureBlockScreen_1.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinStructureBlockScreen_1.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.injection.mixin.fixes.screen; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/hud/MixinBossBarHud_1.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinBossBarHud_1.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/hud/MixinBossBarHud_1.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinBossBarHud_1.java index 5c2b3683..55802346 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/hud/MixinBossBarHud_1.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinBossBarHud_1.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.injection.mixin.fixes.screen.hud; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.hud; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/hud/MixinChatHud.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinChatHud.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/hud/MixinChatHud.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinChatHud.java index 51df4a5e..9a8c1130 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/hud/MixinChatHud.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinChatHud.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.injection.mixin.fixes.screen.hud; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.hud; import de.florianmichael.viafabricplus.settings.groups.VisualSettings; import net.minecraft.client.gui.hud.ChatHud; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/merchant/MixinMerchantScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/merchant/MixinMerchantScreen.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/merchant/MixinMerchantScreen.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/merchant/MixinMerchantScreen.java index 8bcbb4cd..968c4ad3 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/merchant/MixinMerchantScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/merchant/MixinMerchantScreen.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.injection.mixin.fixes.screen.merchant; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.merchant; import de.florianmichael.viafabricplus.settings.groups.DebugSettings; import net.minecraft.client.gui.screen.ingame.HandledScreen; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/merchant/MixinMerchantScreenHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/merchant/MixinMerchantScreenHandler.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/merchant/MixinMerchantScreenHandler.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/merchant/MixinMerchantScreenHandler.java index ed05083e..2e8527ce 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/merchant/MixinMerchantScreenHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/merchant/MixinMerchantScreenHandler.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.injection.mixin.fixes.screen.merchant; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.merchant; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java index b3cc5845..986ab502 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.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.injection.mixin.fixes.screen.screenhandler; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/screenhandler/MixinPlayerScreenHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinPlayerScreenHandler.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/screenhandler/MixinPlayerScreenHandler.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinPlayerScreenHandler.java index 7ae18766..3ec88fa1 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/screenhandler/MixinPlayerScreenHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinPlayerScreenHandler.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.injection.mixin.fixes.screen.screenhandler; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.vialoadingbase.ViaLoadingBase; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/screenhandler/MixinScreenHandler.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinScreenHandler.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/screenhandler/MixinScreenHandler.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinScreenHandler.java index f22817e8..e4bc2711 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/screen/screenhandler/MixinScreenHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinScreenHandler.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.injection.mixin.fixes.screen.screenhandler; +package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import de.florianmichael.viafabricplus.injection.access.IScreenHandler; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/ViaLoadingBaseStartup.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/ProtocolHack.java similarity index 87% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/ViaLoadingBaseStartup.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/ProtocolHack.java index 2949c8b7..544ca478 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/ViaLoadingBaseStartup.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/ProtocolHack.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.vialoadingbase; +package de.florianmichael.viafabricplus.protocolhack; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; @@ -25,14 +25,14 @@ import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.definition.v1_19_0.provider.CommandArgumentsProvider; import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback; import de.florianmichael.viafabricplus.event.FinishViaLoadingBaseStartupCallback; -import de.florianmichael.viafabricplus.vialoadingbase.platform.ViaAprilFoolsPlatformImpl; -import de.florianmichael.viafabricplus.vialoadingbase.platform.ViaBedrockPlatformImpl; -import de.florianmichael.viafabricplus.vialoadingbase.platform.ViaLegacyPlatformImpl; -import de.florianmichael.viafabricplus.vialoadingbase.provider.*; -import de.florianmichael.viafabricplus.vialoadingbase.provider.viabedrock.ViaFabricPlusNettyPipelineProvider; -import de.florianmichael.viafabricplus.vialoadingbase.provider.vialegacy.*; -import de.florianmichael.viafabricplus.vialoadingbase.provider.viaversion.ViaFabricPlusHandItemProvider; -import de.florianmichael.viafabricplus.vialoadingbase.provider.viaversion.ViaFabricPlusMovementTransmitterProvider; +import de.florianmichael.viafabricplus.protocolhack.platform.ViaAprilFoolsPlatformImpl; +import de.florianmichael.viafabricplus.protocolhack.platform.ViaBedrockPlatformImpl; +import de.florianmichael.viafabricplus.protocolhack.platform.ViaLegacyPlatformImpl; +import de.florianmichael.viafabricplus.protocolhack.provider.*; +import de.florianmichael.viafabricplus.protocolhack.provider.viabedrock.ViaFabricPlusNettyPipelineProvider; +import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.*; +import de.florianmichael.viafabricplus.protocolhack.provider.viaversion.ViaFabricPlusHandItemProvider; +import de.florianmichael.viafabricplus.protocolhack.provider.viaversion.ViaFabricPlusMovementTransmitterProvider; import de.florianmichael.vialoadingbase.ViaLoadingBase; import de.florianmichael.vialoadingbase.platform.SubPlatform; import io.netty.util.AttributeKey; @@ -54,11 +54,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class ViaLoadingBaseStartup { +public class ProtocolHack { public final static AttributeKey LOCAL_VIA_CONNECTION = AttributeKey.newInstance("viafabricplus-via-connection"); public final static AttributeKey LOCAL_MINECRAFT_CONNECTION = AttributeKey.newInstance("viafabricplus-minecraft-connection"); - public ViaLoadingBaseStartup() { + public ProtocolHack() { ViaLoadingBase.ViaLoadingBaseBuilder builder = ViaLoadingBase.ViaLoadingBaseBuilder.create(); builder = builder.subPlatform(new SubPlatform("ViaBedrock", () -> true, ViaBedrockPlatformImpl::new, protocolVersions -> protocolVersions.add(BedrockProtocolVersion.bedrockLatest)), 0); diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/constants/BedrockRakNetConstants.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/constants/BedrockRakNetConstants.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/constants/BedrockRakNetConstants.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/constants/BedrockRakNetConstants.java index b1fadfa3..6605e4cb 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/constants/BedrockRakNetConstants.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/constants/BedrockRakNetConstants.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.vialoadingbase.constants; +package de.florianmichael.viafabricplus.protocolhack.constants; public class BedrockRakNetConstants { diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/constants/PreNettyConstants.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/constants/PreNettyConstants.java similarity index 93% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/constants/PreNettyConstants.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/constants/PreNettyConstants.java index 5c8fddf8..439e89ca 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/constants/PreNettyConstants.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/constants/PreNettyConstants.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.vialoadingbase.constants; +package de.florianmichael.viafabricplus.protocolhack.constants; public class PreNettyConstants { diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/ViaAprilFoolsPlatformImpl.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/ViaAprilFoolsPlatformImpl.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/ViaAprilFoolsPlatformImpl.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/ViaAprilFoolsPlatformImpl.java index 3dc8c5ba..0a685c50 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/ViaAprilFoolsPlatformImpl.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/ViaAprilFoolsPlatformImpl.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.vialoadingbase.platform; +package de.florianmichael.viafabricplus.protocolhack.platform; import com.viaversion.viaversion.api.Via; import de.florianmichael.vialoadingbase.util.JLoggerToLog4j; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/ViaBedrockPlatformImpl.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/ViaBedrockPlatformImpl.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/ViaBedrockPlatformImpl.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/ViaBedrockPlatformImpl.java index 615855f4..6f20d8f1 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/ViaBedrockPlatformImpl.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/ViaBedrockPlatformImpl.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.vialoadingbase.platform; +package de.florianmichael.viafabricplus.protocolhack.platform; import com.viaversion.viaversion.api.Via; import de.florianmichael.vialoadingbase.util.JLoggerToLog4j; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/ViaLegacyPlatformImpl.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/ViaLegacyPlatformImpl.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/ViaLegacyPlatformImpl.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/ViaLegacyPlatformImpl.java index e814b390..839ff258 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/ViaLegacyPlatformImpl.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/ViaLegacyPlatformImpl.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.vialoadingbase.platform; +package de.florianmichael.viafabricplus.protocolhack.platform; import com.viaversion.viaversion.api.Via; import de.florianmichael.vialoadingbase.util.JLoggerToLog4j; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/DisconnectHandler.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/DisconnectHandler.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/DisconnectHandler.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/DisconnectHandler.java index 2e1c5f18..25b56662 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/DisconnectHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/DisconnectHandler.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.vialoadingbase.platform.viabedrock; +package de.florianmichael.viafabricplus.protocolhack.platform.viabedrock; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandlerAdapter; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/PingEncapsulationCodec.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/PingEncapsulationCodec.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/PingEncapsulationCodec.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/PingEncapsulationCodec.java index bfbd51f3..101460fc 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/PingEncapsulationCodec.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/PingEncapsulationCodec.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.vialoadingbase.platform.viabedrock; +package de.florianmichael.viafabricplus.protocolhack.platform.viabedrock; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/RakMessageEncapsulationCodec.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/RakMessageEncapsulationCodec.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/RakMessageEncapsulationCodec.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/RakMessageEncapsulationCodec.java index cc595117..2f53890e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/RakMessageEncapsulationCodec.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/RakMessageEncapsulationCodec.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.vialoadingbase.platform.viabedrock; +package de.florianmichael.viafabricplus.protocolhack.platform.viabedrock; import io.netty.buffer.ByteBuf; import io.netty.buffer.CompositeByteBuf; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/RakNetPingSessions.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/RakNetPingSessions.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/RakNetPingSessions.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/RakNetPingSessions.java index 32408ac5..4cb7fe6f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/RakNetPingSessions.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/RakNetPingSessions.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.vialoadingbase.platform.viabedrock; +package de.florianmichael.viafabricplus.protocolhack.platform.viabedrock; import java.net.InetAddress; import java.util.ArrayList; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/library_fix/FixedUnconnectedPingEncoder.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/library_fix/FixedUnconnectedPingEncoder.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/library_fix/FixedUnconnectedPingEncoder.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/library_fix/FixedUnconnectedPingEncoder.java index e47cf991..00845160 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/library_fix/FixedUnconnectedPingEncoder.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/library_fix/FixedUnconnectedPingEncoder.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.vialoadingbase.platform.viabedrock.library_fix; +package de.florianmichael.viafabricplus.protocolhack.platform.viabedrock.library_fix; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/library_fix/FixedUnconnectedPongDecoder.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/library_fix/FixedUnconnectedPongDecoder.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/library_fix/FixedUnconnectedPongDecoder.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/library_fix/FixedUnconnectedPongDecoder.java index f365a4f1..6d8d8168 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/viabedrock/library_fix/FixedUnconnectedPongDecoder.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/viabedrock/library_fix/FixedUnconnectedPongDecoder.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.vialoadingbase.platform.viabedrock.library_fix; +package de.florianmichael.viafabricplus.protocolhack.platform.viabedrock.library_fix; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/vialegacy/VFPPreNettyDecoder.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/vialegacy/VFPPreNettyDecoder.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/vialegacy/VFPPreNettyDecoder.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/vialegacy/VFPPreNettyDecoder.java index a2cd6b7c..96ada817 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/vialegacy/VFPPreNettyDecoder.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/vialegacy/VFPPreNettyDecoder.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.vialoadingbase.platform.vialegacy; +package de.florianmichael.viafabricplus.protocolhack.platform.vialegacy; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/vialegacy/VFPPreNettyEncoder.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/vialegacy/VFPPreNettyEncoder.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/vialegacy/VFPPreNettyEncoder.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/vialegacy/VFPPreNettyEncoder.java index 6bd4cd5f..543ac2a7 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/platform/vialegacy/VFPPreNettyEncoder.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/platform/vialegacy/VFPPreNettyEncoder.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.vialoadingbase.platform.vialegacy; +package de.florianmichael.viafabricplus.protocolhack.platform.vialegacy; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/ViaFabricPlusCommandArgumentsProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/ViaFabricPlusCommandArgumentsProvider.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/ViaFabricPlusCommandArgumentsProvider.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/ViaFabricPlusCommandArgumentsProvider.java index 6f7c4ef3..a187cc0f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/ViaFabricPlusCommandArgumentsProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/ViaFabricPlusCommandArgumentsProvider.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.vialoadingbase.provider; +package de.florianmichael.viafabricplus.protocolhack.provider; import com.viaversion.viaversion.util.Pair; import de.florianmichael.viafabricplus.definition.v1_19_0.provider.CommandArgumentsProvider; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java similarity index 86% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java index 810ad981..ae884b07 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java @@ -15,12 +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.vialoadingbase.provider.viabedrock; +package de.florianmichael.viafabricplus.protocolhack.provider.viabedrock; import com.viaversion.viaversion.api.connection.UserConnection; -import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.injection.access.IClientConnection; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.raphimc.viabedrock.protocol.providers.NettyPipelineProvider; import javax.crypto.NoSuchPaddingException; @@ -33,7 +32,7 @@ public class ViaFabricPlusNettyPipelineProvider extends NettyPipelineProvider { @Override public void enableCompression(UserConnection user, int threshold, int algorithm) { - final IClientConnection currentConnection = (IClientConnection) user.getChannel().attr(ViaLoadingBaseStartup.LOCAL_MINECRAFT_CONNECTION).get(); + final IClientConnection currentConnection = (IClientConnection) user.getChannel().attr(ProtocolHack.LOCAL_MINECRAFT_CONNECTION).get(); try { switch (algorithm) { @@ -49,7 +48,7 @@ public class ViaFabricPlusNettyPipelineProvider extends NettyPipelineProvider { @Override public void enableEncryption(UserConnection user, SecretKey key) { - final IClientConnection currentConnection = (IClientConnection) user.getChannel().attr(ViaLoadingBaseStartup.LOCAL_MINECRAFT_CONNECTION).get(); + final IClientConnection currentConnection = (IClientConnection) user.getChannel().attr(ProtocolHack.LOCAL_MINECRAFT_CONNECTION).get(); try { currentConnection.viafabricplus_enableAesGcmEncryption(key); diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusClassicCustomCommandProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicCustomCommandProvider.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusClassicCustomCommandProvider.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicCustomCommandProvider.java index 5985d20b..dbabf5d9 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusClassicCustomCommandProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicCustomCommandProvider.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.vialoadingbase.provider.vialegacy; +package de.florianmichael.viafabricplus.protocolhack.provider.vialegacy; import com.viaversion.viaversion.api.connection.UserConnection; import de.florianmichael.viafabricplus.definition.c0_30.command.ClassicProtocolCommands; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java index 441823f7..2d9fea5e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.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.vialoadingbase.provider.vialegacy; +package de.florianmichael.viafabricplus.protocolhack.provider.vialegacy; import com.google.common.hash.Hashing; import com.google.common.io.Resources; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java index 31f2fd43..8b478193 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.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.vialoadingbase.provider.vialegacy; +package de.florianmichael.viafabricplus.protocolhack.provider.vialegacy; import com.viaversion.viaversion.api.connection.UserConnection; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicWorldHeightProvider; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusEncryptionProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusEncryptionProvider.java similarity index 84% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusEncryptionProvider.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusEncryptionProvider.java index dc4afeff..7ec5c998 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusEncryptionProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusEncryptionProvider.java @@ -15,12 +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.vialoadingbase.provider.vialegacy; +package de.florianmichael.viafabricplus.protocolhack.provider.vialegacy; import com.viaversion.viaversion.api.connection.UserConnection; -import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.injection.access.IClientConnection; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.network.ClientConnection; import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.providers.EncryptionProvider; @@ -28,7 +27,7 @@ public class ViaFabricPlusEncryptionProvider extends EncryptionProvider { @Override public void enableDecryption(UserConnection user) { - final ClientConnection clientConnection = user.getChannel().attr(ViaLoadingBaseStartup.LOCAL_MINECRAFT_CONNECTION).get(); + final ClientConnection clientConnection = user.getChannel().attr(ProtocolHack.LOCAL_MINECRAFT_CONNECTION).get(); if (clientConnection != null) { ((IClientConnection) clientConnection).viafabricplus_setupPreNettyEncryption(); } diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java index 5791f878..46d93ec7 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusGameProfileFetcher.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.vialoadingbase.provider.vialegacy; +package de.florianmichael.viafabricplus.protocolhack.provider.vialegacy; import com.mojang.authlib.Agent; import com.mojang.authlib.GameProfileRepository; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusOldAuthProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusOldAuthProvider.java similarity index 79% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusOldAuthProvider.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusOldAuthProvider.java index b63d3900..b70b599d 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/vialegacy/ViaFabricPlusOldAuthProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/vialegacy/ViaFabricPlusOldAuthProvider.java @@ -15,13 +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.vialoadingbase.provider.vialegacy; +package de.florianmichael.viafabricplus.protocolhack.provider.vialegacy; import com.viaversion.viaversion.api.connection.UserConnection; -import de.florianmichael.viafabricplus.ViaFabricPlus; +import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.viafabricplus.settings.groups.MPPassSettings; import de.florianmichael.viafabricplus.util.ScreenUtil; -import de.florianmichael.viafabricplus.vialoadingbase.ViaLoadingBaseStartup; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; import net.raphimc.vialegacy.protocols.release.protocol1_3_1_2to1_2_4_5.providers.OldAuthProvider; @@ -38,7 +37,7 @@ public class ViaFabricPlusOldAuthProvider extends OldAuthProvider { mc.getSessionService().joinServer(mc.getSession().getProfile(), mc.getSession().getAccessToken(), serverId); } catch (Exception e) { if (MPPassSettings.INSTANCE.disconnectIfJoinServerCallFails.getValue()) { - user.getChannel().attr(ViaLoadingBaseStartup.LOCAL_MINECRAFT_CONNECTION).get().disconnect(Text.literal(ScreenUtil.prefixedMessage("ViaLegacy fails to verify your session! Please log in into an Account or disable the BetaCraft authentication in the ViaFabricPlus Settings"))); + user.getChannel().attr(ProtocolHack.LOCAL_MINECRAFT_CONNECTION).get().disconnect(Text.literal(ScreenUtil.prefixedMessage("ViaLegacy fails to verify your session! Please log in into an Account or disable the BetaCraft authentication in the ViaFabricPlus Settings"))); } else { e.printStackTrace(); } diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/viaversion/ViaFabricPlusHandItemProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusHandItemProvider.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/viaversion/ViaFabricPlusHandItemProvider.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusHandItemProvider.java index ea395d2e..d579832c 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/viaversion/ViaFabricPlusHandItemProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusHandItemProvider.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.vialoadingbase.provider.viaversion; +package de.florianmichael.viafabricplus.protocolhack.provider.viaversion; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.item.Item; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/viaversion/ViaFabricPlusMovementTransmitterProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusMovementTransmitterProvider.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/viaversion/ViaFabricPlusMovementTransmitterProvider.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusMovementTransmitterProvider.java index b335be83..cdb5c6c8 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/provider/viaversion/ViaFabricPlusMovementTransmitterProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusMovementTransmitterProvider.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.vialoadingbase.provider.viaversion; +package de.florianmichael.viafabricplus.protocolhack.provider.viaversion; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider; diff --git a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/replacement/VFPVLBViaDecodeHandler.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/replacement/VFPVLBViaDecodeHandler.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/vialoadingbase/replacement/VFPVLBViaDecodeHandler.java rename to src/main/java/de/florianmichael/viafabricplus/protocolhack/replacement/VFPVLBViaDecodeHandler.java index 415e7a18..0676cdf5 100644 --- a/src/main/java/de/florianmichael/viafabricplus/vialoadingbase/replacement/VFPVLBViaDecodeHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/replacement/VFPVLBViaDecodeHandler.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.vialoadingbase.replacement; +package de.florianmichael.viafabricplus.protocolhack.replacement; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index 7d69600d..f3af415d 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -14,99 +14,99 @@ "bridge.MixinDebugHud", "bridge.MixinDownloadingTerrainScreen", "bridge.MixinOptionsScreen", - "fixes.MixinBipedEntityModel", - "fixes.MixinCamera", - "fixes.MixinClientPlayerInteractionManager", - "fixes.MixinClientPlayNetworkHandler", - "fixes.MixinInGameHud", - "fixes.MixinItemRenderer", - "fixes.MixinMinecraftClient", - "fixes.MixinPendingUpdateManager", - "fixes.MixinPlayerEntityRenderer", - "fixes.MixinPlayerPublicKey_PublicKeyData", - "fixes.MixinProfileKeysImpl", - "fixes.MixinServerAddress", - "fixes.MixinServerResourcePackProvider", - "fixes.MixinStringHelper", - "fixes.block.MixinAbstractBlock_AbstractBlockState", - "fixes.block.MixinAnvilBlock", - "fixes.block.MixinBambooBlock", - "fixes.block.MixinBedBlock", - "fixes.block.MixinBlock", - "fixes.block.MixinBlockView", - "fixes.block.MixinBrewingStandBlock", - "fixes.block.MixinCauldronBlock", - "fixes.block.MixinChestBlock", - "fixes.block.MixinEndPortalBlock", - "fixes.block.MixinEndPortalFrameBlock", - "fixes.block.MixinFarmlandBlock", - "fixes.block.MixinFenceBlock", - "fixes.block.MixinFireBlock", - "fixes.block.MixinFlowerPotBlock", - "fixes.block.MixinHopperBlock", - "fixes.block.MixinLadderBlock", - "fixes.block.MixinLightBlock", - "fixes.block.MixinLilyPadBlock", - "fixes.block.MixinPaneBlock", - "fixes.block.MixinPistonHeadBlock", - "fixes.block.MixinSnowBlock", - "fixes.block.MixinSoulSandBlock", - "fixes.block.MixinSugarCaneBlock", - "fixes.block.MixinWallBlock", - "fixes.entity.MixinAbstractDonkeyEntity", - "fixes.entity.MixinAllayEntity", - "fixes.entity.MixinAnimalEntity", - "fixes.entity.MixinClientPlayerEntity", - "fixes.entity.MixinCowEntity", - "fixes.entity.MixinCreeperEntity", - "fixes.entity.MixinEntity", - "fixes.entity.MixinEntityIndex", - "fixes.entity.MixinEntityPredicates", - "fixes.entity.MixinItemEntity", - "fixes.entity.MixinLivingEntity", - "fixes.entity.MixinOtherClientPlayerEntity", - "fixes.entity.MixinPiglinEntity", - "fixes.entity.MixinPlayerEntity", - "fixes.entity.MixinSquidEntity", - "fixes.entity.MixinVexEntity", - "fixes.entity.MixinWolfEntity", - "fixes.input.MixinKeyboard", - "fixes.input.MixinKeyboardInput", - "fixes.input.MixinMouse", - "fixes.item.MixinAxeItem", - "fixes.item.MixinBlockItem", - "fixes.item.MixinEnderPearlItem", - "fixes.item.MixinFireworkRocketItem", - "fixes.item.MixinHeldItemRenderer", - "fixes.item.MixinHoeItem", - "fixes.item.MixinItemCooldownManager", - "fixes.item.MixinItemGroup_EntriesImpl", - "fixes.item.MixinItemGroups", - "fixes.item.MixinItemPlacementContext", - "fixes.item.MixinItemStack", - "fixes.item.MixinMiningToolItem", - "fixes.item.MixinPickaxeItem", - "fixes.item.MixinShovelItem", - "fixes.item.MixinSwordItem", - "fixes.packet.MixinChatMessageC2SPacket", - "fixes.packet.MixinPacketByteBuf", - "fixes.packet.MixinUpdatePlayerAbilitiesC2SPacket", - "fixes.screen.MixinChatScreen", - "fixes.screen.MixinCommandBlockScreen", - "fixes.screen.MixinConnectScreen_1", - "fixes.screen.MixinCreativeInventoryScreen", - "fixes.screen.MixinDownloadingTerrainScreen", - "fixes.screen.MixinGameModeSelectionScreen", - "fixes.screen.MixinGameModeSelectionScreen_GameModeSelection", - "fixes.screen.MixinJigsawBlockScreen", - "fixes.screen.MixinStructureBlockScreen_1", - "fixes.screen.hud.MixinBossBarHud_1", - "fixes.screen.hud.MixinChatHud", - "fixes.screen.merchant.MixinMerchantScreen", - "fixes.screen.merchant.MixinMerchantScreenHandler", - "fixes.screen.screenhandler.MixinBrewingStandScreenHandler_FuelSlot", - "fixes.screen.screenhandler.MixinPlayerScreenHandler", - "fixes.screen.screenhandler.MixinScreenHandler", + "fixes.minecraft.MixinBipedEntityModel", + "fixes.minecraft.MixinCamera", + "fixes.minecraft.MixinClientPlayerInteractionManager", + "fixes.minecraft.MixinClientPlayNetworkHandler", + "fixes.minecraft.MixinInGameHud", + "fixes.minecraft.MixinItemRenderer", + "fixes.minecraft.MixinMinecraftClient", + "fixes.minecraft.MixinPendingUpdateManager", + "fixes.minecraft.MixinPlayerEntityRenderer", + "fixes.minecraft.MixinPlayerPublicKey_PublicKeyData", + "fixes.minecraft.MixinProfileKeysImpl", + "fixes.minecraft.MixinServerAddress", + "fixes.minecraft.MixinServerResourcePackProvider", + "fixes.minecraft.MixinStringHelper", + "fixes.minecraft.block.MixinAbstractBlock_AbstractBlockState", + "fixes.minecraft.block.MixinAnvilBlock", + "fixes.minecraft.block.MixinBambooBlock", + "fixes.minecraft.block.MixinBedBlock", + "fixes.minecraft.block.MixinBlock", + "fixes.minecraft.block.MixinBlockView", + "fixes.minecraft.block.MixinBrewingStandBlock", + "fixes.minecraft.block.MixinCauldronBlock", + "fixes.minecraft.block.MixinChestBlock", + "fixes.minecraft.block.MixinEndPortalBlock", + "fixes.minecraft.block.MixinEndPortalFrameBlock", + "fixes.minecraft.block.MixinFarmlandBlock", + "fixes.minecraft.block.MixinFenceBlock", + "fixes.minecraft.block.MixinFireBlock", + "fixes.minecraft.block.MixinFlowerPotBlock", + "fixes.minecraft.block.MixinHopperBlock", + "fixes.minecraft.block.MixinLadderBlock", + "fixes.minecraft.block.MixinLightBlock", + "fixes.minecraft.block.MixinLilyPadBlock", + "fixes.minecraft.block.MixinPaneBlock", + "fixes.minecraft.block.MixinPistonHeadBlock", + "fixes.minecraft.block.MixinSnowBlock", + "fixes.minecraft.block.MixinSoulSandBlock", + "fixes.minecraft.block.MixinSugarCaneBlock", + "fixes.minecraft.block.MixinWallBlock", + "fixes.minecraft.entity.MixinAbstractDonkeyEntity", + "fixes.minecraft.entity.MixinAllayEntity", + "fixes.minecraft.entity.MixinAnimalEntity", + "fixes.minecraft.entity.MixinClientPlayerEntity", + "fixes.minecraft.entity.MixinCowEntity", + "fixes.minecraft.entity.MixinCreeperEntity", + "fixes.minecraft.entity.MixinEntity", + "fixes.minecraft.entity.MixinEntityIndex", + "fixes.minecraft.entity.MixinEntityPredicates", + "fixes.minecraft.entity.MixinItemEntity", + "fixes.minecraft.entity.MixinLivingEntity", + "fixes.minecraft.entity.MixinOtherClientPlayerEntity", + "fixes.minecraft.entity.MixinPiglinEntity", + "fixes.minecraft.entity.MixinPlayerEntity", + "fixes.minecraft.entity.MixinSquidEntity", + "fixes.minecraft.entity.MixinVexEntity", + "fixes.minecraft.entity.MixinWolfEntity", + "fixes.minecraft.input.MixinKeyboard", + "fixes.minecraft.input.MixinKeyboardInput", + "fixes.minecraft.input.MixinMouse", + "fixes.minecraft.item.MixinAxeItem", + "fixes.minecraft.item.MixinBlockItem", + "fixes.minecraft.item.MixinEnderPearlItem", + "fixes.minecraft.item.MixinFireworkRocketItem", + "fixes.minecraft.item.MixinHeldItemRenderer", + "fixes.minecraft.item.MixinHoeItem", + "fixes.minecraft.item.MixinItemCooldownManager", + "fixes.minecraft.item.MixinItemGroup_EntriesImpl", + "fixes.minecraft.item.MixinItemGroups", + "fixes.minecraft.item.MixinItemPlacementContext", + "fixes.minecraft.item.MixinItemStack", + "fixes.minecraft.item.MixinMiningToolItem", + "fixes.minecraft.item.MixinPickaxeItem", + "fixes.minecraft.item.MixinShovelItem", + "fixes.minecraft.item.MixinSwordItem", + "fixes.minecraft.packet.MixinChatMessageC2SPacket", + "fixes.minecraft.packet.MixinPacketByteBuf", + "fixes.minecraft.packet.MixinUpdatePlayerAbilitiesC2SPacket", + "fixes.minecraft.screen.MixinChatScreen", + "fixes.minecraft.screen.MixinCommandBlockScreen", + "fixes.minecraft.screen.MixinConnectScreen_1", + "fixes.minecraft.screen.MixinCreativeInventoryScreen", + "fixes.minecraft.screen.MixinDownloadingTerrainScreen", + "fixes.minecraft.screen.MixinGameModeSelectionScreen", + "fixes.minecraft.screen.MixinGameModeSelectionScreen_GameModeSelection", + "fixes.minecraft.screen.MixinJigsawBlockScreen", + "fixes.minecraft.screen.MixinStructureBlockScreen_1", + "fixes.minecraft.screen.hud.MixinBossBarHud_1", + "fixes.minecraft.screen.hud.MixinChatHud", + "fixes.minecraft.screen.merchant.MixinMerchantScreen", + "fixes.minecraft.screen.merchant.MixinMerchantScreenHandler", + "fixes.minecraft.screen.screenhandler.MixinBrewingStandScreenHandler_FuelSlot", + "fixes.minecraft.screen.screenhandler.MixinPlayerScreenHandler", + "fixes.minecraft.screen.screenhandler.MixinScreenHandler", "fixes.sodium.MixinChunkTracker", "fixes.viaaprilfools.MixinProtocol1_16to20w14infinite", "fixes.vialegacy.MixinClassicProtocolExtension", @@ -141,7 +141,7 @@ "fixes.viaversion.protocol1_9to1_8.MixinMovementTracker", "fixes.viaversion.protocol1_9to1_8.MixinViaIdleThread", "base.MixinClientConnection_1", - "fixes.block.MixinAbstractBlock" + "fixes.minecraft.block.MixinAbstractBlock" ], "injectors": { "defaultRequire": 1