From abdda3536982579badcdf3ce6a33e17e7e8cdfa2 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Fri, 30 Jul 2021 15:09:18 +0800 Subject: [PATCH] Refactor, split out bootstrap and mod Added missing AT ForgeInstaller no longer been translated --- arclight-common/build.gradle | 38 +++- .../bridge/command/CommandNodeBridge.java | 6 - .../advancement/AdvancementBridge.java | 2 +- .../bridge/{ => core}/block/BlockBridge.java | 2 +- .../{ => core}/block/FireBlockBridge.java | 2 +- .../{ => core}/block/NoteBlockBridge.java | 2 +- .../{ => core}/block/PortalInfoBridge.java | 2 +- .../{ => core}/block/PortalSizeBridge.java | 2 +- .../command/CommandSourceBridge.java | 2 +- .../command/ICommandSourceBridge.java | 2 +- .../arguments/EntityArgumentBridge.java | 2 +- .../arguments/EntitySelectorParserBridge.java | 2 +- .../entity/AgeableEntityBridge.java | 2 +- .../entity/AreaEffectCloudEntityBridge.java | 2 +- .../{ => core}/entity/EntityBridge.java | 4 +- .../{ => core}/entity/EntityTypeBridge.java | 2 +- .../entity/InternalEntityBridge.java | 2 +- .../{ => core}/entity/LivingEntityBridge.java | 2 +- .../{ => core}/entity/MobEntityBridge.java | 2 +- .../ai/attributes/RangedAttributeBridge.java | 2 +- .../entity/merchant/IMerchantBridge.java | 2 +- .../entity/monster/CreeperEntityBridge.java | 8 + .../entity/monster/EndermanEntityBridge.java | 2 +- .../entity/monster/piglin/PiglinBridge.java | 2 +- .../entity/passive/AnimalEntityBridge.java | 4 +- .../entity/passive/FoxEntityBridge.java | 2 +- .../entity/passive/TurtleEntityBridge.java | 2 +- .../entity/player/PlayerEntityBridge.java | 4 +- .../entity/player/PlayerInventoryBridge.java | 2 +- .../player/ServerPlayerEntityBridge.java | 2 +- .../entity/projectile/ArrowEntityBridge.java | 4 +- .../DamagingProjectileEntityBridge.java | 8 + .../projectile/TridentEntityBridge.java | 2 +- .../inventory/CraftingInventoryBridge.java | 2 +- .../inventory/IInventoryBridge.java | 2 +- .../inventory/container/ContainerBridge.java | 2 +- .../container/LecternContainerBridge.java | 2 +- .../container/PosContainerBridge.java | 4 +- .../inventory/container/SlotBridge.java | 2 +- .../{ => core}/item/ItemStackBridge.java | 2 +- .../{ => core}/item/MerchantOfferBridge.java | 2 +- .../item/crafting/IRecipeBridge.java | 2 +- .../item/crafting/IngredientBridge.java | 2 +- .../item/crafting/RecipeManagerBridge.java | 2 +- .../network/NetworkManagerBridge.java | 2 +- .../datasync/EntityDataManagerBridge.java | 2 +- .../login/ServerLoginNetHandlerBridge.java | 2 +- .../play/ServerPlayNetHandlerBridge.java | 2 +- .../network/play/TimestampedPacket.java | 2 +- .../network/rcon/RConConsoleSourceBridge.java | 2 +- .../server/CustomServerBossInfoBridge.java | 2 +- .../server/MinecraftServerBridge.java | 2 +- .../server/management/BanEntryBridge.java | 2 +- .../PlayerInteractionManagerBridge.java | 2 +- .../server/management/PlayerListBridge.java | 2 +- .../server/management/UserListBridge.java | 2 +- .../tags/NetworkTagCollectionBridge.java | 2 +- .../AbstractFurnaceTileEntityBridge.java | 2 +- .../tileentity/BeaconTileEntityBridge.java | 2 +- .../tileentity/SignTileEntityBridge.java | 2 +- .../tileentity/TileEntityBridge.java | 2 +- .../{ => core}/util/DamageSourceBridge.java | 2 +- .../{ => core}/util/FoodStatsBridge.java | 2 +- .../util/IWorldPosCallableBridge.java | 4 +- .../IndirectEntityDamageSourceBridge.java | 2 +- .../util/text/ITextComponentBridge.java | 2 +- .../{ => core}/world/ExplosionBridge.java | 2 +- .../{ => core}/world/IBlockReaderBridge.java | 2 +- .../bridge/{ => core}/world/IWorldBridge.java | 2 +- .../{ => core}/world/IWorldWriterBridge.java | 2 +- .../{ => core}/world/TeleporterBridge.java | 2 +- .../{ => core}/world/TrackedEntityBridge.java | 2 +- .../bridge/{ => core}/world/WorldBridge.java | 2 +- .../world/border/WorldBorderBridge.java | 2 +- .../{ => core}/world/chunk/ChunkBridge.java | 2 +- .../chunk/storage/RegionFileCacheBridge.java | 2 +- .../{ => core}/world/raid/RaidBridge.java | 2 +- .../world/server/ChunkHolderBridge.java | 2 +- .../world/server/ChunkMapBridge.java | 2 +- .../server/ServerChunkProviderBridge.java | 2 +- .../world/server/ServerWorldBridge.java | 4 +- .../world/server/TicketManagerBridge.java | 2 +- .../world/server/TicketTypeBridge.java | 2 +- .../spawner/WorldEntitySpawnerBridge.java | 2 +- .../world/storage/DerivedWorldInfoBridge.java | 2 +- .../world/storage/MapDataBridge.java | 2 +- .../world/storage/PlayerDataBridge.java | 2 +- .../world/storage/SaveFormatBridge.java | 2 +- .../world/storage/WorldInfoBridge.java | 2 +- .../world/storage/loot/LootTableBridge.java | 2 +- .../entity/monster/CreeperEntityBridge.java | 8 - .../DamagingProjectileEntityBridge.java | 8 - .../EntityBridge_ActivationRange.java | 2 +- .../mixin/bukkit/CraftEventFactoryMixin.java | 2 +- .../mixin/bukkit/CraftItemStackMixin.java | 2 +- .../common/mixin/bukkit/CraftServerMixin.java | 2 +- .../common/mixin/bukkit/CraftWorldMixin.java | 2 +- .../common/mixin/bukkit/MaterialMixin.java | 2 +- .../mixin/bukkit/PluginClassLoaderMixin.java | 3 +- .../mixin/bukkit/RecipeIteratorMixin.java | 2 +- .../core/advancements/AdvancementMixin.java | 2 +- .../mixin/core/commands/CommandNodeMixin.java | 51 ----- .../core/commands/CommandSourceMixin.java | 2 +- .../commands/CommandSourceStackMixin.java | 4 +- .../mixin/core/commands/CommandsMixin.java | 15 +- .../arguments/EntityArgumentMixin.java | 4 +- .../selector/EntitySelectorMixin.java | 2 +- .../selector/EntitySelectorParserMixin.java | 2 +- .../mixin/core/fluid/LavaFluidMixin.java | 2 +- .../mixin/core/network/ConnectionMixin.java | 2 +- .../ServerHandshakeNetHandlerMixin.java | 4 +- .../network/ServerLoginNetHandlerMixin.java | 8 +- .../network/ServerPlayNetHandlerMixin.java | 18 +- .../core/network/SynchedEntityDataMixin.java | 4 +- .../core/network/chat/ComponentMixin.java | 2 +- .../protocol/PacketThreadUtilMixin.java | 4 +- .../CPlayerTryUseItemOnBlockPacketMixin.java | 2 +- .../game/CPlayerTryUseItemPacketMixin.java | 2 +- .../game/SWorldBorderPacketMixin.java | 2 +- .../network/rcon/RConConsoleSourceMixin.java | 6 +- .../server/CustomServerBossInfoMixin.java | 2 +- .../core/server/MinecraftServerMixin.java | 6 +- .../core/server/PlayerAdvancementsMixin.java | 4 +- .../server/ServerFunctionManagerMixin.java | 2 +- .../core/server/ServerScoreboardMixin.java | 2 +- .../server/commands/EffectCommandMixin.java | 2 +- .../server/commands/SummonCommandMixin.java | 2 +- .../server/commands/TeleportCommandMixin.java | 8 +- .../server/commands/TimeCommandMixin.java | 2 +- .../core/server/level/ChunkHolderMixin.java | 6 +- .../core/server/level/ChunkMapMixin.java | 4 +- .../level/ChunkMap_TrackedEntityMixin.java | 2 +- .../server/level/ServerChunkCacheMixin.java | 10 +- ...verChunkCache_MainThreadExecutorMixin.java | 6 +- .../core/server/level/ServerEntityMixin.java | 4 +- .../core/server/level/ServerLevelMixin.java | 20 +- .../ServerLevel_EntityCallbacksMixin.java | 4 +- .../core/server/level/TicketManagerMixin.java | 2 +- .../core/server/level/TicketTypeMixin.java | 2 +- .../core/server/management/BanEntryMixin.java | 2 +- .../server/management/PlayerListMixin.java | 16 +- .../management/ServerPlayerGameModeMixin.java | 4 +- .../core/server/management/UserListMixin.java | 2 +- .../core/world/CompoundContainerMixin.java | 2 +- .../mixin/core/world/ContainerMixin.java | 2 +- .../mixin/core/world/ExplosionMixin.java | 6 +- .../mixin/core/world/IBlockReaderMixin.java | 2 +- .../mixin/core/world/IServerWorldMixin.java | 2 +- .../common/mixin/core/world/IWorldMixin.java | 2 +- .../mixin/core/world/IWorldWriterMixin.java | 2 +- .../core/world/SimpleContainerMixin.java | 2 +- .../world/damagesource/DamageSourceMixin.java | 2 +- .../IndirectEntityDamageSourceMixin.java | 2 +- .../core/world/effect/MobEffectMixin.java | 4 +- .../core/world/entity/AgeableMobMixin.java | 2 +- .../entity/AreaEffectCloudEntityMixin.java | 4 +- .../mixin/core/world/entity/EntityMixin.java | 18 +- .../core/world/entity/EntityTypeMixin.java | 4 +- .../core/world/entity/IAngerableMixin.java | 2 +- .../core/world/entity/LivingEntityMixin.java | 10 +- .../mixin/core/world/entity/MobMixin.java | 8 +- .../ai/attributes/RangedAttributeMixin.java | 2 +- .../ai/behavior/InteractWithDoorMixin.java | 2 +- .../ai/behavior/VillagerMakeLoveMixin.java | 2 +- .../world/entity/ai/brain/BrainUtilMixin.java | 2 +- .../ai/goal/DefendVillageTargetGoalMixin.java | 2 +- .../entity/ai/goal/FollowOwnerGoalMixin.java | 2 +- .../entity/ai/goal/HurtByTargetGoalMixin.java | 2 +- .../NearestAttackableTargetGoalMixin.java | 2 +- .../ai/goal/OwnerHurtByTargetGoalMixin.java | 2 +- .../ai/goal/OwnerHurtTargetGoalMixin.java | 2 +- .../entity/ai/goal/RemoveBlockGoalMixin.java | 2 +- .../entity/ai/goal/SkeletonTrapGoalMixin.java | 4 +- .../world/entity/ai/goal/TargetGoalMixin.java | 2 +- .../entity/ai/village/VillageSiegeMixin.java | 2 +- .../core/world/entity/animal/AnimalMixin.java | 4 +- .../core/world/entity/animal/BeeMixin.java | 3 +- .../animal/Bee_HurtByOtherGoalMixin.java | 2 +- ...DolphinEntity_SwimWithPlayerGoalMixin.java | 2 +- .../core/world/entity/animal/FoxMixin.java | 3 +- .../entity/animal/Fox_BreedGoalMixin.java | 4 +- .../world/entity/animal/MushroomCowMixin.java | 3 +- .../animal/Panda_HurtByTargetGoalMixin.java | 2 +- .../core/world/entity/animal/PigMixin.java | 3 +- .../entity/animal/PufferfishEntityMixin.java | 4 +- .../core/world/entity/animal/Sheep1Mixin.java | 2 +- .../core/world/entity/animal/SheepMixin.java | 3 +- .../core/world/entity/animal/TurtleMixin.java | 3 +- .../entity/animal/Turtle_LayEggGoalMixin.java | 2 +- .../animal/horse/AbstractHorseMixin.java | 2 +- ...aderLlamaEntity_FollowTraderGoalMixin.java | 2 +- .../phases/EnderDragonPhaseManagerMixin.java | 2 +- .../entity/decoration/ArmorStandMixin.java | 4 +- .../world/entity/item/HangingEntityMixin.java | 4 +- .../world/entity/item/ItemEntityMixin.java | 10 +- .../entity/monster/AbstractSkeletonMixin.java | 2 +- .../world/entity/monster/CaveSpiderMixin.java | 2 +- .../world/entity/monster/CreeperMixin.java | 4 +- .../entity/monster/ElderGuardianMixin.java | 2 +- .../world/entity/monster/EnderManMixin.java | 2 +- .../Ghast_GhastShootFireballGoalMixin.java | 2 +- .../core/world/entity/monster/HuskMixin.java | 2 +- .../Illusioner_BlindnessSpellGoalMixin.java | 2 +- .../Illusioner_MirrorSpellGoalMixin.java | 2 +- .../Phantom_AttackPlayerTargetGoalMixin.java | 2 +- .../world/entity/monster/ShulkerMixin.java | 2 +- .../core/world/entity/monster/SlimeMixin.java | 2 +- .../monster/Vex_CopyOwnerTargetGoalMixin.java | 2 +- .../entity/monster/WitherSkeletonMixin.java | 2 +- .../world/entity/monster/ZombieMixin.java | 6 +- .../entity/monster/ZombieVillagerMixin.java | 2 +- .../entity/monster/ZombifiedPiglinMixin.java | 4 +- .../entity/monster/piglin/PiglinAiMixin.java | 6 +- .../entity/monster/piglin/PiglinMixin.java | 2 +- .../entity/npc/AbstractVillagerMixin.java | 6 +- .../core/world/entity/npc/VillagerMixin.java | 4 +- .../entity/npc/WanderingTraderMixin.java | 2 +- .../world/entity/player/InventoryMixin.java | 6 +- .../core/world/entity/player/PlayerMixin.java | 18 +- .../entity/player/ServerPlayerMixin.java | 18 +- .../entity/projectile/AbstractArrowMixin.java | 6 +- .../AbstractHurtingProjectileMixin.java | 2 +- .../entity/projectile/ArrowEntityMixin.java | 4 +- .../entity/projectile/FishingHookMixin.java | 4 +- .../entity/projectile/ProjectileMixin.java | 2 +- .../entity/projectile/ShulkerBulletMixin.java | 2 +- .../entity/projectile/SmallFireballMixin.java | 2 +- .../entity/projectile/SpectralArrowMixin.java | 2 +- .../projectile/ThrowableProjectileMixin.java | 2 +- .../entity/projectile/ThrownEggMixin.java | 6 +- .../projectile/ThrownEnderpearlMixin.java | 2 +- .../entity/projectile/ThrownPotionMixin.java | 4 +- .../entity/projectile/ThrownTridentMixin.java | 4 +- .../entity/projectile/WitherSkullMixin.java | 2 +- .../core/world/entity/raid/RaidMixin.java | 6 +- .../core/world/entity/raider/RaiderMixin.java | 2 +- .../Raider_HoldGroundAttackGoalMixin.java | 2 +- .../AbstractMinecartContainerMixin.java | 2 +- .../entity/vehicle/AbstractMinecartMixin.java | 4 +- .../core/world/entity/vehicle/BoatMixin.java | 4 +- ...CommandBlock_MinecartCommandBaseMixin.java | 4 +- .../mixin/core/world/food/FoodDataMixin.java | 8 +- .../core/world/gen/WorldGenRegionMixin.java | 2 +- .../structure/StructureManagerMixin.java | 2 +- .../feature/structure/SwampHutPieceMixin.java | 2 +- .../inventory/AbstractContainerMenuMixin.java | 6 +- .../AbstractFurnaceContainerMixin.java | 2 +- .../world/inventory/BeaconContainerMixin.java | 2 +- .../inventory/BrewingStandContainerMixin.java | 2 +- .../inventory/CartographyContainer1Mixin.java | 4 +- .../inventory/CartographyContainer2Mixin.java | 4 +- .../inventory/CartographyContainerMixin.java | 4 +- .../world/inventory/ChestContainerMixin.java | 2 +- .../inventory/ContainerLevelAccessMixin.java | 2 +- .../world/inventory/ContainerTypeMixin.java | 2 +- .../inventory/CraftResultInventoryMixin.java | 2 +- .../inventory/CraftingInventoryMixin.java | 8 +- .../world/inventory/CraftingMenuMixin.java | 8 +- .../inventory/DispenserContainerMixin.java | 2 +- .../inventory/EnchantmentContainer1Mixin.java | 2 +- .../inventory/EnchantmentContainerMixin.java | 8 +- .../inventory/EnderChestInventoryMixin.java | 4 +- .../inventory/FurnaceResultSlotMixin.java | 2 +- .../inventory/GrindstoneContainer1Mixin.java | 2 +- .../inventory/GrindstoneContainerMixin.java | 4 +- .../world/inventory/HopperContainerMixin.java | 2 +- .../HorseInventoryContainerMixin.java | 4 +- .../inventory/LecternContainerMixin.java | 4 +- .../world/inventory/LoomContainer1Mixin.java | 2 +- .../world/inventory/LoomContainer2Mixin.java | 2 +- .../world/inventory/LoomContainerMixin.java | 4 +- .../inventory/MerchantContainerMixin.java | 2 +- .../inventory/MerchantInventoryMixin.java | 4 +- .../world/inventory/PlayerContainerMixin.java | 4 +- .../world/inventory/RepairContainerMixin.java | 4 +- .../inventory/ShulkerBoxContainerMixin.java | 2 +- .../mixin/core/world/inventory/SlotMixin.java | 2 +- .../SmithingTableContainerMixin.java | 4 +- .../inventory/StonecutterContainer1Mixin.java | 4 +- .../inventory/StonecutterContainerMixin.java | 4 +- .../mixin/core/world/item/BlockItemMixin.java | 2 +- .../mixin/core/world/item/BowItemMixin.java | 4 +- .../core/world/item/BucketItemMixin.java | 2 +- .../core/world/item/ChorusFruitItemMixin.java | 2 +- .../core/world/item/CrossbowItemMixin.java | 4 +- .../mixin/core/world/item/DyeItemMixin.java | 4 +- .../mixin/core/world/item/EggItemMixin.java | 2 +- .../core/world/item/EnderPearlItemMixin.java | 2 +- .../core/world/item/FishingRodItemMixin.java | 4 +- .../world/item/HangingEntityItemMixin.java | 4 +- .../mixin/core/world/item/ItemStackMixin.java | 4 +- .../mixin/core/world/item/LeadItemMixin.java | 4 +- .../mixin/core/world/item/MapItemMixin.java | 2 +- .../mixin/core/world/item/MerchantMixin.java | 2 +- .../core/world/item/MerchantOfferMixin.java | 2 +- .../core/world/item/MilkBucketItemMixin.java | 2 +- .../core/world/item/PotionItemMixin.java | 2 +- .../core/world/item/SnowballItemMixin.java | 2 +- .../core/world/item/SpawnEggItemMixin.java | 2 +- .../core/world/item/TridentItemMixin.java | 4 +- .../item/crafting/BlastingRecipeMixin.java | 2 +- .../crafting/CampfireCookingRecipeMixin.java | 2 +- .../item/crafting/CustomRecipeMixin.java | 2 +- .../item/crafting/FurnaceRecipeMixin.java | 2 +- .../world/item/crafting/IngredientMixin.java | 2 +- .../item/crafting/RecipeManagerMixin.java | 4 +- .../core/world/item/crafting/RecipeMixin.java | 2 +- .../item/crafting/ShapedRecipeMixin.java | 2 +- .../item/crafting/ShapelessRecipeMixin.java | 2 +- .../item/crafting/SmithingRecipeMixin.java | 2 +- .../item/crafting/SmokingRecipeMixin.java | 2 +- .../crafting/StonecuttingRecipeMixin.java | 2 +- .../enchantment/DamageEnchantmentMixin.java | 2 +- .../mixin/core/world/level/LevelMixin.java | 8 +- .../world/level/block/BeehiveBlockMixin.java | 2 +- .../core/world/level/block/BlockMixin.java | 2 +- .../world/level/block/ButtonBlockMixin.java | 2 +- .../world/level/block/CakeBlockMixin.java | 2 +- .../level/block/CarvedPumpkinBlockMixin.java | 2 +- .../level/block/ComposterBlockMixin.java | 2 +- .../world/level/block/DropperBlockMixin.java | 2 +- .../level/block/EndPortalBlockMixin.java | 6 +- .../world/level/block/FireBlockMixin.java | 2 +- .../world/level/block/InfestedBlockMixin.java | 2 +- .../world/level/block/LecternBlockMixin.java | 2 +- .../level/block/NetherPortalBlockMixin.java | 6 +- .../world/level/block/NoteBlockMixin.java | 2 +- .../world/level/block/PortalInfoMixin.java | 2 +- .../world/level/block/PortalSizeMixin.java | 8 +- .../level/block/PressurePlateBlockMixin.java | 2 +- .../level/block/RedstoneOreBlockMixin.java | 2 +- .../world/level/block/TripWireBlockMixin.java | 2 +- .../level/block/TurtleEggBlockMixin.java | 4 +- .../WeightedPressurePlateBlockMixin.java | 2 +- .../level/block/WitherRoseBlockMixin.java | 2 +- .../level/block/WitherSkullBlockMixin.java | 2 +- .../AbstractFurnaceBlockEntityMixin.java | 6 +- .../block/entity/BarrelBlockEntityMixin.java | 2 +- .../block/entity/BeaconTileEntityMixin.java | 2 +- .../block/entity/BeehiveBlockEntityMixin.java | 6 +- .../level/block/entity/BlockEntityMixin.java | 4 +- .../entity/BrewingStandBlockEntityMixin.java | 2 +- .../block/entity/ChestBlockEntityMixin.java | 2 +- .../block/entity/CommandBlockLogicMixin.java | 2 +- .../entity/CommandBlockTileEntity1Mixin.java | 2 +- .../block/entity/ConduitBlockEntityMixin.java | 2 +- .../entity/EndGatewayBlockEntityMixin.java | 6 +- .../block/entity/HopperBlockEntityMixin.java | 8 +- .../block/entity/LecternBlockEntityMixin.java | 6 +- .../block/entity/LecternTileEntity1Mixin.java | 6 +- .../entity/LockableBlockEntityMixin.java | 2 +- .../block/entity/SignBlockEntityMixin.java | 6 +- .../world/level/border/WorldBorderMixin.java | 2 +- .../world/level/chunk/LevelChunkMixin.java | 4 +- .../chunk/storage/RegionFileCacheMixin.java | 2 +- .../world/level/portal/PortalForcerMixin.java | 6 +- .../level/saveddata/maps/MapDataMixin.java | 2 +- .../saveddata/maps/MapData_MapInfoMixin.java | 4 +- .../level/storage/loot/LootTableMixin.java | 2 +- .../world/spawner/AbstractSpawnerMixin.java | 6 +- .../world/spawner/PatrolSpawnerMixin.java | 2 +- .../world/spawner/PhantomSpawnerMixin.java | 2 +- .../spawner/WanderingTraderSpawnerMixin.java | 2 +- .../spawner/WorldEntitySpawnerMixin.java | 6 +- ...titySpawner_EntityDensityManagerMixin.java | 2 +- .../world/storage/DerivedWorldInfoMixin.java | 2 +- .../core/world/storage/PlayerDataMixin.java | 4 +- .../core/world/storage/SaveFormatMixin.java | 2 +- .../storage/SaveFormat_LevelSaveMixin.java | 2 +- .../world/storage/ServerWorldInfoMixin.java | 2 +- .../common/mixin/forge/NetworkHooksMixin.java | 2 +- .../dfu/CraftMagicNumbersMixin.java | 2 +- .../optimization/dfu/DataFixerUpperMixin.java | 2 +- .../dfu/DataFixesManagerMixin.java | 2 +- .../dfu/MinecraftServerMixin.java | 2 +- .../ClassInheritanceMultiMapMixin.java | 2 +- .../EntityDataManagerMixin_Optimize.java | 4 +- .../general/VoxelShapesMixin.java | 4 +- .../activationrange/ActivationRangeMixin.java | 4 +- .../EntityMixin_ActivationRange.java | 6 +- .../ServerWorldMixin_ActivationRange.java | 4 +- ...tractArrowEntityMixin_ActivationRange.java | 4 +- .../AgeableEntityMixin_ActivationRange.java | 6 +- ...ffectCloudEntityMixin_ActivationRange.java | 4 +- ...workRocketEntityMixin_ActivationRange.java | 4 +- .../ItemEntityMixin_ActivationRange.java | 6 +- .../LivingEntityMixin_ActivationRange.java | 4 +- .../VillagerEntityMixin_ActivationRange.java | 6 +- .../realtime/ItemEntityMixin_Realtime.java | 2 +- ...layerInteractionManagerMixin_Realtime.java | 2 +- .../ChunkManagerMixin_TrackingRange.java | 2 +- .../stream/GoalSelectorMixin.java | 2 +- .../stream/ITaskQueue_PriorityMixin.java | 2 +- .../common/mod/ArclightConnector.java | 10 + .../arclight/common/mod/ArclightMod.java | 2 - .../common/mod/compat/CommandNodeHooks.java | 42 ++++ .../common/mod/server/ArclightContainer.java | 6 +- .../mod/server/ArclightPermissionHandler.java | 2 +- .../common/mod/server/ArclightServer.java | 2 +- .../mod/server/block/CauldronHooks.java | 2 +- .../server/event/ArclightEventFactory.java | 2 +- .../event/BlockBreakEventDispatcher.java | 4 +- .../event/BlockPlaceEventDispatcher.java | 2 +- .../mod/server/event/ChunkEventHandler.java | 2 +- .../EntityPotionEffectEventDispatcher.java | 2 +- .../event/EntityTeleportEventDispatcher.java | 4 +- .../common/mod/util/ArclightHeadLoader.java | 46 ----- .../common/mod/util/ArclightPingEvent.java | 2 +- .../mod/util/ArclightSpecialRecipe.java | 2 +- .../common/mod/util/DelegateWorldInfo.java | 4 +- .../mod/util/log/ArclightI18nLogger.java | 121 ++---------- .../mod/util/log/ArclightLazyLogManager.java | 42 ---- .../util}/optimization/NoopReadWriteLock.java | 2 +- .../optimization/OptimizedIndirectMerger.java | 2 +- .../mod/util/remapper/ArclightRemapper.java | 4 + .../generated/RemappingURLClassLoader.java | 3 +- .../resources/META-INF/accesstransformer.cfg | 57 ++++++ .../src/main/resources/META-INF/mods.toml | 0 ...odlauncher.serviceapi.ILaunchPluginService | 1 - .../main/resources/mixins.arclight.core.json | 1 - ....arclight.impl.forge.optimization.dfu.json | 4 +- ...xins.arclight.impl.forge.optimization.json | 2 +- ...clight.impl.forge.optimization.stream.json | 4 +- .../src/main/resources/pack.mcmeta | 0 arclight-forge/build.gradle | 185 +++++++++--------- .../io/izzel/arclight/server/Launcher.java | 2 + .../arclight/boot/ArclightBootstrap.java | 57 ++++-- .../arclight/boot/ArclightLocator_Forge.java | 17 +- .../izzel/arclight/boot}/EnumTypeFactory.java | 4 +- .../io/izzel/arclight/boot/Main_Forge.java | 27 +++ .../boot}/asm/ArclightImplementer.java | 16 +- .../arclight/boot}/asm/AsyncCatcher.java | 13 +- .../arclight/boot}/asm/EntityTypePatcher.java | 2 +- .../izzel/arclight/boot}/asm/Implementer.java | 2 +- .../boot}/asm/InventoryImplementer.java | 4 +- .../arclight/boot}/asm/SwitchTableFixer.java | 8 +- .../arclight/boot/log/ArclightI18nLogger.java | 112 +++++++++++ .../boot}/log/ArclightLoggerAdapter.java | 2 +- .../impl/ArclightConnector_Forge.java | 30 --- .../io/izzel/arclight/server/Main_Forge.java | 38 ---- ...odlauncher.serviceapi.ILaunchPluginService | 1 + .../services/java.util.function.Consumer | 1 + .../src/main/resources/arclight-log4j2.xml | 0 .../src/main/resources/async_catcher.json | 0 .../boot/ArclightImplementer_Forge.java | 60 ------ .../src/module/java/module-info.java | 20 -- build.gradle | 10 + forge-installer/build.gradle | 2 - .../forgeinstaller/FileDownloader.java | 34 ++-- .../forgeinstaller/ForgeInstaller.java | 67 +++---- .../forgeinstaller/MavenDownloader.java | 12 +- .../main/resources/META-INF/i18n/en_us.conf | 16 -- .../main/resources/META-INF/i18n/fr_fr.conf | 16 -- .../main/resources/META-INF/i18n/ru_ru.conf | 16 -- .../main/resources/META-INF/i18n/zh_cn.conf | 16 -- 455 files changed, 1182 insertions(+), 1342 deletions(-) delete mode 100644 arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/CommandNodeBridge.java rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/advancement/AdvancementBridge.java (67%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/block/BlockBridge.java (86%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/block/FireBlockBridge.java (70%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/block/NoteBlockBridge.java (82%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/block/PortalInfoBridge.java (88%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/block/PortalSizeBridge.java (59%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/command/CommandSourceBridge.java (86%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/command/ICommandSourceBridge.java (79%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/command/arguments/EntityArgumentBridge.java (83%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/command/arguments/EntitySelectorParserBridge.java (84%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/AgeableEntityBridge.java (66%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/AreaEffectCloudEntityBridge.java (77%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/EntityBridge.java (91%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/EntityTypeBridge.java (92%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/InternalEntityBridge.java (80%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/LivingEntityBridge.java (96%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/MobEntityBridge.java (94%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/ai/attributes/RangedAttributeBridge.java (59%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/merchant/IMerchantBridge.java (69%) create mode 100644 arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/CreeperEntityBridge.java rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/monster/EndermanEntityBridge.java (71%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/monster/piglin/PiglinBridge.java (73%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/passive/AnimalEntityBridge.java (53%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/passive/FoxEntityBridge.java (68%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/passive/TurtleEntityBridge.java (78%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/player/PlayerEntityBridge.java (82%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/player/PlayerInventoryBridge.java (68%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/player/ServerPlayerEntityBridge.java (94%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/projectile/ArrowEntityBridge.java (63%) create mode 100644 arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/DamagingProjectileEntityBridge.java rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/entity/projectile/TridentEntityBridge.java (68%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/inventory/CraftingInventoryBridge.java (82%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/inventory/IInventoryBridge.java (96%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/inventory/container/ContainerBridge.java (88%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/inventory/container/LecternContainerBridge.java (71%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/inventory/container/PosContainerBridge.java (71%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/inventory/container/SlotBridge.java (56%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/item/ItemStackBridge.java (80%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/item/MerchantOfferBridge.java (74%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/item/crafting/IRecipeBridge.java (64%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/item/crafting/IngredientBridge.java (65%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/item/crafting/RecipeManagerBridge.java (74%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/network/NetworkManagerBridge.java (87%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/network/datasync/EntityDataManagerBridge.java (72%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/network/login/ServerLoginNetHandlerBridge.java (68%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/network/play/ServerPlayNetHandlerBridge.java (86%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/network/play/TimestampedPacket.java (54%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/network/rcon/RConConsoleSourceBridge.java (60%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/server/CustomServerBossInfoBridge.java (71%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/server/MinecraftServerBridge.java (92%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/server/management/BanEntryBridge.java (58%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/server/management/PlayerInteractionManagerBridge.java (77%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/server/management/PlayerListBridge.java (91%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/server/management/UserListBridge.java (63%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/tags/NetworkTagCollectionBridge.java (61%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/tileentity/AbstractFurnaceTileEntityBridge.java (87%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/tileentity/BeaconTileEntityBridge.java (75%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/tileentity/SignTileEntityBridge.java (61%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/tileentity/TileEntityBridge.java (68%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/util/DamageSourceBridge.java (75%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/util/FoodStatsBridge.java (73%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/util/IWorldPosCallableBridge.java (88%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/util/IndirectEntityDamageSourceBridge.java (77%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/util/text/ITextComponentBridge.java (80%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/ExplosionBridge.java (85%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/IBlockReaderBridge.java (82%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/IWorldBridge.java (71%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/IWorldWriterBridge.java (87%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/TeleporterBridge.java (89%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/TrackedEntityBridge.java (77%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/WorldBridge.java (95%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/border/WorldBorderBridge.java (71%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/chunk/ChunkBridge.java (92%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/chunk/storage/RegionFileCacheBridge.java (73%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/raid/RaidBridge.java (73%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/server/ChunkHolderBridge.java (78%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/server/ChunkMapBridge.java (92%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/server/ServerChunkProviderBridge.java (90%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/server/ServerWorldBridge.java (91%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/server/TicketManagerBridge.java (91%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/server/TicketTypeBridge.java (58%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/spawner/WorldEntitySpawnerBridge.java (90%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/storage/DerivedWorldInfoBridge.java (83%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/storage/MapDataBridge.java (84%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/storage/PlayerDataBridge.java (75%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/storage/SaveFormatBridge.java (88%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/storage/WorldInfoBridge.java (85%) rename arclight-common/src/main/java/io/izzel/arclight/common/bridge/{ => core}/world/storage/loot/LootTableBridge.java (77%) delete mode 100644 arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/CreeperEntityBridge.java delete mode 100644 arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/DamagingProjectileEntityBridge.java rename {arclight-forge/src/main/java/io/izzel/arclight/impl/bridge => arclight-common/src/main/java/io/izzel/arclight/common/bridge/optimization}/EntityBridge_ActivationRange.java (69%) delete mode 100644 arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandNodeMixin.java rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/dfu/CraftMagicNumbersMixin.java (93%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/dfu/DataFixerUpperMixin.java (90%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/dfu/DataFixesManagerMixin.java (92%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/dfu/MinecraftServerMixin.java (93%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/ClassInheritanceMultiMapMixin.java (98%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/EntityDataManagerMixin_Optimize.java (85%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/VoxelShapesMixin.java (86%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/activationrange/ActivationRangeMixin.java (75%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java (90%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/activationrange/ServerWorldMixin_ActivationRange.java (88%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/activationrange/entity/AbstractArrowEntityMixin_ActivationRange.java (74%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/activationrange/entity/AgeableEntityMixin_ActivationRange.java (75%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/activationrange/entity/AreaEffectCloudEntityMixin_ActivationRange.java (75%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/activationrange/entity/FireworkRocketEntityMixin_ActivationRange.java (77%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/activationrange/entity/ItemEntityMixin_ActivationRange.java (90%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/activationrange/entity/LivingEntityMixin_ActivationRange.java (70%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/activationrange/entity/VillagerEntityMixin_ActivationRange.java (71%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/realtime/ItemEntityMixin_Realtime.java (94%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/realtime/PlayerInteractionManagerMixin_Realtime.java (93%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/general/trackingrange/ChunkManagerMixin_TrackingRange.java (89%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/stream/GoalSelectorMixin.java (98%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl => arclight-common/src/main/java/io/izzel/arclight/common}/mixin/optimization/stream/ITaskQueue_PriorityMixin.java (92%) create mode 100644 arclight-common/src/main/java/io/izzel/arclight/common/mod/compat/CommandNodeHooks.java delete mode 100644 arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightHeadLoader.java delete mode 100644 arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightLazyLogManager.java rename {arclight-forge/src/main/java/io/izzel/arclight/impl/common => arclight-common/src/main/java/io/izzel/arclight/common/mod/util}/optimization/NoopReadWriteLock.java (95%) rename {arclight-forge/src/main/java/io/izzel/arclight/impl/common => arclight-common/src/main/java/io/izzel/arclight/common/mod/util}/optimization/OptimizedIndirectMerger.java (98%) rename {arclight-forge => arclight-common}/src/main/resources/META-INF/mods.toml (100%) delete mode 100644 arclight-common/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService rename {arclight-forge => arclight-common}/src/main/resources/mixins.arclight.impl.forge.optimization.dfu.json (65%) rename {arclight-forge => arclight-common}/src/main/resources/mixins.arclight.impl.forge.optimization.json (93%) rename {arclight-forge => arclight-common}/src/main/resources/mixins.arclight.impl.forge.optimization.stream.json (57%) rename {arclight-forge => arclight-common}/src/main/resources/pack.mcmeta (100%) rename arclight-common/src/main/java/io/izzel/arclight/common/ArclightMain.java => arclight-forge/src/main/java/io/izzel/arclight/boot/ArclightBootstrap.java (57%) rename arclight-forge/src/{module => main}/java/io/izzel/arclight/boot/ArclightLocator_Forge.java (83%) rename {arclight-common/src/main/java/io/izzel/arclight/common/util => arclight-forge/src/main/java/io/izzel/arclight/boot}/EnumTypeFactory.java (96%) create mode 100644 arclight-forge/src/main/java/io/izzel/arclight/boot/Main_Forge.java rename {arclight-common/src/main/java/io/izzel/arclight/common => arclight-forge/src/main/java/io/izzel/arclight/boot}/asm/ArclightImplementer.java (88%) rename {arclight-common/src/main/java/io/izzel/arclight/common => arclight-forge/src/main/java/io/izzel/arclight/boot}/asm/AsyncCatcher.java (95%) rename {arclight-common/src/main/java/io/izzel/arclight/common => arclight-forge/src/main/java/io/izzel/arclight/boot}/asm/EntityTypePatcher.java (95%) rename {arclight-common/src/main/java/io/izzel/arclight/common => arclight-forge/src/main/java/io/izzel/arclight/boot}/asm/Implementer.java (86%) rename {arclight-common/src/main/java/io/izzel/arclight/common => arclight-forge/src/main/java/io/izzel/arclight/boot}/asm/InventoryImplementer.java (99%) rename {arclight-common/src/main/java/io/izzel/arclight/common => arclight-forge/src/main/java/io/izzel/arclight/boot}/asm/SwitchTableFixer.java (98%) create mode 100644 arclight-forge/src/main/java/io/izzel/arclight/boot/log/ArclightI18nLogger.java rename {arclight-common/src/main/java/io/izzel/arclight/common/mod/util => arclight-forge/src/main/java/io/izzel/arclight/boot}/log/ArclightLoggerAdapter.java (99%) delete mode 100644 arclight-forge/src/main/java/io/izzel/arclight/impl/ArclightConnector_Forge.java delete mode 100644 arclight-forge/src/main/java/io/izzel/arclight/server/Main_Forge.java create mode 100644 arclight-forge/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService create mode 100644 arclight-forge/src/main/resources/META-INF/services/java.util.function.Consumer rename {arclight-common => arclight-forge}/src/main/resources/arclight-log4j2.xml (100%) rename {arclight-common => arclight-forge}/src/main/resources/async_catcher.json (100%) delete mode 100644 arclight-forge/src/module/java/io/izzel/arclight/boot/ArclightImplementer_Forge.java delete mode 100644 arclight-forge/src/module/java/module-info.java diff --git a/arclight-common/build.gradle b/arclight-common/build.gradle index dd55726c..af8efca6 100644 --- a/arclight-common/build.gradle +++ b/arclight-common/build.gradle @@ -23,11 +23,15 @@ arclight { forgeVersion = project.ext.forgeVersion bukkitVersion = 'v1_17_R1' wipeVersion = true - reobfVersion = false + reobfVersion = true accessTransformer = project.file('bukkit.at') // packageName = 'spigot' } +configurations { + embed +} + java.toolchain.languageVersion = JavaLanguageVersion.of(16) minecraft { @@ -64,6 +68,32 @@ dependencies { implementation "io.izzel:tools:$toolsVersion" implementation "io.izzel.arclight:arclight-api:$apiVersion" implementation project(':i18n-config') + embed 'net.md-5:bungeecord-chat:1.16-R0.4@jar' + embed "org.spigotmc:spigot-api:$minecraftVersion-R0.1-SNAPSHOT@jar" +} + +jar { + manifest.attributes 'MixinConnector': 'io.izzel.arclight.common.mod.ArclightConnector' + manifest.attributes 'Implementation-Title': 'Arclight' + manifest.attributes 'Implementation-Version': "arclight-$minecraftVersion-${project.version}-$gitHash" + manifest.attributes 'Implementation-Vendor': 'Arclight Team' + manifest.attributes 'Implementation-Timestamp': new Date().format("yyyy-MM-dd HH:mm:ss") + from(configurations.embed.collect { it.isDirectory() ? it : zipTree(it) }) { + exclude "META-INF/MANIFEST.MF" + exclude "META-INF/*.SF" + exclude "META-INF/*.DSA" + exclude "META-INF/*.RSA" + exclude "LICENSE.txt" + exclude "META-INF/services/**" + exclude "org/apache/commons/lang/enum/**" + } + duplicatesStrategy = DuplicatesStrategy.EXCLUDE +} + +processResources { + filesMatching("**/mods.toml") { + expand 'version': "$minecraftVersion-${project.version}-$gitHash" + } } remapSpigotJar { @@ -71,12 +101,6 @@ remapSpigotJar { includes.add('net/minecraft/tileentity/LecternTileEntity$LecternInventory') } -generateArclightMeta { - doFirst { - throw new StopExecutionException() - } -} - mixin { add sourceSets.main, 'mixins.arclight.refmap.json' } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/CommandNodeBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/CommandNodeBridge.java deleted file mode 100644 index c4c93209..00000000 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/CommandNodeBridge.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.izzel.arclight.common.bridge.command; - -public interface CommandNodeBridge { - - void bridge$removeCommand(String name); -} diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/advancement/AdvancementBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/advancement/AdvancementBridge.java similarity index 67% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/advancement/AdvancementBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/advancement/AdvancementBridge.java index 4f73669e..eb59b4ba 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/advancement/AdvancementBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/advancement/AdvancementBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.advancement; +package io.izzel.arclight.common.bridge.core.advancement; import org.bukkit.advancement.Advancement; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/BlockBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/BlockBridge.java similarity index 86% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/BlockBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/BlockBridge.java index 4a2aaaa7..897f06c9 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/BlockBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/BlockBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.block; +package io.izzel.arclight.common.bridge.core.block; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/FireBlockBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/FireBlockBridge.java similarity index 70% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/FireBlockBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/FireBlockBridge.java index 5c2a5124..1a34bb25 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/FireBlockBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/FireBlockBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.block; +package io.izzel.arclight.common.bridge.core.block; import net.minecraft.world.level.block.Block; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/NoteBlockBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/NoteBlockBridge.java similarity index 82% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/NoteBlockBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/NoteBlockBridge.java index a65c9343..48534f39 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/NoteBlockBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/NoteBlockBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.block; +package io.izzel.arclight.common.bridge.core.block; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/PortalInfoBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/PortalInfoBridge.java similarity index 88% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/PortalInfoBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/PortalInfoBridge.java index b3a5db10..4a655a3d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/PortalInfoBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/PortalInfoBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.block; +package io.izzel.arclight.common.bridge.core.block; import net.minecraft.server.level.ServerLevel; import org.bukkit.craftbukkit.v.event.CraftPortalEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/PortalSizeBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/PortalSizeBridge.java similarity index 59% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/PortalSizeBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/PortalSizeBridge.java index fa72f8c2..7276625b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/PortalSizeBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/block/PortalSizeBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.block; +package io.izzel.arclight.common.bridge.core.block; public interface PortalSizeBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/CommandSourceBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/CommandSourceBridge.java similarity index 86% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/CommandSourceBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/CommandSourceBridge.java index a40e8381..5895904c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/CommandSourceBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/CommandSourceBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.command; +package io.izzel.arclight.common.bridge.core.command; import com.mojang.brigadier.tree.CommandNode; import org.bukkit.command.CommandSender; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/ICommandSourceBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/ICommandSourceBridge.java similarity index 79% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/ICommandSourceBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/ICommandSourceBridge.java index 44027520..a0a2d33d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/ICommandSourceBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/ICommandSourceBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.command; +package io.izzel.arclight.common.bridge.core.command; import net.minecraft.commands.CommandSourceStack; import org.bukkit.command.CommandSender; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntityArgumentBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/arguments/EntityArgumentBridge.java similarity index 83% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntityArgumentBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/arguments/EntityArgumentBridge.java index 4ec72eb2..17016974 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntityArgumentBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/arguments/EntityArgumentBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.command.arguments; +package io.izzel.arclight.common.bridge.core.command.arguments; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntitySelectorParserBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/arguments/EntitySelectorParserBridge.java similarity index 84% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntitySelectorParserBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/arguments/EntitySelectorParserBridge.java index 9fc8a84a..aed4b200 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntitySelectorParserBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/command/arguments/EntitySelectorParserBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.command.arguments; +package io.izzel.arclight.common.bridge.core.command.arguments; import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.commands.arguments.selector.EntitySelector; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/AgeableEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/AgeableEntityBridge.java similarity index 66% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/AgeableEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/AgeableEntityBridge.java index 325e17e8..c484cebe 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/AgeableEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/AgeableEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity; +package io.izzel.arclight.common.bridge.core.entity; public interface AgeableEntityBridge extends LivingEntityBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/AreaEffectCloudEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/AreaEffectCloudEntityBridge.java similarity index 77% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/AreaEffectCloudEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/AreaEffectCloudEntityBridge.java index be1086a4..a6b6c5ce 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/AreaEffectCloudEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/AreaEffectCloudEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity; +package io.izzel.arclight.common.bridge.core.entity; public interface AreaEffectCloudEntityBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/EntityBridge.java similarity index 91% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/EntityBridge.java index 83f20f9c..a79a9c34 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/EntityBridge.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.common.bridge.entity; +package io.izzel.arclight.common.bridge.core.entity; -import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge; import org.bukkit.craftbukkit.v.entity.CraftEntity; import org.bukkit.projectiles.ProjectileSource; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityTypeBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/EntityTypeBridge.java similarity index 92% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityTypeBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/EntityTypeBridge.java index 3f10741b..12198deb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/EntityTypeBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/EntityTypeBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity; +package io.izzel.arclight.common.bridge.core.entity; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/InternalEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/InternalEntityBridge.java similarity index 80% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/InternalEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/InternalEntityBridge.java index 71b9887f..f8411b3e 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/InternalEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/InternalEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity; +package io.izzel.arclight.common.bridge.core.entity; import net.minecraft.core.BlockPos; import org.bukkit.craftbukkit.v.entity.CraftEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/LivingEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/LivingEntityBridge.java similarity index 96% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/LivingEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/LivingEntityBridge.java index eedd76a0..ae3c32f3 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/LivingEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/LivingEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity; +package io.izzel.arclight.common.bridge.core.entity; import org.bukkit.craftbukkit.v.entity.CraftLivingEntity; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/MobEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/MobEntityBridge.java similarity index 94% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/MobEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/MobEntityBridge.java index 7086653d..6a93b842 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/MobEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/MobEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity; +package io.izzel.arclight.common.bridge.core.entity; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.LivingEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/ai/attributes/RangedAttributeBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/ai/attributes/RangedAttributeBridge.java similarity index 59% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/ai/attributes/RangedAttributeBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/ai/attributes/RangedAttributeBridge.java index a941dbcb..82f76fe0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/ai/attributes/RangedAttributeBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/ai/attributes/RangedAttributeBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity.ai.attributes; +package io.izzel.arclight.common.bridge.core.entity.ai.attributes; public interface RangedAttributeBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/merchant/IMerchantBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/merchant/IMerchantBridge.java similarity index 69% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/merchant/IMerchantBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/merchant/IMerchantBridge.java index 3f9eb659..ad5fff1b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/merchant/IMerchantBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/merchant/IMerchantBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity.merchant; +package io.izzel.arclight.common.bridge.core.entity.merchant; import org.bukkit.craftbukkit.v.inventory.CraftMerchant; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/CreeperEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/CreeperEntityBridge.java new file mode 100644 index 00000000..1aa6eef6 --- /dev/null +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/CreeperEntityBridge.java @@ -0,0 +1,8 @@ +package io.izzel.arclight.common.bridge.core.entity.monster; + +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; + +public interface CreeperEntityBridge extends MobEntityBridge { + + void bridge$setPowered(boolean power); +} diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/EndermanEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/EndermanEntityBridge.java similarity index 71% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/EndermanEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/EndermanEntityBridge.java index a3527ea7..ff470494 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/EndermanEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/EndermanEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity.monster; +package io.izzel.arclight.common.bridge.core.entity.monster; import net.minecraft.world.entity.LivingEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/piglin/PiglinBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/piglin/PiglinBridge.java similarity index 73% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/piglin/PiglinBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/piglin/PiglinBridge.java index 5eadc808..36a6b131 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/piglin/PiglinBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/monster/piglin/PiglinBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity.monster.piglin; +package io.izzel.arclight.common.bridge.core.entity.monster.piglin; import net.minecraft.world.item.Item; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/AnimalEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/AnimalEntityBridge.java similarity index 53% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/AnimalEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/AnimalEntityBridge.java index a7d34454..83c1a67c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/AnimalEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/AnimalEntityBridge.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.common.bridge.entity.passive; +package io.izzel.arclight.common.bridge.core.entity.passive; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.item.ItemStack; public interface AnimalEntityBridge extends MobEntityBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/FoxEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/FoxEntityBridge.java similarity index 68% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/FoxEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/FoxEntityBridge.java index a3f56e56..39c9c2a3 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/FoxEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/FoxEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity.passive; +package io.izzel.arclight.common.bridge.core.entity.passive; import java.util.UUID; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/TurtleEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/TurtleEntityBridge.java similarity index 78% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/TurtleEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/TurtleEntityBridge.java index 3781f1e7..3efffa20 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/TurtleEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/passive/TurtleEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity.passive; +package io.izzel.arclight.common.bridge.core.entity.passive; public interface TurtleEntityBridge extends AnimalEntityBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/PlayerEntityBridge.java similarity index 82% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/PlayerEntityBridge.java index fe3dd60e..d826783b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/PlayerEntityBridge.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.common.bridge.entity.player; +package io.izzel.arclight.common.bridge.core.entity.player; import com.mojang.datafixers.util.Either; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.util.Unit; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerInventoryBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/PlayerInventoryBridge.java similarity index 68% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerInventoryBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/PlayerInventoryBridge.java index 09e8951a..02609dfc 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/PlayerInventoryBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/PlayerInventoryBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity.player; +package io.izzel.arclight.common.bridge.core.entity.player; import net.minecraft.world.item.ItemStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/ServerPlayerEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/ServerPlayerEntityBridge.java similarity index 94% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/ServerPlayerEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/ServerPlayerEntityBridge.java index c53a26b3..7793a44c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/player/ServerPlayerEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/player/ServerPlayerEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity.player; +package io.izzel.arclight.common.bridge.core.entity.player; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/ArrowEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/ArrowEntityBridge.java similarity index 63% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/ArrowEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/ArrowEntityBridge.java index e26a4a7f..045d25e2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/ArrowEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/ArrowEntityBridge.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.common.bridge.entity.projectile; +package io.izzel.arclight.common.bridge.core.entity.projectile; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; public interface ArrowEntityBridge extends EntityBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/DamagingProjectileEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/DamagingProjectileEntityBridge.java new file mode 100644 index 00000000..8fbdf1d7 --- /dev/null +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/DamagingProjectileEntityBridge.java @@ -0,0 +1,8 @@ +package io.izzel.arclight.common.bridge.core.entity.projectile; + +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; + +public interface DamagingProjectileEntityBridge extends EntityBridge { + + void bridge$setBukkitYield(float yield); +} diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/TridentEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/TridentEntityBridge.java similarity index 68% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/TridentEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/TridentEntityBridge.java index 40832316..7c71252c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/TridentEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/TridentEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.entity.projectile; +package io.izzel.arclight.common.bridge.core.entity.projectile; import net.minecraft.world.item.ItemStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/CraftingInventoryBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/CraftingInventoryBridge.java similarity index 82% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/CraftingInventoryBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/CraftingInventoryBridge.java index 606887b0..ea073a94 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/CraftingInventoryBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/CraftingInventoryBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.inventory; +package io.izzel.arclight.common.bridge.core.inventory; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/IInventoryBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/IInventoryBridge.java similarity index 96% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/IInventoryBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/IInventoryBridge.java index 103149a3..dec71b99 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/IInventoryBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/IInventoryBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.inventory; +package io.izzel.arclight.common.bridge.core.inventory; import io.izzel.arclight.common.mod.ArclightMod; import io.izzel.arclight.common.mod.util.WrappedContents; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/ContainerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/ContainerBridge.java similarity index 88% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/ContainerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/ContainerBridge.java index 874c0a93..e599704a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/ContainerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/ContainerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.inventory.container; +package io.izzel.arclight.common.bridge.core.inventory.container; import net.minecraft.network.chat.Component; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/LecternContainerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/LecternContainerBridge.java similarity index 71% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/LecternContainerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/LecternContainerBridge.java index 05ccb708..89c138bb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/LecternContainerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/LecternContainerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.inventory.container; +package io.izzel.arclight.common.bridge.core.inventory.container; import net.minecraft.world.entity.player.Inventory; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/PosContainerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/PosContainerBridge.java similarity index 71% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/PosContainerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/PosContainerBridge.java index ca9b3a99..4dbf74bb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/PosContainerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/PosContainerBridge.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.common.bridge.inventory.container; +package io.izzel.arclight.common.bridge.core.inventory.container; -import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.bridge.core.util.IWorldPosCallableBridge; import net.minecraft.world.inventory.ContainerLevelAccess; import org.bukkit.Location; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/SlotBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/SlotBridge.java similarity index 56% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/SlotBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/SlotBridge.java index 9e601aea..416c85b9 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/inventory/container/SlotBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/inventory/container/SlotBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.inventory.container; +package io.izzel.arclight.common.bridge.core.inventory.container; public interface SlotBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/ItemStackBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/ItemStackBridge.java similarity index 80% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/ItemStackBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/ItemStackBridge.java index 10fd7312..70a0082d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/ItemStackBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/ItemStackBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.item; +package io.izzel.arclight.common.bridge.core.item; import net.minecraft.nbt.CompoundTag; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/MerchantOfferBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/MerchantOfferBridge.java similarity index 74% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/MerchantOfferBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/MerchantOfferBridge.java index 83d636a1..aa18ea4c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/MerchantOfferBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/MerchantOfferBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.item; +package io.izzel.arclight.common.bridge.core.item; import org.bukkit.craftbukkit.v.inventory.CraftMerchantRecipe; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IRecipeBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/IRecipeBridge.java similarity index 64% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IRecipeBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/IRecipeBridge.java index 49e07ed6..f8066b89 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IRecipeBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/IRecipeBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.item.crafting; +package io.izzel.arclight.common.bridge.core.item.crafting; import org.bukkit.inventory.Recipe; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IngredientBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/IngredientBridge.java similarity index 65% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IngredientBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/IngredientBridge.java index 83eaa45d..0544dfdd 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/IngredientBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/IngredientBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.item.crafting; +package io.izzel.arclight.common.bridge.core.item.crafting; public interface IngredientBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/RecipeManagerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/RecipeManagerBridge.java similarity index 74% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/RecipeManagerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/RecipeManagerBridge.java index f97e1ad1..91a15c37 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/item/crafting/RecipeManagerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/item/crafting/RecipeManagerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.item.crafting; +package io.izzel.arclight.common.bridge.core.item.crafting; import net.minecraft.world.item.crafting.Recipe; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/NetworkManagerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/NetworkManagerBridge.java similarity index 87% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/NetworkManagerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/NetworkManagerBridge.java index ccd257e3..09d18e46 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/NetworkManagerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/NetworkManagerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.network; +package io.izzel.arclight.common.bridge.core.network; import com.mojang.authlib.properties.Property; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/datasync/EntityDataManagerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/datasync/EntityDataManagerBridge.java similarity index 72% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/datasync/EntityDataManagerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/datasync/EntityDataManagerBridge.java index 3b548052..afaba007 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/datasync/EntityDataManagerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/datasync/EntityDataManagerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.network.datasync; +package io.izzel.arclight.common.bridge.core.network.datasync; import net.minecraft.network.syncher.EntityDataAccessor; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/login/ServerLoginNetHandlerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/login/ServerLoginNetHandlerBridge.java similarity index 68% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/login/ServerLoginNetHandlerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/login/ServerLoginNetHandlerBridge.java index be4daf2f..b3d3fc60 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/login/ServerLoginNetHandlerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/login/ServerLoginNetHandlerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.network.login; +package io.izzel.arclight.common.bridge.core.network.login; public interface ServerLoginNetHandlerBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/play/ServerPlayNetHandlerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/play/ServerPlayNetHandlerBridge.java similarity index 86% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/play/ServerPlayNetHandlerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/play/ServerPlayNetHandlerBridge.java index 847e1b5f..e2784e85 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/play/ServerPlayNetHandlerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/play/ServerPlayNetHandlerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.network.play; +package io.izzel.arclight.common.bridge.core.network.play; import org.bukkit.Location; import org.bukkit.event.player.PlayerTeleportEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/play/TimestampedPacket.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/play/TimestampedPacket.java similarity index 54% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/play/TimestampedPacket.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/play/TimestampedPacket.java index e9b008f1..86776929 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/play/TimestampedPacket.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/play/TimestampedPacket.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.network.play; +package io.izzel.arclight.common.bridge.core.network.play; public interface TimestampedPacket { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/rcon/RConConsoleSourceBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/rcon/RConConsoleSourceBridge.java similarity index 60% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/rcon/RConConsoleSourceBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/rcon/RConConsoleSourceBridge.java index 3f138f37..4fe7df6d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/network/rcon/RConConsoleSourceBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/rcon/RConConsoleSourceBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.network.rcon; +package io.izzel.arclight.common.bridge.core.network.rcon; public interface RConConsoleSourceBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/CustomServerBossInfoBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/CustomServerBossInfoBridge.java similarity index 71% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/CustomServerBossInfoBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/CustomServerBossInfoBridge.java index 57de723a..8434c214 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/CustomServerBossInfoBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/CustomServerBossInfoBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.server; +package io.izzel.arclight.common.bridge.core.server; import org.bukkit.boss.KeyedBossBar; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/MinecraftServerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/MinecraftServerBridge.java similarity index 92% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/MinecraftServerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/MinecraftServerBridge.java index bab218a8..096b0bd1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/MinecraftServerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/MinecraftServerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.server; +package io.izzel.arclight.common.bridge.core.server; import net.minecraft.commands.Commands; import org.bukkit.command.ConsoleCommandSender; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/BanEntryBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/BanEntryBridge.java similarity index 58% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/BanEntryBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/BanEntryBridge.java index 2739e310..d5121141 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/BanEntryBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/BanEntryBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.server.management; +package io.izzel.arclight.common.bridge.core.server.management; import java.util.Date; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerInteractionManagerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/PlayerInteractionManagerBridge.java similarity index 77% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerInteractionManagerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/PlayerInteractionManagerBridge.java index 9b328831..f5fb4efc 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerInteractionManagerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/PlayerInteractionManagerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.server.management; +package io.izzel.arclight.common.bridge.core.server.management; public interface PlayerInteractionManagerBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerListBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/PlayerListBridge.java similarity index 91% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerListBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/PlayerListBridge.java index c4e00f76..55ed8e46 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/PlayerListBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/PlayerListBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.server.management; +package io.izzel.arclight.common.bridge.core.server.management; import com.mojang.authlib.GameProfile; import org.bukkit.craftbukkit.v.CraftServer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/UserListBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/UserListBridge.java similarity index 63% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/UserListBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/UserListBridge.java index 9a07c8f4..4d1e6143 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/management/UserListBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/server/management/UserListBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.server.management; +package io.izzel.arclight.common.bridge.core.server.management; import java.util.Collection; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tags/NetworkTagCollectionBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tags/NetworkTagCollectionBridge.java similarity index 61% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/tags/NetworkTagCollectionBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tags/NetworkTagCollectionBridge.java index dd8f847b..292ce830 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tags/NetworkTagCollectionBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tags/NetworkTagCollectionBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.tags; +package io.izzel.arclight.common.bridge.core.tags; public interface NetworkTagCollectionBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/AbstractFurnaceTileEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/AbstractFurnaceTileEntityBridge.java similarity index 87% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/AbstractFurnaceTileEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/AbstractFurnaceTileEntityBridge.java index 2aa686b2..7d7dab8f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/AbstractFurnaceTileEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/AbstractFurnaceTileEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.tileentity; +package io.izzel.arclight.common.bridge.core.tileentity; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/BeaconTileEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/BeaconTileEntityBridge.java similarity index 75% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/BeaconTileEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/BeaconTileEntityBridge.java index 17681d7c..93b17b47 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/BeaconTileEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/BeaconTileEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.tileentity; +package io.izzel.arclight.common.bridge.core.tileentity; import org.bukkit.potion.PotionEffect; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/SignTileEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/SignTileEntityBridge.java similarity index 61% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/SignTileEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/SignTileEntityBridge.java index bd37156e..b5e3173e 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/SignTileEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/SignTileEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.tileentity; +package io.izzel.arclight.common.bridge.core.tileentity; public interface SignTileEntityBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/TileEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/TileEntityBridge.java similarity index 68% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/TileEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/TileEntityBridge.java index d87f07e8..213ad162 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/tileentity/TileEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/tileentity/TileEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.tileentity; +package io.izzel.arclight.common.bridge.core.tileentity; import org.bukkit.inventory.InventoryHolder; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/DamageSourceBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/DamageSourceBridge.java similarity index 75% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/DamageSourceBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/DamageSourceBridge.java index 1557fb2a..a77b3c12 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/DamageSourceBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/DamageSourceBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.util; +package io.izzel.arclight.common.bridge.core.util; import net.minecraft.world.damagesource.DamageSource; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/FoodStatsBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/FoodStatsBridge.java similarity index 73% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/FoodStatsBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/FoodStatsBridge.java index 2fc0f16e..eb8a3ead 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/FoodStatsBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/FoodStatsBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.util; +package io.izzel.arclight.common.bridge.core.util; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IWorldPosCallableBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/IWorldPosCallableBridge.java similarity index 88% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IWorldPosCallableBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/IWorldPosCallableBridge.java index 4f81d10e..fc3f3414 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IWorldPosCallableBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/IWorldPosCallableBridge.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.common.bridge.util; +package io.izzel.arclight.common.bridge.core.util; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.inventory.ContainerLevelAccess; import net.minecraft.world.level.Level; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IndirectEntityDamageSourceBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/IndirectEntityDamageSourceBridge.java similarity index 77% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IndirectEntityDamageSourceBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/IndirectEntityDamageSourceBridge.java index cd84cbcc..01b6262d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/IndirectEntityDamageSourceBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/IndirectEntityDamageSourceBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.util; +package io.izzel.arclight.common.bridge.core.util; import net.minecraft.world.entity.Entity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/text/ITextComponentBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/text/ITextComponentBridge.java similarity index 80% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/text/ITextComponentBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/text/ITextComponentBridge.java index f0fd5dd7..fb007e1c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/util/text/ITextComponentBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/util/text/ITextComponentBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.util.text; +package io.izzel.arclight.common.bridge.core.util.text; import java.util.Iterator; import java.util.stream.Stream; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/ExplosionBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/ExplosionBridge.java similarity index 85% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/ExplosionBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/ExplosionBridge.java index d62ef4d6..d161174c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/ExplosionBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/ExplosionBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world; +package io.izzel.arclight.common.bridge.core.world; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Explosion; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IBlockReaderBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IBlockReaderBridge.java similarity index 82% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IBlockReaderBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IBlockReaderBridge.java index a4383142..c51afaf6 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IBlockReaderBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IBlockReaderBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world; +package io.izzel.arclight.common.bridge.core.world; import net.minecraft.core.BlockPos; import net.minecraft.world.level.ClipContext; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IWorldBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IWorldBridge.java similarity index 71% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IWorldBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IWorldBridge.java index 08b86e19..e982edcf 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IWorldBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IWorldBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world; +package io.izzel.arclight.common.bridge.core.world; import net.minecraft.server.level.ServerLevel; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IWorldWriterBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IWorldWriterBridge.java similarity index 87% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IWorldWriterBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IWorldWriterBridge.java index 61cd2cb3..35787af4 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/IWorldWriterBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/IWorldWriterBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world; +package io.izzel.arclight.common.bridge.core.world; import net.minecraft.world.entity.Entity; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/TeleporterBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/TeleporterBridge.java similarity index 89% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/TeleporterBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/TeleporterBridge.java index cda48c61..5e8b8dec 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/TeleporterBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/TeleporterBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world; +package io.izzel.arclight.common.bridge.core.world; import java.util.Optional; import net.minecraft.BlockUtil; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/TrackedEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/TrackedEntityBridge.java similarity index 77% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/TrackedEntityBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/TrackedEntityBridge.java index 6ca920e8..8368ae7d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/TrackedEntityBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/TrackedEntityBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world; +package io.izzel.arclight.common.bridge.core.world; import java.util.Set; import net.minecraft.server.level.ServerPlayer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/WorldBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/WorldBridge.java similarity index 95% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/WorldBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/WorldBridge.java index 579fe20a..415a8069 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/WorldBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/WorldBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world; +package io.izzel.arclight.common.bridge.core.world; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceKey; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/border/WorldBorderBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/border/WorldBorderBridge.java similarity index 71% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/border/WorldBorderBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/border/WorldBorderBridge.java index 7a4774c3..2973b8d3 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/border/WorldBorderBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/border/WorldBorderBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.border; +package io.izzel.arclight.common.bridge.core.world.border; import net.minecraft.world.level.Level; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/ChunkBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/ChunkBridge.java similarity index 92% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/ChunkBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/ChunkBridge.java index 4b89256f..53f4626c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/ChunkBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/ChunkBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.chunk; +package io.izzel.arclight.common.bridge.core.world.chunk; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/storage/RegionFileCacheBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/storage/RegionFileCacheBridge.java similarity index 73% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/storage/RegionFileCacheBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/storage/RegionFileCacheBridge.java index 32a2dedb..011b4c78 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/chunk/storage/RegionFileCacheBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/storage/RegionFileCacheBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.chunk.storage; +package io.izzel.arclight.common.bridge.core.world.chunk.storage; import java.io.IOException; import net.minecraft.world.level.ChunkPos; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/raid/RaidBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/raid/RaidBridge.java similarity index 73% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/raid/RaidBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/raid/RaidBridge.java index eabcacf2..55c40e8d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/raid/RaidBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/raid/RaidBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.raid; +package io.izzel.arclight.common.bridge.core.world.raid; import java.util.Collection; import net.minecraft.world.entity.raid.Raider; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkHolderBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ChunkHolderBridge.java similarity index 78% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkHolderBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ChunkHolderBridge.java index f146ceca..6fdc6e5e 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkHolderBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ChunkHolderBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.server; +package io.izzel.arclight.common.bridge.core.world.server; import net.minecraft.world.level.chunk.LevelChunk; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkMapBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ChunkMapBridge.java similarity index 92% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkMapBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ChunkMapBridge.java index df3fd4b3..6ded102a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ChunkMapBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ChunkMapBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.server; +package io.izzel.arclight.common.bridge.core.world.server; import io.izzel.arclight.common.mod.util.ArclightCallbackExecutor; import net.minecraft.server.level.ChunkHolder; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerChunkProviderBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ServerChunkProviderBridge.java similarity index 90% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerChunkProviderBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ServerChunkProviderBridge.java index 59fe21f1..9c675599 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerChunkProviderBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ServerChunkProviderBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.server; +package io.izzel.arclight.common.bridge.core.world.server; import java.io.IOException; import net.minecraft.server.level.ThreadedLevelLightEngine; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerWorldBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ServerWorldBridge.java similarity index 91% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerWorldBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ServerWorldBridge.java index 0cc4a780..6cf2b187 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/ServerWorldBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ServerWorldBridge.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.common.bridge.world.server; +package io.izzel.arclight.common.bridge.core.world.server; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.weather.LightningStrikeEvent; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.world.entity.Entity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketManagerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/TicketManagerBridge.java similarity index 91% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketManagerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/TicketManagerBridge.java index ac87b376..c769295d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketManagerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/TicketManagerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.server; +package io.izzel.arclight.common.bridge.core.world.server; import net.minecraft.server.level.Ticket; import net.minecraft.server.level.TicketType; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketTypeBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/TicketTypeBridge.java similarity index 58% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketTypeBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/TicketTypeBridge.java index 722d1652..1f7df0bc 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/server/TicketTypeBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/TicketTypeBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.server; +package io.izzel.arclight.common.bridge.core.world.server; public interface TicketTypeBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/spawner/WorldEntitySpawnerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/spawner/WorldEntitySpawnerBridge.java similarity index 90% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/spawner/WorldEntitySpawnerBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/spawner/WorldEntitySpawnerBridge.java index 12d056b0..6855d964 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/spawner/WorldEntitySpawnerBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/spawner/WorldEntitySpawnerBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.spawner; +package io.izzel.arclight.common.bridge.core.world.spawner; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.EntityType; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/DerivedWorldInfoBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/DerivedWorldInfoBridge.java similarity index 83% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/DerivedWorldInfoBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/DerivedWorldInfoBridge.java index cd3d4bc4..8eedf866 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/DerivedWorldInfoBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/DerivedWorldInfoBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.storage; +package io.izzel.arclight.common.bridge.core.world.storage; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.dimension.DimensionType; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/MapDataBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/MapDataBridge.java similarity index 84% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/MapDataBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/MapDataBridge.java index e28b9b60..e9fa83a5 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/MapDataBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/MapDataBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.storage; +package io.izzel.arclight.common.bridge.core.world.storage; import net.minecraft.world.level.saveddata.maps.MapItemSavedData; import org.bukkit.craftbukkit.v.map.CraftMapView; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/PlayerDataBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/PlayerDataBridge.java similarity index 75% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/PlayerDataBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/PlayerDataBridge.java index 46992391..8bafc6cb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/PlayerDataBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/PlayerDataBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.storage; +package io.izzel.arclight.common.bridge.core.world.storage; import java.io.File; import net.minecraft.nbt.CompoundTag; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/SaveFormatBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/SaveFormatBridge.java similarity index 88% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/SaveFormatBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/SaveFormatBridge.java index 6f280fec..1b48697f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/SaveFormatBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/SaveFormatBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.storage; +package io.izzel.arclight.common.bridge.core.world.storage; import java.io.IOException; import net.minecraft.resources.ResourceKey; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/WorldInfoBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/WorldInfoBridge.java similarity index 85% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/WorldInfoBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/WorldInfoBridge.java index 9286f4d2..f3479d30 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/WorldInfoBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/WorldInfoBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.storage; +package io.izzel.arclight.common.bridge.core.world.storage; import com.mojang.serialization.Lifecycle; import net.minecraft.server.level.ServerLevel; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/loot/LootTableBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/loot/LootTableBridge.java similarity index 77% rename from arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/loot/LootTableBridge.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/loot/LootTableBridge.java index c0ee9ce0..9b3dab8f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/storage/loot/LootTableBridge.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/loot/LootTableBridge.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.bridge.world.storage.loot; +package io.izzel.arclight.common.bridge.core.world.storage.loot; import net.minecraft.world.Container; import net.minecraft.world.level.storage.loot.LootContext; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/CreeperEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/CreeperEntityBridge.java deleted file mode 100644 index 5117a5cb..00000000 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/CreeperEntityBridge.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.izzel.arclight.common.bridge.entity.monster; - -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; - -public interface CreeperEntityBridge extends MobEntityBridge { - - void bridge$setPowered(boolean power); -} diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/DamagingProjectileEntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/DamagingProjectileEntityBridge.java deleted file mode 100644 index 5de201da..00000000 --- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/projectile/DamagingProjectileEntityBridge.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.izzel.arclight.common.bridge.entity.projectile; - -import io.izzel.arclight.common.bridge.entity.EntityBridge; - -public interface DamagingProjectileEntityBridge extends EntityBridge { - - void bridge$setBukkitYield(float yield); -} diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/bridge/EntityBridge_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/optimization/EntityBridge_ActivationRange.java similarity index 69% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/bridge/EntityBridge_ActivationRange.java rename to arclight-common/src/main/java/io/izzel/arclight/common/bridge/optimization/EntityBridge_ActivationRange.java index a3609fb1..b8ea7342 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/bridge/EntityBridge_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/optimization/EntityBridge_ActivationRange.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.bridge; +package io.izzel.arclight.common.bridge.optimization; public interface EntityBridge_ActivationRange { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftEventFactoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftEventFactoryMixin.java index 20ab7826..c29f7bc1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftEventFactoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftEventFactoryMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.bukkit; import com.google.common.base.Function; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import io.izzel.arclight.common.mod.ArclightMod; import io.izzel.arclight.common.mod.util.ArclightCaptures; import org.bukkit.Bukkit; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftItemStackMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftItemStackMixin.java index b223b984..ff5bc566 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftItemStackMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftItemStackMixin.java @@ -2,7 +2,7 @@ package io.izzel.arclight.common.mixin.bukkit; import io.izzel.arclight.common.bridge.bukkit.CraftItemStackBridge; import io.izzel.arclight.common.bridge.bukkit.ItemMetaBridge; -import io.izzel.arclight.common.bridge.item.ItemStackBridge; +import io.izzel.arclight.common.bridge.core.item.ItemStackBridge; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; import org.bukkit.Material; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java index fd62d622..216f54c1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.common.mixin.bukkit; import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.StringReader; import io.izzel.arclight.common.bridge.bukkit.CraftServerBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mod.server.ArclightServer; import jline.console.ConsoleReader; import net.minecraft.commands.CommandSourceStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftWorldMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftWorldMixin.java index 3c127424..755c15b7 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftWorldMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftWorldMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.bukkit; import io.izzel.arclight.common.bridge.bukkit.EntityTypeBridge; -import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge; import org.bukkit.Location; import org.bukkit.craftbukkit.v.CraftWorld; import org.bukkit.entity.Entity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/MaterialMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/MaterialMixin.java index e0ef15fb..f2be5b1d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/MaterialMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/MaterialMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.bukkit; import com.google.common.collect.ImmutableMap; -import io.izzel.arclight.common.bridge.block.FireBlockBridge; +import io.izzel.arclight.common.bridge.core.block.FireBlockBridge; import io.izzel.arclight.common.bridge.bukkit.MaterialBridge; import io.izzel.arclight.common.mod.ArclightMod; import io.izzel.arclight.common.mod.server.block.ArclightTileInventory; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/PluginClassLoaderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/PluginClassLoaderMixin.java index 696ea7b3..c9f79533 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/PluginClassLoaderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/PluginClassLoaderMixin.java @@ -1,7 +1,6 @@ package io.izzel.arclight.common.mixin.bukkit; import com.google.common.io.ByteStreams; -import io.izzel.arclight.common.asm.SwitchTableFixer; import io.izzel.arclight.common.bridge.bukkit.JavaPluginLoaderBridge; import io.izzel.arclight.common.mod.util.remapper.ArclightRemapper; import io.izzel.arclight.common.mod.util.remapper.ClassLoaderRemapper; @@ -75,7 +74,7 @@ public class PluginClassLoaderMixin extends URLClassLoader implements RemappingC byteSource = () -> { try (InputStream is = connection.getInputStream()) { byte[] classBytes = ByteStreams.toByteArray(is); - classBytes = SwitchTableFixer.INSTANCE.processClass(classBytes); + classBytes = ArclightRemapper.SWITCH_TABLE_FIXER.apply(classBytes); classBytes = Bukkit.getUnsafe().processClass(description, path, classBytes); return classBytes; } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/RecipeIteratorMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/RecipeIteratorMixin.java index bd804104..6253f0d9 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/RecipeIteratorMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/RecipeIteratorMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.bukkit; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import org.bukkit.craftbukkit.v.inventory.RecipeIterator; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/advancements/AdvancementMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/advancements/AdvancementMixin.java index 97753c26..92405b88 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/advancements/AdvancementMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/advancements/AdvancementMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.common.mixin.core.advancements; import net.minecraft.advancements.Advancement; import org.bukkit.craftbukkit.v.advancement.CraftAdvancement; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.common.bridge.advancement.AdvancementBridge; +import io.izzel.arclight.common.bridge.core.advancement.AdvancementBridge; @Mixin(Advancement.class) public class AdvancementMixin implements AdvancementBridge { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandNodeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandNodeMixin.java deleted file mode 100644 index 59647da0..00000000 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandNodeMixin.java +++ /dev/null @@ -1,51 +0,0 @@ -package io.izzel.arclight.common.mixin.core.commands; - -import com.mojang.brigadier.tree.ArgumentCommandNode; -import com.mojang.brigadier.tree.CommandNode; -import com.mojang.brigadier.tree.LiteralCommandNode; -import io.izzel.arclight.common.bridge.command.CommandNodeBridge; -import io.izzel.arclight.common.bridge.command.CommandSourceBridge; -import net.minecraft.commands.CommandSourceStack; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import java.util.Map; -import java.util.function.Predicate; - -@Mixin(value = CommandNode.class, remap = false) -public class CommandNodeMixin implements CommandNodeBridge { - - // @formatter:off - @Shadow @Final private Map> children; - @Shadow @Final private Map> literals; - @Shadow @Final private Map> arguments; - @Shadow @Final private Predicate requirement; - // @formatter:on - - public void removeCommand(String name) { - children.remove(name); - literals.remove(name); - arguments.remove(name); - } - - @Override - public void bridge$removeCommand(String name) { - removeCommand(name); - } - - @Inject(method = "canUse", cancellable = true, at = @At("HEAD")) - public void on(S source, CallbackInfoReturnable cir) { - if (source instanceof CommandSourceStack) { - try { - ((CommandSourceBridge) source).bridge$setCurrentCommand((CommandNode) (Object) this); - cir.setReturnValue(requirement.test(source)); - } finally { - ((CommandSourceBridge) source).bridge$setCurrentCommand(null); - } - } - } -} diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandSourceMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandSourceMixin.java index 6ebbb193..0d57f294 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandSourceMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandSourceMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.commands; -import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import org.bukkit.command.CommandSender; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandSourceStackMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandSourceStackMixin.java index b7f3268b..41bfcf41 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandSourceStackMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandSourceStackMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.commands; import com.mojang.brigadier.tree.CommandNode; -import io.izzel.arclight.common.bridge.command.CommandSourceBridge; -import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.core.command.CommandSourceBridge; +import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandsMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandsMixin.java index 75ed17e7..fd92f7df 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandsMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandsMixin.java @@ -4,9 +4,9 @@ import com.google.common.collect.Maps; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.tree.CommandNode; import com.mojang.brigadier.tree.RootCommandNode; -import io.izzel.arclight.common.bridge.command.CommandNodeBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge; +import io.izzel.arclight.common.mod.compat.CommandNodeHooks; import io.izzel.arclight.common.mod.util.BukkitDispatcher; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; @@ -21,6 +21,8 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; import java.util.LinkedHashSet; import java.util.Map; @@ -69,9 +71,14 @@ public abstract class CommandsMixin { Bukkit.getPluginManager().callEvent(event); for (String s : set) { if (!event.getCommands().contains(s)) { - ((CommandNodeBridge) node).bridge$removeCommand(s); + CommandNodeHooks.removeCommand(node, s); } } player.connection.send(new ClientboundCommandsPacket(node)); } + + @Redirect(method = "fillUsableCommands", at = @At(value = "INVOKE", remap = false, target = "Lcom/mojang/brigadier/tree/CommandNode;canUse(Ljava/lang/Object;)Z")) + private boolean arclight$canUse(CommandNode commandNode, S source) { + return CommandNodeHooks.canUse(commandNode, source); + } } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/EntityArgumentMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/EntityArgumentMixin.java index c47042fc..b8d04066 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/EntityArgumentMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/EntityArgumentMixin.java @@ -2,8 +2,8 @@ package io.izzel.arclight.common.mixin.core.commands.arguments; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import io.izzel.arclight.common.bridge.command.arguments.EntityArgumentBridge; -import io.izzel.arclight.common.bridge.command.arguments.EntitySelectorParserBridge; +import io.izzel.arclight.common.bridge.core.command.arguments.EntityArgumentBridge; +import io.izzel.arclight.common.bridge.core.command.arguments.EntitySelectorParserBridge; import net.minecraft.commands.arguments.EntityArgument; import net.minecraft.commands.arguments.selector.EntitySelector; import net.minecraft.commands.arguments.selector.EntitySelectorParser; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/selector/EntitySelectorMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/selector/EntitySelectorMixin.java index ff39f61b..be20d068 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/selector/EntitySelectorMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/selector/EntitySelectorMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.commands.arguments.selector; -import io.izzel.arclight.common.bridge.command.CommandSourceBridge; +import io.izzel.arclight.common.bridge.core.command.CommandSourceBridge; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.arguments.selector.EntitySelector; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/selector/EntitySelectorParserMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/selector/EntitySelectorParserMixin.java index 1787a892..33ee6b04 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/selector/EntitySelectorParserMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/arguments/selector/EntitySelectorParserMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.commands.arguments.selector; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import io.izzel.arclight.common.bridge.command.arguments.EntitySelectorParserBridge; +import io.izzel.arclight.common.bridge.core.command.arguments.EntitySelectorParserBridge; import net.minecraft.commands.arguments.selector.EntitySelector; import net.minecraft.commands.arguments.selector.EntitySelectorParser; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/fluid/LavaFluidMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/fluid/LavaFluidMixin.java index d0231886..37fc7906 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/fluid/LavaFluidMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/fluid/LavaFluidMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.fluid; -import io.izzel.arclight.common.bridge.world.IWorldBridge; +import io.izzel.arclight.common.bridge.core.world.IWorldBridge; import io.izzel.arclight.mixin.Eject; import net.minecraft.core.BlockPos; import net.minecraft.world.level.GameRules; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ConnectionMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ConnectionMixin.java index 687981d4..1ae76a72 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ConnectionMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ConnectionMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.network; import com.mojang.authlib.properties.Property; -import io.izzel.arclight.common.bridge.network.NetworkManagerBridge; +import io.izzel.arclight.common.bridge.core.network.NetworkManagerBridge; import io.netty.channel.Channel; import net.minecraft.network.Connection; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerHandshakeNetHandlerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerHandshakeNetHandlerMixin.java index 8a3ca317..236f8cda 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerHandshakeNetHandlerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerHandshakeNetHandlerMixin.java @@ -3,8 +3,8 @@ package io.izzel.arclight.common.mixin.core.network; import com.google.gson.Gson; import com.mojang.authlib.properties.Property; import com.mojang.util.UUIDTypeAdapter; -import io.izzel.arclight.common.bridge.network.NetworkManagerBridge; -import io.izzel.arclight.common.bridge.network.login.ServerLoginNetHandlerBridge; +import io.izzel.arclight.common.bridge.core.network.NetworkManagerBridge; +import io.izzel.arclight.common.bridge.core.network.login.ServerLoginNetHandlerBridge; import net.minecraft.SharedConstants; import net.minecraft.network.Connection; import net.minecraft.network.ConnectionProtocol; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerLoginNetHandlerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerLoginNetHandlerMixin.java index e5b0eae8..17bbf753 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerLoginNetHandlerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerLoginNetHandlerMixin.java @@ -2,10 +2,10 @@ package io.izzel.arclight.common.mixin.core.network; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; -import io.izzel.arclight.common.bridge.network.NetworkManagerBridge; -import io.izzel.arclight.common.bridge.network.login.ServerLoginNetHandlerBridge; -import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; -import io.izzel.arclight.common.bridge.server.management.PlayerListBridge; +import io.izzel.arclight.common.bridge.core.network.NetworkManagerBridge; +import io.izzel.arclight.common.bridge.core.network.login.ServerLoginNetHandlerBridge; +import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.core.server.management.PlayerListBridge; import net.minecraft.DefaultUncaughtExceptionHandler; import net.minecraft.network.Connection; import net.minecraft.network.chat.Component; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java index d7b574db..a15cdae2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java @@ -1,15 +1,15 @@ package io.izzel.arclight.common.mixin.core.network; import com.google.common.base.Charsets; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.container.ContainerBridge; -import io.izzel.arclight.common.bridge.network.play.ServerPlayNetHandlerBridge; -import io.izzel.arclight.common.bridge.network.play.TimestampedPacket; -import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; -import io.izzel.arclight.common.bridge.server.management.PlayerInteractionManagerBridge; -import io.izzel.arclight.common.bridge.server.management.PlayerListBridge; -import io.izzel.arclight.common.bridge.tileentity.SignTileEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.ContainerBridge; +import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge; +import io.izzel.arclight.common.bridge.core.network.play.TimestampedPacket; +import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.core.server.management.PlayerInteractionManagerBridge; +import io.izzel.arclight.common.bridge.core.server.management.PlayerListBridge; +import io.izzel.arclight.common.bridge.core.tileentity.SignTileEntityBridge; import io.izzel.arclight.common.mod.ArclightConstants; import io.izzel.arclight.common.mod.util.ArclightCaptures; import io.netty.util.concurrent.Future; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/SynchedEntityDataMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/SynchedEntityDataMixin.java index 62974bc7..9ace4f24 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/SynchedEntityDataMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/SynchedEntityDataMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.network; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.network.datasync.EntityDataManagerBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.network.datasync.EntityDataManagerBridge; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.SynchedEntityData; import net.minecraft.world.entity.Entity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/chat/ComponentMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/chat/ComponentMixin.java index edc01abb..0e22f0db 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/chat/ComponentMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/chat/ComponentMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.network.chat; import com.google.common.collect.Streams; -import io.izzel.arclight.common.bridge.util.text.ITextComponentBridge; +import io.izzel.arclight.common.bridge.core.util.text.ITextComponentBridge; import net.minecraft.network.chat.Component; import org.jetbrains.annotations.NotNull; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/PacketThreadUtilMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/PacketThreadUtilMixin.java index 7936a889..dcdd71d1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/PacketThreadUtilMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/PacketThreadUtilMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.network.protocol; -import io.izzel.arclight.common.bridge.network.play.ServerPlayNetHandlerBridge; -import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge; +import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge; import net.minecraft.network.PacketListener; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.PacketUtils; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/CPlayerTryUseItemOnBlockPacketMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/CPlayerTryUseItemOnBlockPacketMixin.java index abf2db25..f097e9f3 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/CPlayerTryUseItemOnBlockPacketMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/CPlayerTryUseItemOnBlockPacketMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.network.protocol.game; -import io.izzel.arclight.common.bridge.network.play.TimestampedPacket; +import io.izzel.arclight.common.bridge.core.network.play.TimestampedPacket; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/CPlayerTryUseItemPacketMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/CPlayerTryUseItemPacketMixin.java index 487b9719..34a098e6 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/CPlayerTryUseItemPacketMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/CPlayerTryUseItemPacketMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.network.protocol.game; -import io.izzel.arclight.common.bridge.network.play.TimestampedPacket; +import io.izzel.arclight.common.bridge.core.network.play.TimestampedPacket; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.protocol.game.ServerboundUseItemPacket; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/SWorldBorderPacketMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/SWorldBorderPacketMixin.java index bd881a5f..c7e991a9 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/SWorldBorderPacketMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/protocol/game/SWorldBorderPacketMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.network.protocol.game; -import io.izzel.arclight.common.bridge.world.border.WorldBorderBridge; +import io.izzel.arclight.common.bridge.core.world.border.WorldBorderBridge; import net.minecraft.network.protocol.game.ClientboundSetBorderCenterPacket; import net.minecraft.world.level.border.WorldBorder; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/rcon/RConConsoleSourceMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/rcon/RConConsoleSourceMixin.java index 1e9a16bd..c7266f30 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/rcon/RConConsoleSourceMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/rcon/RConConsoleSourceMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.network.rcon; -import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.common.bridge.network.rcon.RConConsoleSourceBridge; -import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.core.network.rcon.RConConsoleSourceBridge; +import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.MinecraftServer; import net.minecraft.server.rcon.RconConsoleSource; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/CustomServerBossInfoMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/CustomServerBossInfoMixin.java index 4ce56cb0..e524b4e1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/CustomServerBossInfoMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/CustomServerBossInfoMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.server; -import io.izzel.arclight.common.bridge.server.CustomServerBossInfoBridge; +import io.izzel.arclight.common.bridge.core.server.CustomServerBossInfoBridge; import net.minecraft.server.bossevents.CustomBossEvent; import org.bukkit.boss.KeyedBossBar; import org.bukkit.craftbukkit.v.boss.CraftKeyedBossbar; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java index 0b0f2a33..cb541bff 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java @@ -3,9 +3,9 @@ package io.izzel.arclight.common.mixin.core.server; import com.mojang.authlib.GameProfileRepository; import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.datafixers.DataFixer; -import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mod.ArclightConstants; import io.izzel.arclight.common.mod.server.BukkitRegistry; import io.izzel.arclight.common.mod.util.ArclightCaptures; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/PlayerAdvancementsMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/PlayerAdvancementsMixin.java index af629c5b..d7913e29 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/PlayerAdvancementsMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/PlayerAdvancementsMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.server; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.advancements.Advancement; import net.minecraft.server.PlayerAdvancements; import net.minecraft.server.level.ServerPlayer; @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.izzel.arclight.common.bridge.advancement.AdvancementBridge; +import io.izzel.arclight.common.bridge.core.advancement.AdvancementBridge; @Mixin(PlayerAdvancements.class) public class PlayerAdvancementsMixin { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/ServerFunctionManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/ServerFunctionManagerMixin.java index bf3a68a1..c5b82f2e 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/ServerFunctionManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/ServerFunctionManagerMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.server; import com.mojang.brigadier.CommandDispatcher; -import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.MinecraftServer; import net.minecraft.server.ServerFunctionManager; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/ServerScoreboardMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/ServerScoreboardMixin.java index 90cb29aa..a47a48b1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/ServerScoreboardMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/ServerScoreboardMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.server; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.network.protocol.Packet; import net.minecraft.server.ServerScoreboard; import net.minecraft.server.level.ServerPlayer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/EffectCommandMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/EffectCommandMixin.java index 162c9b1d..1b943550 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/EffectCommandMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/EffectCommandMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.server.commands; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.commands.EffectCommands; import net.minecraft.world.effect.MobEffect; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/SummonCommandMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/SummonCommandMixin.java index 8292fee6..0a382d9d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/SummonCommandMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/SummonCommandMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.server.commands; -import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge; import net.minecraft.commands.CommandSourceStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/TeleportCommandMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/TeleportCommandMixin.java index 46832c29..8f1533aa 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/TeleportCommandMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/TeleportCommandMixin.java @@ -2,10 +2,10 @@ package io.izzel.arclight.common.mixin.core.server.commands; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.network.play.ServerPlayNetHandlerBridge; -import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge; import net.minecraft.commands.CommandSourceStack; import net.minecraft.core.BlockPos; import net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/TimeCommandMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/TimeCommandMixin.java index 1f31445e..7e8be259 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/TimeCommandMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/commands/TimeCommandMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.server.commands; -import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge; import net.minecraft.server.commands.TimeCommand; import net.minecraft.server.level.ServerLevel; import org.bukkit.Bukkit; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkHolderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkHolderMixin.java index d63165a0..ffebf6c3 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkHolderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkHolderMixin.java @@ -1,9 +1,9 @@ package io.izzel.arclight.common.mixin.core.server.level; import com.mojang.datafixers.util.Either; -import io.izzel.arclight.common.bridge.world.chunk.ChunkBridge; -import io.izzel.arclight.common.bridge.world.server.ChunkHolderBridge; -import io.izzel.arclight.common.bridge.world.server.ChunkMapBridge; +import io.izzel.arclight.common.bridge.core.world.chunk.ChunkBridge; +import io.izzel.arclight.common.bridge.core.world.server.ChunkHolderBridge; +import io.izzel.arclight.common.bridge.core.world.server.ChunkMapBridge; import io.izzel.arclight.common.mod.ArclightMod; import it.unimi.dsi.fastutil.shorts.ShortSet; import net.minecraft.core.BlockPos; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkMapMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkMapMixin.java index a5484ee3..b5f52b85 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkMapMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkMapMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.server.level; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.bridge.world.server.ChunkMapBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.server.ChunkMapBridge; import io.izzel.arclight.common.mod.util.ArclightCallbackExecutor; import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ChunkHolder; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkMap_TrackedEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkMap_TrackedEntityMixin.java index 79fa1fc7..68a0c808 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkMap_TrackedEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkMap_TrackedEntityMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.server.level; -import io.izzel.arclight.common.bridge.world.TrackedEntityBridge; +import io.izzel.arclight.common.bridge.core.world.TrackedEntityBridge; import net.minecraft.server.level.ChunkMap; import net.minecraft.server.level.ServerEntity; import net.minecraft.server.level.ServerPlayer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerChunkCacheMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerChunkCacheMixin.java index b34bda6f..2108baa9 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerChunkCacheMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerChunkCacheMixin.java @@ -1,10 +1,10 @@ package io.izzel.arclight.common.mixin.core.server.level; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.bridge.world.server.ChunkHolderBridge; -import io.izzel.arclight.common.bridge.world.server.ChunkMapBridge; -import io.izzel.arclight.common.bridge.world.server.ServerChunkProviderBridge; -import io.izzel.arclight.common.bridge.world.server.TicketManagerBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.server.ChunkHolderBridge; +import io.izzel.arclight.common.bridge.core.world.server.ChunkMapBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerChunkProviderBridge; +import io.izzel.arclight.common.bridge.core.world.server.TicketManagerBridge; import net.minecraft.server.level.ChunkHolder; import net.minecraft.server.level.ChunkMap; import net.minecraft.server.level.DistanceManager; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerChunkCache_MainThreadExecutorMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerChunkCache_MainThreadExecutorMixin.java index a2a8de74..93989314 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerChunkCache_MainThreadExecutorMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerChunkCache_MainThreadExecutorMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.server.level; -import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; -import io.izzel.arclight.common.bridge.world.server.ChunkMapBridge; -import io.izzel.arclight.common.bridge.world.server.ServerChunkProviderBridge; +import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.core.world.server.ChunkMapBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerChunkProviderBridge; import io.izzel.arclight.common.mod.server.ArclightServer; import net.minecraft.server.level.ServerChunkCache; import net.minecraft.util.thread.BlockableEventLoop; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerEntityMixin.java index 0ec00476..0b7c6478 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerEntityMixin.java @@ -2,8 +2,8 @@ package io.izzel.arclight.common.mixin.core.server.level; import com.google.common.collect.Lists; import com.mojang.datafixers.util.Pair; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.world.TrackedEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.world.TrackedEntityBridge; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundAddMobPacket; import net.minecraft.network.protocol.game.ClientboundMoveEntityPacket; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerLevelMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerLevelMixin.java index 5f90427d..4b9d19d2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerLevelMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerLevelMixin.java @@ -1,16 +1,16 @@ package io.izzel.arclight.common.mixin.core.server.level; import com.google.common.collect.Lists; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.world.ExplosionBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.bridge.world.server.ServerChunkProviderBridge; -import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; -import io.izzel.arclight.common.bridge.world.storage.DerivedWorldInfoBridge; -import io.izzel.arclight.common.bridge.world.storage.MapDataBridge; -import io.izzel.arclight.common.bridge.world.storage.WorldInfoBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.world.ExplosionBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerChunkProviderBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.core.world.storage.DerivedWorldInfoBridge; +import io.izzel.arclight.common.bridge.core.world.storage.MapDataBridge; +import io.izzel.arclight.common.bridge.core.world.storage.WorldInfoBridge; import io.izzel.arclight.common.mixin.core.world.level.LevelMixin; import io.izzel.arclight.common.mod.server.world.WorldSymlink; import io.izzel.arclight.common.mod.util.ArclightCaptures; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerLevel_EntityCallbacksMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerLevel_EntityCallbacksMixin.java index 33e9a267..32478d98 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerLevel_EntityCallbacksMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerLevel_EntityCallbacksMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.server.level; import com.google.common.collect.Lists; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.world.storage.MapDataBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.world.storage.MapDataBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/TicketManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/TicketManagerMixin.java index 3cf12182..a935b59f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/TicketManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/TicketManagerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.server.level; -import io.izzel.arclight.common.bridge.world.server.TicketManagerBridge; +import io.izzel.arclight.common.bridge.core.world.server.TicketManagerBridge; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectSet; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/TicketTypeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/TicketTypeMixin.java index 7d8101df..44404007 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/TicketTypeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/TicketTypeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.server.level; -import io.izzel.arclight.common.bridge.world.server.TicketTypeBridge; +import io.izzel.arclight.common.bridge.core.world.server.TicketTypeBridge; import net.minecraft.server.level.TicketType; import net.minecraft.util.Unit; import org.bukkit.plugin.Plugin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/BanEntryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/BanEntryMixin.java index e23bf612..f1f4f9de 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/BanEntryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/BanEntryMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.server.management; -import io.izzel.arclight.common.bridge.server.management.BanEntryBridge; +import io.izzel.arclight.common.bridge.core.server.management.BanEntryBridge; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java index 70531c74..672115cf 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java @@ -3,14 +3,14 @@ package io.izzel.arclight.common.mixin.core.server.management; import com.google.common.collect.Lists; import com.mojang.authlib.GameProfile; import io.izzel.arclight.api.ArclightVersion; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.InternalEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.network.NetworkManagerBridge; -import io.izzel.arclight.common.bridge.network.login.ServerLoginNetHandlerBridge; -import io.izzel.arclight.common.bridge.network.play.ServerPlayNetHandlerBridge; -import io.izzel.arclight.common.bridge.server.management.PlayerListBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.InternalEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.network.NetworkManagerBridge; +import io.izzel.arclight.common.bridge.core.network.login.ServerLoginNetHandlerBridge; +import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge; +import io.izzel.arclight.common.bridge.core.server.management.PlayerListBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mod.server.ArclightServer; import io.izzel.arclight.common.mod.util.ArclightCaptures; import io.izzel.arclight.mixin.Eject; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/ServerPlayerGameModeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/ServerPlayerGameModeMixin.java index 0ec2e62d..fb947799 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/ServerPlayerGameModeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/ServerPlayerGameModeMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.server.management; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.server.management.PlayerInteractionManagerBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.server.management.PlayerInteractionManagerBridge; import io.izzel.arclight.common.mod.ArclightMod; import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.advancements.CriteriaTriggers; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/UserListMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/UserListMixin.java index 48635301..aa705f3b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/UserListMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/UserListMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.common.mixin.core.server.management; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import io.izzel.arclight.common.bridge.server.management.UserListBridge; +import io.izzel.arclight.common.bridge.core.server.management.UserListBridge; import java.util.Collection; import java.util.Map; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/CompoundContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/CompoundContainerMixin.java index 04651bac..6324db8b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/CompoundContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/CompoundContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import net.minecraft.world.CompoundContainer; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ContainerMixin.java index 3ce933c5..cb2b8288 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ExplosionMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ExplosionMixin.java index 87b8b66b..907b37f7 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ExplosionMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/ExplosionMixin.java @@ -3,9 +3,9 @@ package io.izzel.arclight.common.mixin.core.world; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.mojang.datafixers.util.Pair; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.world.ExplosionBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.world.ExplosionBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IBlockReaderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IBlockReaderMixin.java index 142c5d5b..b73a9545 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IBlockReaderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IBlockReaderMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.common.bridge.world.IBlockReaderBridge; +import io.izzel.arclight.common.bridge.core.world.IBlockReaderBridge; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IServerWorldMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IServerWorldMixin.java index 1223790b..f705c2f1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IServerWorldMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IServerWorldMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.LevelAccessor; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IWorldMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IWorldMixin.java index 03380696..2fd23892 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IWorldMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IWorldMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.common.bridge.world.IWorldBridge; +import io.izzel.arclight.common.bridge.core.world.IWorldBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.LevelAccessor; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IWorldWriterMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IWorldWriterMixin.java index 7e1408e7..d3b6a399 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IWorldWriterMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/IWorldWriterMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.common.bridge.world.IWorldWriterBridge; +import io.izzel.arclight.common.bridge.core.world.IWorldWriterBridge; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.LevelWriter; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/SimpleContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/SimpleContainerMixin.java index a18ce9b3..09e497e7 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/SimpleContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/SimpleContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import net.minecraft.core.NonNullList; import net.minecraft.world.Container; import net.minecraft.world.SimpleContainer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/damagesource/DamageSourceMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/damagesource/DamageSourceMixin.java index 8615296f..4f8a030b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/damagesource/DamageSourceMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/damagesource/DamageSourceMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.damagesource; -import io.izzel.arclight.common.bridge.util.DamageSourceBridge; +import io.izzel.arclight.common.bridge.core.util.DamageSourceBridge; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/damagesource/IndirectEntityDamageSourceMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/damagesource/IndirectEntityDamageSourceMixin.java index 7c588ac7..45a09e68 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/damagesource/IndirectEntityDamageSourceMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/damagesource/IndirectEntityDamageSourceMixin.java @@ -2,7 +2,7 @@ package io.izzel.arclight.common.mixin.core.world.damagesource; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import io.izzel.arclight.common.bridge.util.IndirectEntityDamageSourceBridge; +import io.izzel.arclight.common.bridge.core.util.IndirectEntityDamageSourceBridge; import net.minecraft.world.damagesource.IndirectEntityDamageSource; import net.minecraft.world.entity.Entity; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/effect/MobEffectMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/effect/MobEffectMixin.java index 0b06d1d9..69c1d2ff 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/effect/MobEffectMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/effect/MobEffectMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.effect; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.network.protocol.game.ClientboundSetHealthPacket; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.damagesource.DamageSource; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/AgeableMobMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/AgeableMobMixin.java index b6b85556..9132fd9b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/AgeableMobMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/AgeableMobMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity; -import io.izzel.arclight.common.bridge.entity.AgeableEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.AgeableEntityBridge; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.AgeableMob; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/AreaEffectCloudEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/AreaEffectCloudEntityMixin.java index 3c8028bf..8f9d77ae 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/AreaEffectCloudEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/AreaEffectCloudEntityMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.entity; import com.google.common.collect.Lists; -import io.izzel.arclight.common.bridge.entity.AreaEffectCloudEntityBridge; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.AreaEffectCloudEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.core.Registry; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java index d7cb5e98..65784f4a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java @@ -2,15 +2,15 @@ package io.izzel.arclight.common.mixin.core.world.entity; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.izzel.arclight.common.bridge.block.PortalInfoBridge; -import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.InternalEntityBridge; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.world.TeleporterBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.block.PortalInfoBridge; +import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.InternalEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.world.TeleporterBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.BlockUtil; import net.minecraft.commands.CommandSourceStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityTypeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityTypeMixin.java index 9b659323..38ebcfa0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityTypeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityTypeMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity; -import io.izzel.arclight.common.bridge.entity.EntityTypeBridge; -import io.izzel.arclight.common.bridge.world.IWorldWriterBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityTypeBridge; +import io.izzel.arclight.common.bridge.core.world.IWorldWriterBridge; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/IAngerableMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/IAngerableMixin.java index b8d26b1a..f54d2891 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/IAngerableMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/IAngerableMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.NeutralMob; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java index 95a7ed90..99540ad4 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java @@ -4,11 +4,11 @@ import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.mojang.datafixers.util.Either; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.mixin.Eject; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/MobMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/MobMixin.java index 046f74f7..dbc7ae77 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/MobMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/MobMixin.java @@ -1,9 +1,9 @@ package io.izzel.arclight.common.mixin.core.world.entity; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mod.ArclightMod; import io.izzel.arclight.mixin.Eject; import net.minecraft.nbt.CompoundTag; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/attributes/RangedAttributeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/attributes/RangedAttributeMixin.java index 0d089028..505f9369 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/attributes/RangedAttributeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/attributes/RangedAttributeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.attributes; -import io.izzel.arclight.common.bridge.entity.ai.attributes.RangedAttributeBridge; +import io.izzel.arclight.common.bridge.core.entity.ai.attributes.RangedAttributeBridge; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.RangedAttribute; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/behavior/InteractWithDoorMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/behavior/InteractWithDoorMixin.java index 9aada110..25be9d32 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/behavior/InteractWithDoorMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/behavior/InteractWithDoorMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.behavior; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.BlockTags; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/behavior/VillagerMakeLoveMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/behavior/VillagerMakeLoveMixin.java index 8056290d..8e38a87a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/behavior/VillagerMakeLoveMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/behavior/VillagerMakeLoveMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.behavior; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.AgeableMob; import net.minecraft.world.entity.ai.behavior.VillagerMakeLove; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/brain/BrainUtilMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/brain/BrainUtilMixin.java index 9863f8d9..3a402fb5 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/brain/BrainUtilMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/brain/BrainUtilMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.brain; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.behavior.BehaviorUtils; import net.minecraft.world.entity.item.ItemEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/DefendVillageTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/DefendVillageTargetGoalMixin.java index 93c263f1..3276ca4d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/DefendVillageTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/DefendVillageTargetGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.goal; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.ai.goal.target.DefendVillageTargetGoal; import net.minecraft.world.entity.animal.IronGolem; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/FollowOwnerGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/FollowOwnerGoalMixin.java index 045d3a9c..fa225102 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/FollowOwnerGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/FollowOwnerGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.goal; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.world.entity.TamableAnimal; import net.minecraft.world.entity.ai.goal.FollowOwnerGoal; import org.bukkit.Bukkit; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/HurtByTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/HurtByTargetGoalMixin.java index 2ed34455..a0ae23c2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/HurtByTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/HurtByTargetGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.goal; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/NearestAttackableTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/NearestAttackableTargetGoalMixin.java index bf3ea5c2..df412520 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/NearestAttackableTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/NearestAttackableTargetGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.goal; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/OwnerHurtByTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/OwnerHurtByTargetGoalMixin.java index 8732ee78..de348b23 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/OwnerHurtByTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/OwnerHurtByTargetGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.goal; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.ai.goal.target.OwnerHurtByTargetGoal; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/OwnerHurtTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/OwnerHurtTargetGoalMixin.java index 92f20c1b..c8564ae1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/OwnerHurtTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/OwnerHurtTargetGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.goal; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.ai.goal.target.OwnerHurtTargetGoal; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/RemoveBlockGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/RemoveBlockGoalMixin.java index 9b6c5f3f..361a5705 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/RemoveBlockGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/RemoveBlockGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.goal; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.ai.goal.RemoveBlockGoal; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/SkeletonTrapGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/SkeletonTrapGoalMixin.java index 510b87f0..de8120d4 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/SkeletonTrapGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/SkeletonTrapGoalMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.goal; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LightningBolt; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/TargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/TargetGoalMixin.java index ad3bfded..01554b8d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/TargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/goal/TargetGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.goal; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.ai.goal.target.TargetGoal; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/village/VillageSiegeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/village/VillageSiegeMixin.java index 01f3aa8c..6c8cfc65 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/village/VillageSiegeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/ai/village/VillageSiegeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.ai.village; -import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.ai.village.VillageSiege; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/AnimalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/AnimalMixin.java index 04b7f70d..4a6c3ec7 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/AnimalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/AnimalMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.entity.passive.AnimalEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.passive.AnimalEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mixin.core.world.entity.AgeableMobMixin; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerLevel; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/BeeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/BeeMixin.java index 1522f0f3..c99a56b6 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/BeeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/BeeMixin.java @@ -1,7 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.common.mixin.core.world.entity.animal.AnimalMixin; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.animal.Bee; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Bee_HurtByOtherGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Bee_HurtByOtherGoalMixin.java index c41639d7..03542740 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Bee_HurtByOtherGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Bee_HurtByOtherGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Mob; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/DolphinEntity_SwimWithPlayerGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/DolphinEntity_SwimWithPlayerGoalMixin.java index 66131c3e..647d9c91 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/DolphinEntity_SwimWithPlayerGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/DolphinEntity_SwimWithPlayerGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.player.Player; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/FoxMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/FoxMixin.java index 1289fc1b..620d8647 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/FoxMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/FoxMixin.java @@ -1,7 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.entity.passive.FoxEntityBridge; -import io.izzel.arclight.common.mixin.core.world.entity.animal.AnimalMixin; +import io.izzel.arclight.common.bridge.core.entity.passive.FoxEntityBridge; import net.minecraft.world.entity.animal.Fox; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Fox_BreedGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Fox_BreedGoalMixin.java index 70cc7af2..90e89630 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Fox_BreedGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Fox_BreedGoalMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.entity.passive.AnimalEntityBridge; -import io.izzel.arclight.common.bridge.entity.passive.FoxEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.passive.AnimalEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.passive.FoxEntityBridge; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/MushroomCowMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/MushroomCowMixin.java index b7630f58..29fdf4a0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/MushroomCowMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/MushroomCowMixin.java @@ -1,7 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.mixin.core.world.entity.animal.AnimalMixin; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.animal.Cow; import net.minecraft.world.entity.animal.MushroomCow; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Panda_HurtByTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Panda_HurtByTargetGoalMixin.java index 19b4ed1f..e46d8fca 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Panda_HurtByTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Panda_HurtByTargetGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Mob; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/PigMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/PigMixin.java index 5f5a5770..ecc78a5e 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/PigMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/PigMixin.java @@ -1,7 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.mixin.core.world.entity.animal.AnimalMixin; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.LightningBolt; import net.minecraft.world.entity.animal.Pig; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/PufferfishEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/PufferfishEntityMixin.java index ec132ca1..a75d5340 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/PufferfishEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/PufferfishEntityMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.animal.Pufferfish; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Sheep1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Sheep1Mixin.java index 494c5637..7ffa77a0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Sheep1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Sheep1Mixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.inventory.container.ContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.ContainerBridge; import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/SheepMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/SheepMixin.java index 20f80795..138acaed 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/SheepMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/SheepMixin.java @@ -1,7 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.inventory.CraftingInventoryBridge; -import io.izzel.arclight.common.mixin.core.world.entity.animal.AnimalMixin; +import io.izzel.arclight.common.bridge.core.inventory.CraftingInventoryBridge; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.item.DyeColor; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/TurtleMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/TurtleMixin.java index 81bd099f..7e785c6a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/TurtleMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/TurtleMixin.java @@ -1,7 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.entity.passive.TurtleEntityBridge; -import io.izzel.arclight.common.mixin.core.world.entity.animal.AnimalMixin; +import io.izzel.arclight.common.bridge.core.entity.passive.TurtleEntityBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.LightningBolt; import net.minecraft.world.entity.animal.Turtle; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Turtle_LayEggGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Turtle_LayEggGoalMixin.java index d59135a8..152e453f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Turtle_LayEggGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/Turtle_LayEggGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal; -import io.izzel.arclight.common.bridge.entity.passive.TurtleEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.passive.TurtleEntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/horse/AbstractHorseMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/horse/AbstractHorseMixin.java index 543d3828..57c9a382 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/horse/AbstractHorseMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/horse/AbstractHorseMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal.horse; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import io.izzel.arclight.common.mixin.core.world.entity.animal.AnimalMixin; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.SimpleContainer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/horse/TraderLlamaEntity_FollowTraderGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/horse/TraderLlamaEntity_FollowTraderGoalMixin.java index 22b1322e..58fb9efc 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/horse/TraderLlamaEntity_FollowTraderGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/animal/horse/TraderLlamaEntity_FollowTraderGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.animal.horse; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import io.izzel.arclight.common.mixin.core.world.entity.ai.goal.TargetGoalMixin; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/boss/enderdragon/phases/EnderDragonPhaseManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/boss/enderdragon/phases/EnderDragonPhaseManagerMixin.java index c3fa48bc..0f902463 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/boss/enderdragon/phases/EnderDragonPhaseManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/boss/enderdragon/phases/EnderDragonPhaseManagerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.boss.enderdragon.phases; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.world.entity.boss.enderdragon.EnderDragon; import net.minecraft.world.entity.boss.enderdragon.phases.DragonPhaseInstance; import net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/decoration/ArmorStandMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/decoration/ArmorStandMixin.java index a743d254..55c86bb1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/decoration/ArmorStandMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/decoration/ArmorStandMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.entity.decoration; import com.google.common.collect.Lists; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import io.izzel.arclight.common.mixin.core.world.entity.LivingEntityMixin; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/item/HangingEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/item/HangingEntityMixin.java index c047bc75..9abdf64e 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/item/HangingEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/item/HangingEntityMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.item; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.util.IndirectEntityDamageSourceBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.util.IndirectEntityDamageSourceBridge; import io.izzel.arclight.common.mixin.core.world.entity.EntityMixin; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/item/ItemEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/item/ItemEntityMixin.java index ffc464bc..f133877b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/item/ItemEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/item/ItemEntityMixin.java @@ -1,10 +1,10 @@ package io.izzel.arclight.common.mixin.core.world.entity.item; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.PlayerInventoryBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.network.datasync.EntityDataManagerBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerInventoryBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.network.datasync.EntityDataManagerBridge; import io.izzel.arclight.common.mixin.core.world.entity.EntityMixin; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.stats.Stats; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/AbstractSkeletonMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/AbstractSkeletonMixin.java index 6334498b..3c1f6bbb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/AbstractSkeletonMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/AbstractSkeletonMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import io.izzel.arclight.common.mixin.core.world.entity.PathfinderMobMixin; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.InteractionHand; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/CaveSpiderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/CaveSpiderMixin.java index 458b6f6b..9e5d5bc1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/CaveSpiderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/CaveSpiderMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.monster.CaveSpider; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/CreeperMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/CreeperMixin.java index 22c99281..2d63dd2b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/CreeperMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/CreeperMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.monster.CreeperEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.monster.CreeperEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mixin.core.world.entity.PathfinderMobMixin; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ElderGuardianMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ElderGuardianMixin.java index 46e91d06..b20df59a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ElderGuardianMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ElderGuardianMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import io.izzel.arclight.common.mixin.core.world.entity.PathfinderMobMixin; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.effect.MobEffectInstance; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/EnderManMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/EnderManMixin.java index 433bf54c..318d6a6d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/EnderManMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/EnderManMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.monster.EndermanEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.monster.EndermanEntityBridge; import io.izzel.arclight.common.mixin.core.world.entity.PathfinderMobMixin; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.world.entity.LivingEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Ghast_GhastShootFireballGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Ghast_GhastShootFireballGoalMixin.java index 72c402e4..8aa7bbfb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Ghast_GhastShootFireballGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Ghast_GhastShootFireballGoalMixin.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import io.izzel.arclight.common.bridge.entity.projectile.DamagingProjectileEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.projectile.DamagingProjectileEntityBridge; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.monster.Ghast; import net.minecraft.world.level.Level; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/HuskMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/HuskMixin.java index 996e032a..a62bb06b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/HuskMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/HuskMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.monster.Husk; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Illusioner_BlindnessSpellGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Illusioner_BlindnessSpellGoalMixin.java index 90727af7..bed2e23d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Illusioner_BlindnessSpellGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Illusioner_BlindnessSpellGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.monster.Illusioner; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Illusioner_MirrorSpellGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Illusioner_MirrorSpellGoalMixin.java index 8f2e6927..623e92f1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Illusioner_MirrorSpellGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Illusioner_MirrorSpellGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.monster.Illusioner; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Phantom_AttackPlayerTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Phantom_AttackPlayerTargetGoalMixin.java index 12300277..5bfb0907 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Phantom_AttackPlayerTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Phantom_AttackPlayerTargetGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.monster.Phantom; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ShulkerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ShulkerMixin.java index 40975826..4343a212 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ShulkerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ShulkerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mixin.core.world.entity.PathfinderMobMixin; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/SlimeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/SlimeMixin.java index f804d2c9..254ca7a4 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/SlimeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/SlimeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mixin.core.world.entity.MobMixin; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Vex_CopyOwnerTargetGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Vex_CopyOwnerTargetGoalMixin.java index 2de76bad..5ae62186 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Vex_CopyOwnerTargetGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/Vex_CopyOwnerTargetGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.monster.Vex; import org.bukkit.event.entity.EntityTargetEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/WitherSkeletonMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/WitherSkeletonMixin.java index 8361e2cd..82fdfda3 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/WitherSkeletonMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/WitherSkeletonMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.monster.WitherSkeleton; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombieMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombieMixin.java index 4e3307d8..591c98fb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombieMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombieMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mixin.core.world.entity.PathfinderMobMixin; import io.izzel.arclight.mixin.Eject; import net.minecraft.nbt.CompoundTag; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombieVillagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombieVillagerMixin.java index e2fd3f1f..adfef6ab 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombieVillagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombieVillagerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import io.izzel.arclight.mixin.Eject; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.EntityType; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombifiedPiglinMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombifiedPiglinMixin.java index 936d8d6a..a2732f7f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombifiedPiglinMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/ZombifiedPiglinMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.ai.attributes.Attributes; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinAiMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinAiMixin.java index 346e2e1b..85c34e4f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinAiMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinAiMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster.piglin; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; -import io.izzel.arclight.common.bridge.entity.monster.piglin.PiglinBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.monster.piglin.PiglinBridge; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.memory.MemoryModuleType; @@ -74,7 +74,7 @@ public abstract class PiglinAiMixin { } } - protected static boolean isLovedByPiglin(ItemStack itemstack, Piglin piglin) { + private static boolean isLovedByPiglin(ItemStack itemstack, Piglin piglin) { return isLovedItem(itemstack) || (((PiglinBridge) piglin).bridge$getInterestItems().contains(itemstack.getItem()) || ((PiglinBridge) piglin).bridge$getAllowedBarterItems().contains(itemstack.getItem())); } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinMixin.java index b311be5b..ecc3962e 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.monster.piglin; -import io.izzel.arclight.common.bridge.entity.monster.piglin.PiglinBridge; +import io.izzel.arclight.common.bridge.core.entity.monster.piglin.PiglinBridge; import io.izzel.arclight.common.mixin.core.world.entity.PathfinderMobMixin; import net.minecraft.core.Registry; import net.minecraft.nbt.CompoundTag; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/AbstractVillagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/AbstractVillagerMixin.java index e25c7349..6709c9c2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/AbstractVillagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/AbstractVillagerMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.entity.npc; -import io.izzel.arclight.common.bridge.entity.merchant.IMerchantBridge; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.item.MerchantOfferBridge; +import io.izzel.arclight.common.bridge.core.entity.merchant.IMerchantBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.item.MerchantOfferBridge; import io.izzel.arclight.common.mixin.core.world.entity.PathfinderMobMixin; import net.minecraft.world.SimpleContainer; import net.minecraft.world.entity.EntityType; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/VillagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/VillagerMixin.java index 26e18da1..1b8a9f6a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/VillagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/VillagerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.npc; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.LightningBolt; import net.minecraft.world.entity.animal.IronGolem; @@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import io.izzel.arclight.common.bridge.item.MerchantOfferBridge; +import io.izzel.arclight.common.bridge.core.item.MerchantOfferBridge; @Mixin(net.minecraft.world.entity.npc.Villager.class) public abstract class VillagerMixin extends AbstractVillagerMixin { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/WanderingTraderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/WanderingTraderMixin.java index 6144036e..27276335 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/WanderingTraderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/npc/WanderingTraderMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.npc; -import io.izzel.arclight.common.bridge.item.MerchantOfferBridge; +import io.izzel.arclight.common.bridge.core.item.MerchantOfferBridge; import net.minecraft.world.entity.npc.WanderingTrader; import net.minecraft.world.item.trading.MerchantOffer; import net.minecraft.world.item.trading.MerchantOffers; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/InventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/InventoryMixin.java index d842976d..3f149237 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/InventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/InventoryMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.entity.player; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.PlayerInventoryBridge; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import net.minecraft.core.NonNullList; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/PlayerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/PlayerMixin.java index 9b275225..3daa14fd 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/PlayerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/PlayerMixin.java @@ -2,15 +2,15 @@ package io.izzel.arclight.common.mixin.core.world.entity.player; import com.mojang.authlib.GameProfile; import com.mojang.datafixers.util.Either; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.InternalEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.util.DamageSourceBridge; -import io.izzel.arclight.common.bridge.util.FoodStatsBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.InternalEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.util.DamageSourceBridge; +import io.izzel.arclight.common.bridge.core.util.FoodStatsBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge; import io.izzel.arclight.common.mixin.core.world.entity.LivingEntityMixin; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/ServerPlayerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/ServerPlayerMixin.java index eabaf634..8d3943fe 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/ServerPlayerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/ServerPlayerMixin.java @@ -1,15 +1,15 @@ package io.izzel.arclight.common.mixin.core.world.entity.player; import com.mojang.datafixers.util.Either; -import io.izzel.arclight.common.bridge.block.PortalInfoBridge; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.InternalEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.container.ContainerBridge; -import io.izzel.arclight.common.bridge.network.play.ServerPlayNetHandlerBridge; -import io.izzel.arclight.common.bridge.util.FoodStatsBridge; -import io.izzel.arclight.common.bridge.world.TeleporterBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.block.PortalInfoBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.InternalEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.ContainerBridge; +import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge; +import io.izzel.arclight.common.bridge.core.util.FoodStatsBridge; +import io.izzel.arclight.common.bridge.core.world.TeleporterBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mod.server.block.ChestBlockDoubleInventoryHacks; import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.BlockUtil; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/AbstractArrowMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/AbstractArrowMixin.java index 58b5d2c3..6ee610b6 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/AbstractArrowMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/AbstractArrowMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.PlayerInventoryBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerInventoryBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/AbstractHurtingProjectileMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/AbstractHurtingProjectileMixin.java index 9ef5b206..3d3d3d5a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/AbstractHurtingProjectileMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/AbstractHurtingProjectileMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.projectile.DamagingProjectileEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.projectile.DamagingProjectileEntityBridge; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ArrowEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ArrowEntityMixin.java index baab649c..26e577d2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ArrowEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ArrowEntityMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.common.bridge.entity.projectile.ArrowEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.projectile.ArrowEntityBridge; import net.minecraft.core.Registry; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.resources.ResourceLocation; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/FishingHookMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/FishingHookMixin.java index c9a19cee..53503d39 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/FishingHookMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/FishingHookMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ProjectileMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ProjectileMixin.java index 4a1b3b99..f6a42b9f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ProjectileMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ProjectileMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import io.izzel.arclight.common.mixin.core.world.entity.EntityMixin; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.projectile.Projectile; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ShulkerBulletMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ShulkerBulletMixin.java index 1d4ce9bb..853f6ecf 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ShulkerBulletMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ShulkerBulletMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import io.izzel.arclight.common.mixin.core.world.entity.EntityMixin; import net.minecraft.core.Direction; import net.minecraft.world.damagesource.DamageSource; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/SmallFireballMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/SmallFireballMixin.java index d5f61a8a..0bccf207 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/SmallFireballMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/SmallFireballMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/SpectralArrowMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/SpectralArrowMixin.java index 0f3fabbd..ddebca0a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/SpectralArrowMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/SpectralArrowMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.SpectralArrow; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrowableProjectileMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrowableProjectileMixin.java index 813f73d5..e1484174 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrowableProjectileMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrowableProjectileMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.ThrowableProjectile; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownEggMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownEggMixin.java index 7ec6166b..39faf2d0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownEggMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownEggMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.projectile.ThrownEgg; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownEnderpearlMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownEnderpearlMixin.java index 68c14321..596ac7eb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownEnderpearlMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownEnderpearlMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.world.entity.projectile.ThrownEnderpearl; import net.minecraft.world.phys.HitResult; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownPotionMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownPotionMixin.java index 03bfea84..a0332e72 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownPotionMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownPotionMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.effect.MobEffect; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownTridentMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownTridentMixin.java index 888d7ab0..32719c08 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownTridentMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownTridentMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.projectile.TridentEntityBridge; -import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.core.entity.projectile.TridentEntityBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LightningBolt; import net.minecraft.world.entity.projectile.ThrownTrident; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/WitherSkullMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/WitherSkullMixin.java index 63069f73..9de8b9c8 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/WitherSkullMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/WitherSkullMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.projectile.WitherSkull; import net.minecraft.world.level.Explosion; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raid/RaidMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raid/RaidMixin.java index 157ba308..e6776de3 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raid/RaidMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raid/RaidMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.entity.raid; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.bridge.world.raid.RaidBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.raid.RaidBridge; import net.minecraft.advancements.critereon.LocationTrigger; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raider/RaiderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raider/RaiderMixin.java index 439518d7..2fd35cf7 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raider/RaiderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raider/RaiderMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.raider; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import io.izzel.arclight.common.mixin.core.world.entity.PathfinderMobMixin; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raider/Raider_HoldGroundAttackGoalMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raider/Raider_HoldGroundAttackGoalMixin.java index b8b03c54..4f8ec610 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raider/Raider_HoldGroundAttackGoalMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/raider/Raider_HoldGroundAttackGoalMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.raider; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.raid.Raider; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/AbstractMinecartContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/AbstractMinecartContainerMixin.java index eeff0c04..62497935 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/AbstractMinecartContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/AbstractMinecartContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.entity.vehicle; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import net.minecraft.core.NonNullList; import net.minecraft.world.Container; import net.minecraft.world.entity.EntityType; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/AbstractMinecartMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/AbstractMinecartMixin.java index 1d387eff..78b303db 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/AbstractMinecartMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/AbstractMinecartMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.vehicle; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mixin.core.world.entity.EntityMixin; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/BoatMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/BoatMixin.java index 1fe7d823..b8f5f791 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/BoatMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/BoatMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.vehicle; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mixin.core.world.entity.EntityMixin; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/MinecartCommandBlock_MinecartCommandBaseMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/MinecartCommandBlock_MinecartCommandBaseMixin.java index 9e13a907..324e980c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/MinecartCommandBlock_MinecartCommandBaseMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/vehicle/MinecartCommandBlock_MinecartCommandBaseMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.entity.vehicle; -import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.commands.CommandSourceStack; import net.minecraft.world.entity.vehicle.MinecartCommandBlock; import org.bukkit.command.CommandSender; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/food/FoodDataMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/food/FoodDataMixin.java index ac0e93bb..4b54a2e8 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/food/FoodDataMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/food/FoodDataMixin.java @@ -1,9 +1,9 @@ package io.izzel.arclight.common.mixin.core.world.food; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.util.FoodStatsBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.util.FoodStatsBridge; import net.minecraft.network.protocol.game.ClientboundSetHealthPacket; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/WorldGenRegionMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/WorldGenRegionMixin.java index fc362ad6..94ebf7a8 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/WorldGenRegionMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/WorldGenRegionMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.gen; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import org.bukkit.craftbukkit.v.CraftWorld; import org.bukkit.event.entity.CreatureSpawnEvent; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/feature/structure/StructureManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/feature/structure/StructureManagerMixin.java index 3b87e504..b3803afd 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/feature/structure/StructureManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/feature/structure/StructureManagerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.gen.feature.structure; -import io.izzel.arclight.common.bridge.world.IWorldBridge; +import io.izzel.arclight.common.bridge.core.world.IWorldBridge; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.StructureFeatureManager; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/feature/structure/SwampHutPieceMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/feature/structure/SwampHutPieceMixin.java index 4ad8be2d..1d04c350 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/feature/structure/SwampHutPieceMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/gen/feature/structure/SwampHutPieceMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.gen.feature.structure; -import io.izzel.arclight.common.bridge.world.IWorldWriterBridge; +import io.izzel.arclight.common.bridge.core.world.IWorldWriterBridge; import org.bukkit.event.entity.CreatureSpawnEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/AbstractContainerMenuMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/AbstractContainerMenuMixin.java index 6204fccc..8362e969 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/AbstractContainerMenuMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/AbstractContainerMenuMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.inventory.container.ContainerBridge; -import io.izzel.arclight.common.bridge.inventory.container.SlotBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.ContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.SlotBridge; import io.izzel.arclight.common.mod.server.ArclightContainer; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/AbstractFurnaceContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/AbstractFurnaceContainerMixin.java index 23c83439..e715bd99 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/AbstractFurnaceContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/AbstractFurnaceContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/BeaconContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/BeaconContainerMixin.java index 63fd1964..7437f4c2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/BeaconContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/BeaconContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/BrewingStandContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/BrewingStandContainerMixin.java index ec3900fb..f3029af1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/BrewingStandContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/BrewingStandContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainer1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainer1Mixin.java index 8973b6cc..f781d7ae 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainer1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainer1Mixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import net.minecraft.world.inventory.CartographyTableMenu; import org.bukkit.Location; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainer2Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainer2Mixin.java index 1dacaae6..d1424965 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainer2Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainer2Mixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import net.minecraft.world.inventory.CartographyTableMenu; import org.bukkit.Location; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainerMixin.java index fb2ee764..0612add8 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CartographyContainerMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ChestContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ChestContainerMixin.java index 44c136e1..fd904b93 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ChestContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ChestContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraft.world.CompoundContainer; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ContainerLevelAccessMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ContainerLevelAccessMixin.java index 114538b1..87bdb580 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ContainerLevelAccessMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ContainerLevelAccessMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.bridge.core.util.IWorldPosCallableBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.inventory.ContainerLevelAccess; import net.minecraft.world.level.Level; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ContainerTypeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ContainerTypeMixin.java index 957e9bdd..64fc8811 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ContainerTypeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ContainerTypeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.inventory.container.LecternContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.LecternContainerBridge; import net.minecraft.core.Registry; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.LecternMenu; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftResultInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftResultInventoryMixin.java index fc0a652a..3ee10e78 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftResultInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftResultInventoryMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import org.bukkit.Location; import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftingInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftingInventoryMixin.java index 26c5249e..1a70bb16 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftingInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftingInventoryMixin.java @@ -1,9 +1,9 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.CraftingInventoryBridge; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.CraftingInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import net.minecraft.core.NonNullList; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftingMenuMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftingMenuMixin.java index 65efed49..e163c810 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftingMenuMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/CraftingMenuMixin.java @@ -1,9 +1,9 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.CraftingInventoryBridge; -import io.izzel.arclight.common.bridge.inventory.container.ContainerBridge; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.CraftingInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.ContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/DispenserContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/DispenserContainerMixin.java index 86c3ec9e..77a577c9 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/DispenserContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/DispenserContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnchantmentContainer1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnchantmentContainer1Mixin.java index 1691a02e..a7e386d3 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnchantmentContainer1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnchantmentContainer1Mixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import io.izzel.arclight.common.mixin.core.world.SimpleContainerMixin; import net.minecraft.world.inventory.EnchantmentMenu; import org.bukkit.Location; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnchantmentContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnchantmentContainerMixin.java index e606cf84..2e6a7566 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnchantmentContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnchantmentContainerMixin.java @@ -1,9 +1,9 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; -import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.util.IWorldPosCallableBridge; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; import net.minecraft.core.Registry; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnderChestInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnderChestInventoryMixin.java index 9ec033cb..0f197d51 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnderChestInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/EnderChestInventoryMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import io.izzel.arclight.common.mixin.core.world.SimpleContainerMixin; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/FurnaceResultSlotMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/FurnaceResultSlotMixin.java index 873cf990..6eb3f2df 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/FurnaceResultSlotMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/FurnaceResultSlotMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.tileentity.AbstractFurnaceTileEntityBridge; +import io.izzel.arclight.common.bridge.core.tileentity.AbstractFurnaceTileEntityBridge; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.FurnaceResultSlot; import net.minecraft.world.item.ItemStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/GrindstoneContainer1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/GrindstoneContainer1Mixin.java index a62e116d..43c93092 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/GrindstoneContainer1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/GrindstoneContainer1Mixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import io.izzel.arclight.common.mixin.core.world.SimpleContainerMixin; import net.minecraft.world.inventory.GrindstoneMenu; import org.bukkit.Location; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/GrindstoneContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/GrindstoneContainerMixin.java index cca98f19..8fae6951 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/GrindstoneContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/GrindstoneContainerMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/HopperContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/HopperContainerMixin.java index 742f6ac5..25281420 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/HopperContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/HopperContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/HorseInventoryContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/HorseInventoryContainerMixin.java index 71885bd6..605211f1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/HorseInventoryContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/HorseInventoryContainerMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.animal.horse.AbstractHorse; import net.minecraft.world.entity.player.Inventory; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LecternContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LecternContainerMixin.java index 1423a9c5..0b3d05ca 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LecternContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LecternContainerMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.container.LecternContainerBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.LecternContainerBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainer1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainer1Mixin.java index 7ae1bee4..c832b10c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainer1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainer1Mixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import io.izzel.arclight.common.mixin.core.world.SimpleContainerMixin; import net.minecraft.world.inventory.LoomMenu; import org.bukkit.Location; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainer2Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainer2Mixin.java index 65038936..734e7976 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainer2Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainer2Mixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import io.izzel.arclight.common.mixin.core.world.SimpleContainerMixin; import net.minecraft.world.inventory.LoomMenu; import org.bukkit.Location; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainerMixin.java index 4818998d..509f3eb6 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/LoomContainerMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/MerchantContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/MerchantContainerMixin.java index ab812a89..8e2366d7 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/MerchantContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/MerchantContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/MerchantInventoryMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/MerchantInventoryMixin.java index e4dfcaaf..ce04fcea 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/MerchantInventoryMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/MerchantInventoryMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import net.minecraft.core.NonNullList; import net.minecraft.world.Container; import net.minecraft.world.entity.npc.AbstractVillager; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/PlayerContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/PlayerContainerMixin.java index a61773ec..a8e34458 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/PlayerContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/PlayerContainerMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.CraftingInventoryBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.CraftingInventoryBridge; import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.Container; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/RepairContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/RepairContainerMixin.java index a90163b9..8888d8e1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/RepairContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/RepairContainerMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.util.IWorldPosCallableBridge; import net.minecraft.network.chat.TextComponent; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.AnvilMenu; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ShulkerBoxContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ShulkerBoxContainerMixin.java index 7763e56d..fc0c6624 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ShulkerBoxContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/ShulkerBoxContainerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/SlotMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/SlotMixin.java index 31957abd..f6ca0793 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/SlotMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/SlotMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.inventory.container.SlotBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.SlotBridge; import net.minecraft.world.inventory.Slot; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/SmithingTableContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/SmithingTableContainerMixin.java index 2d8ba321..4f253acf 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/SmithingTableContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/SmithingTableContainerMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.util.IWorldPosCallableBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.util.IWorldPosCallableBridge; import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.inventory.SmithingMenu; import net.minecraft.world.item.ItemStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/StonecutterContainer1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/StonecutterContainer1Mixin.java index c1fcd54e..23e8a3da 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/StonecutterContainer1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/StonecutterContainer1Mixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import net.minecraft.world.inventory.StonecutterMenu; import org.bukkit.Location; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/StonecutterContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/StonecutterContainerMixin.java index 25e2a76d..37440507 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/StonecutterContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/StonecutterContainerMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.inventory; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BlockItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BlockItemMixin.java index 71422d38..dc221daf 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BlockItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BlockItemMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BowItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BowItemMixin.java index 1f70e2d5..19f34f7d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BowItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BowItemMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BucketItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BucketItemMixin.java index 7abacec5..2d61748d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BucketItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/BucketItemMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/ChorusFruitItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/ChorusFruitItemMixin.java index 36c02c31..49b0bb53 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/ChorusFruitItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/ChorusFruitItemMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/CrossbowItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/CrossbowItemMixin.java index c7ff70ed..827bd1b0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/CrossbowItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/CrossbowItemMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import io.izzel.arclight.mixin.Eject; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/DyeItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/DyeItemMixin.java index 2d0ec3a3..0ee257e2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/DyeItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/DyeItemMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import io.izzel.arclight.mixin.Eject; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.LivingEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/EggItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/EggItemMixin.java index d5a71acd..4605ef8a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/EggItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/EggItemMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import io.izzel.arclight.mixin.Eject; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/EnderPearlItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/EnderPearlItemMixin.java index 351df50b..0082d66d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/EnderPearlItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/EnderPearlItemMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/FishingRodItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/FishingRodItemMixin.java index 75fc91d9..9cce6c1a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/FishingRodItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/FishingRodItemMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/HangingEntityItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/HangingEntityItemMixin.java index a5df135e..67fc03ed 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/HangingEntityItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/HangingEntityItemMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionResult; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/ItemStackMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/ItemStackMixin.java index 4d30b6df..dc846067 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/ItemStackMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/ItemStackMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.item.ItemStackBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.item.ItemStackBridge; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.LivingEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/LeadItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/LeadItemMixin.java index b6fadbb8..dcc10542 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/LeadItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/LeadItemMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.Mob; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MapItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MapItemMixin.java index d54ef671..d6540972 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MapItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MapItemMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.world.storage.MapDataBridge; +import io.izzel.arclight.common.bridge.core.world.storage.MapDataBridge; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.ItemStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MerchantMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MerchantMixin.java index a4cf0f18..a3283a25 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MerchantMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MerchantMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.merchant.IMerchantBridge; +import io.izzel.arclight.common.bridge.core.entity.merchant.IMerchantBridge; import net.minecraft.world.item.trading.Merchant; import org.bukkit.craftbukkit.v.inventory.CraftMerchant; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MerchantOfferMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MerchantOfferMixin.java index 665af863..81c8c846 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MerchantOfferMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MerchantOfferMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.item.MerchantOfferBridge; +import io.izzel.arclight.common.bridge.core.item.MerchantOfferBridge; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.trading.MerchantOffer; import org.bukkit.craftbukkit.v.inventory.CraftMerchantRecipe; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MilkBucketItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MilkBucketItemMixin.java index e3799447..6a80e12c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MilkBucketItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/MilkBucketItemMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.MilkBucketItem; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/PotionItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/PotionItemMixin.java index 4e2bc615..ddebcd18 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/PotionItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/PotionItemMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.PotionItem; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/SnowballItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/SnowballItemMixin.java index bd8547fc..a81e8b1a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/SnowballItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/SnowballItemMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/SpawnEggItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/SpawnEggItemMixin.java index 35ebf5e0..ba231919 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/SpawnEggItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/SpawnEggItemMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import org.bukkit.event.entity.CreatureSpawnEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/TridentItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/TridentItemMixin.java index b610253f..8073788d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/TridentItemMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/TridentItemMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.item; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.entity.projectile.TridentEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.projectile.TridentEntityBridge; import io.izzel.arclight.mixin.Eject; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/BlastingRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/BlastingRecipeMixin.java index 1803dbca..fba70092 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/BlastingRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/BlastingRecipeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.crafting; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.AbstractCookingRecipe; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/CampfireCookingRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/CampfireCookingRecipeMixin.java index 185da05e..41524376 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/CampfireCookingRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/CampfireCookingRecipeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.crafting; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.AbstractCookingRecipe; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/CustomRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/CustomRecipeMixin.java index d939a4d6..f10ec543 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/CustomRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/CustomRecipeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.crafting; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import net.minecraft.world.item.crafting.CustomRecipe; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/FurnaceRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/FurnaceRecipeMixin.java index 30baed7f..4467a2fa 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/FurnaceRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/FurnaceRecipeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.crafting; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.AbstractCookingRecipe; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/IngredientMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/IngredientMixin.java index 3b5fe8b7..97764d0d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/IngredientMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/IngredientMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.crafting; -import io.izzel.arclight.common.bridge.item.crafting.IngredientBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IngredientBridge; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/RecipeManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/RecipeManagerMixin.java index 95624cab..036ea6e2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/RecipeManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/RecipeManagerMixin.java @@ -5,8 +5,8 @@ import com.google.common.collect.Maps; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.item.crafting.RecipeManagerBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.RecipeManagerBridge; import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; import net.minecraft.Util; import net.minecraft.core.Registry; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/RecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/RecipeMixin.java index e583b3ee..c04775fd 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/RecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/RecipeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.crafting; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import io.izzel.arclight.common.mod.util.ArclightSpecialRecipe; import net.minecraft.world.item.ItemStack; import org.bukkit.inventory.Recipe; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/ShapedRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/ShapedRecipeMixin.java index ba5da788..72a4cad6 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/ShapedRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/ShapedRecipeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.crafting; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import net.minecraft.core.NonNullList; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/ShapelessRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/ShapelessRecipeMixin.java index 94019393..1db4e081 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/ShapelessRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/ShapelessRecipeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.crafting; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import net.minecraft.core.NonNullList; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/SmithingRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/SmithingRecipeMixin.java index 5260102f..97459227 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/SmithingRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/SmithingRecipeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.crafting; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/SmokingRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/SmokingRecipeMixin.java index bb85b686..532124eb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/SmokingRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/SmokingRecipeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.crafting; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.AbstractCookingRecipe; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/StonecuttingRecipeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/StonecuttingRecipeMixin.java index 9a23f4cd..c8f9ffc9 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/StonecuttingRecipeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/crafting/StonecuttingRecipeMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.crafting; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/enchantment/DamageEnchantmentMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/enchantment/DamageEnchantmentMixin.java index dfb354b6..987ecfd4 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/enchantment/DamageEnchantmentMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/enchantment/DamageEnchantmentMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.item.enchantment; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.enchantment.DamageEnchantment; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/LevelMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/LevelMixin.java index ba87d9e6..7ff7931a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/LevelMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/LevelMixin.java @@ -1,9 +1,9 @@ package io.izzel.arclight.common.mixin.core.world.level; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.bridge.world.border.WorldBorderBridge; -import io.izzel.arclight.common.bridge.world.server.ServerChunkProviderBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.border.WorldBorderBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerChunkProviderBridge; import io.izzel.arclight.common.mod.ArclightMod; import io.izzel.arclight.common.mod.server.ArclightServer; import io.izzel.arclight.common.mod.server.world.WrappedWorlds; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/BeehiveBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/BeehiveBlockMixin.java index 00441c01..1fdf5548 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/BeehiveBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/BeehiveBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.animal.Bee; import net.minecraft.world.level.block.BeehiveBlock; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/BlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/BlockMixin.java index 50e9e94c..599814bf 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/BlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/BlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.block.BlockBridge; +import io.izzel.arclight.common.bridge.core.block.BlockBridge; import io.izzel.arclight.common.mixin.core.world.level.block.state.BlockBehaviourMixin; import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.core.BlockPos; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/ButtonBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/ButtonBlockMixin.java index 9c274405..3a85e610 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/ButtonBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/ButtonBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import org.bukkit.Bukkit; import org.bukkit.block.Block; import org.bukkit.craftbukkit.v.block.CraftBlock; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/CakeBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/CakeBlockMixin.java index f214fcd7..eb74e66f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/CakeBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/CakeBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Player; import net.minecraft.world.food.FoodData; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/CarvedPumpkinBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/CarvedPumpkinBlockMixin.java index 6d88bf0e..c59a3172 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/CarvedPumpkinBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/CarvedPumpkinBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/ComposterBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/ComposterBlockMixin.java index e3163b18..e02fe86d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/ComposterBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/ComposterBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import io.izzel.arclight.common.mod.util.ArclightCaptures; import it.unimi.dsi.fastutil.objects.Object2FloatMap; import net.minecraft.core.BlockPos; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/DropperBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/DropperBlockMixin.java index 7dd95d16..2bd6a36e 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/DropperBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/DropperBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockSourceImpl; import net.minecraft.core.Direction; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/EndPortalBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/EndPortalBlockMixin.java index a3ba71dd..f5a07d21 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/EndPortalBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/EndPortalBlockMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceKey; import net.minecraft.server.MinecraftServer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/FireBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/FireBlockMixin.java index 27dbbf3c..5d74abc3 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/FireBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/FireBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.block.FireBlockBridge; +import io.izzel.arclight.common.bridge.core.block.FireBlockBridge; import it.unimi.dsi.fastutil.objects.Object2IntMap; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/InfestedBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/InfestedBlockMixin.java index f957f79f..2daf777d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/InfestedBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/InfestedBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.block.InfestedBlock; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/LecternBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/LecternBlockMixin.java index 4e980508..e2488cb1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/LecternBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/LecternBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.ItemStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/NetherPortalBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/NetherPortalBlockMixin.java index e8574d3f..b97c6d18 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/NetherPortalBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/NetherPortalBlockMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.EntityTypeBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityTypeBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/NoteBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/NoteBlockMixin.java index 5256f45c..14be3af3 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/NoteBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/NoteBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.block.NoteBlockBridge; +import io.izzel.arclight.common.bridge.core.block.NoteBlockBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.NoteBlock; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PortalInfoMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PortalInfoMixin.java index 97e8d9f0..e42d1637 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PortalInfoMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PortalInfoMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.block.PortalInfoBridge; +import io.izzel.arclight.common.bridge.core.block.PortalInfoBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.portal.PortalInfo; import org.bukkit.craftbukkit.v.event.CraftPortalEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PortalSizeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PortalSizeMixin.java index 183c54aa..50dfaffc 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PortalSizeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PortalSizeMixin.java @@ -1,9 +1,9 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.block.PortalInfoBridge; -import io.izzel.arclight.common.bridge.block.PortalSizeBridge; -import io.izzel.arclight.common.bridge.world.IWorldBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.block.PortalInfoBridge; +import io.izzel.arclight.common.bridge.core.block.PortalSizeBridge; +import io.izzel.arclight.common.bridge.core.world.IWorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.BlockUtil; import net.minecraft.core.BlockPos; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PressurePlateBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PressurePlateBlockMixin.java index 00de77c9..058df6ef 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PressurePlateBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/PressurePlateBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/RedstoneOreBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/RedstoneOreBlockMixin.java index 6c156aaf..2ce0a271 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/RedstoneOreBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/RedstoneOreBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/TripWireBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/TripWireBlockMixin.java index 9b30808d..1de5f2ee 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/TripWireBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/TripWireBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/TurtleEggBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/TurtleEggBlockMixin.java index c3a2f9d9..05c501cd 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/TurtleEggBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/TurtleEggBlockMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WeightedPressurePlateBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WeightedPressurePlateBlockMixin.java index bca4ca76..498c6074 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WeightedPressurePlateBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WeightedPressurePlateBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WitherRoseBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WitherRoseBlockMixin.java index f29c1233..8cf809fd 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WitherRoseBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WitherRoseBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WitherSkullBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WitherSkullBlockMixin.java index 9e4a6062..944661d4 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WitherSkullBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/WitherSkullBlockMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/AbstractFurnaceBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/AbstractFurnaceBlockEntityMixin.java index 7c889cfa..a2dd0b6b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/AbstractFurnaceBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/AbstractFurnaceBlockEntityMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.item.crafting.IRecipeBridge; -import io.izzel.arclight.common.bridge.tileentity.AbstractFurnaceTileEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.IRecipeBridge; +import io.izzel.arclight.common.bridge.core.tileentity.AbstractFurnaceTileEntityBridge; import io.izzel.arclight.mixin.Eject; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.minecraft.core.BlockPos; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BarrelBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BarrelBlockEntityMixin.java index 4c787cfe..29a68626 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BarrelBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BarrelBlockEntityMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import net.minecraft.core.NonNullList; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BeaconTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BeaconTileEntityMixin.java index 7394481c..eab27e46 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BeaconTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BeaconTileEntityMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.tileentity.BeaconTileEntityBridge; +import io.izzel.arclight.common.bridge.core.tileentity.BeaconTileEntityBridge; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectInstance; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BeehiveBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BeehiveBlockEntityMixin.java index b69a49d6..f8b32d05 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BeehiveBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BeehiveBlockEntityMixin.java @@ -1,9 +1,9 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; import com.google.common.collect.Lists; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.tags.EntityTypeTags; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BlockEntityMixin.java index 5f60482c..e75af3f2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BlockEntityMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.tileentity.TileEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.tileentity.TileEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.Level; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BrewingStandBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BrewingStandBlockEntityMixin.java index 94795d77..5035502e 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BrewingStandBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/BrewingStandBlockEntityMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.tileentity.TileEntityBridge; +import io.izzel.arclight.common.bridge.core.tileentity.TileEntityBridge; import io.izzel.arclight.common.mod.util.ArclightCaptures; import io.izzel.arclight.mixin.Eject; import net.minecraft.core.BlockPos; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/ChestBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/ChestBlockEntityMixin.java index bd6f7336..06ffb96b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/ChestBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/ChestBlockEntityMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import net.minecraft.core.NonNullList; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.ChestBlockEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/CommandBlockLogicMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/CommandBlockLogicMixin.java index 2ee2f6fd..49be1433 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/CommandBlockLogicMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/CommandBlockLogicMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; import com.google.common.base.Joiner; -import io.izzel.arclight.common.bridge.command.CommandSourceBridge; +import io.izzel.arclight.common.bridge.core.command.CommandSourceBridge; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.network.chat.Component; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/CommandBlockTileEntity1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/CommandBlockTileEntity1Mixin.java index 360fe16d..5ec7f023 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/CommandBlockTileEntity1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/CommandBlockTileEntity1Mixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge; import net.minecraft.commands.CommandSourceStack; import net.minecraft.world.level.block.entity.CommandBlockEntity; import org.bukkit.command.CommandSender; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/ConduitBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/ConduitBlockEntityMixin.java index 641e0a78..85192feb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/ConduitBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/ConduitBlockEntityMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/EndGatewayBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/EndGatewayBlockEntityMixin.java index 4e4db96b..6c3facc0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/EndGatewayBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/EndGatewayBlockEntityMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.network.play.ServerPlayNetHandlerBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/HopperBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/HopperBlockEntityMixin.java index 85961f6b..c3a9b07b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/HopperBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/HopperBlockEntityMixin.java @@ -1,9 +1,9 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.tileentity.TileEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.tileentity.TileEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mod.util.ArclightCaptures; import io.izzel.arclight.mixin.Eject; import net.minecraft.core.Direction; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LecternBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LecternBlockEntityMixin.java index 6790027f..47dd16da 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LecternBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LecternBlockEntityMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.inventory.container.LecternContainerBridge; +import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.LecternContainerBridge; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.Component; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LecternTileEntity1Mixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LecternTileEntity1Mixin.java index 93889073..50b3e502 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LecternTileEntity1Mixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LecternTileEntity1Mixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.tileentity.TileEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.tileentity.TileEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LockableBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LockableBlockEntityMixin.java index 1600d4be..6b15c419 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LockableBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/LockableBlockEntityMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; import net.minecraft.world.Container; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.level.block.entity.BaseContainerBlockEntity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/SignBlockEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/SignBlockEntityMixin.java index 6d6b5f14..3fe1f0af 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/SignBlockEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/block/entity/SignBlockEntityMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.level.block.entity; -import io.izzel.arclight.common.bridge.command.ICommandSourceBridge; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.tileentity.SignTileEntityBridge; +import io.izzel.arclight.common.bridge.core.command.ICommandSourceBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.tileentity.SignTileEntityBridge; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.Component; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/border/WorldBorderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/border/WorldBorderMixin.java index da2360b3..0b0f4922 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/border/WorldBorderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/border/WorldBorderMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.border; -import io.izzel.arclight.common.bridge.world.border.WorldBorderBridge; +import io.izzel.arclight.common.bridge.core.world.border.WorldBorderBridge; import net.minecraft.world.level.Level; import net.minecraft.world.level.border.WorldBorder; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/chunk/LevelChunkMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/chunk/LevelChunkMixin.java index d197e444..3db13692 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/chunk/LevelChunkMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/chunk/LevelChunkMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.level.chunk; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.bridge.world.chunk.ChunkBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.chunk.ChunkBridge; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/chunk/storage/RegionFileCacheMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/chunk/storage/RegionFileCacheMixin.java index 3b4875a3..a814b35d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/chunk/storage/RegionFileCacheMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/chunk/storage/RegionFileCacheMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.chunk.storage; -import io.izzel.arclight.common.bridge.world.chunk.storage.RegionFileCacheBridge; +import io.izzel.arclight.common.bridge.core.world.chunk.storage.RegionFileCacheBridge; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.chunk.storage.RegionFile; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/portal/PortalForcerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/portal/PortalForcerMixin.java index 729fefb7..ba7ee9b0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/portal/PortalForcerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/portal/PortalForcerMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.level.portal; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.world.TeleporterBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.world.TeleporterBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.BlockUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/saveddata/maps/MapDataMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/saveddata/maps/MapDataMixin.java index 1a2a200c..1ca00c53 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/saveddata/maps/MapDataMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/saveddata/maps/MapDataMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.saveddata.maps; -import io.izzel.arclight.common.bridge.world.storage.MapDataBridge; +import io.izzel.arclight.common.bridge.core.world.storage.MapDataBridge; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.Level; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/saveddata/maps/MapData_MapInfoMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/saveddata/maps/MapData_MapInfoMixin.java index 3e199c92..52bd97f6 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/saveddata/maps/MapData_MapInfoMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/saveddata/maps/MapData_MapInfoMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.level.saveddata.maps; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.world.storage.MapDataBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.world.storage.MapDataBridge; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundMapItemDataPacket; import net.minecraft.world.entity.player.Player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/storage/loot/LootTableMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/storage/loot/LootTableMixin.java index 2532afd8..ea35a300 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/storage/loot/LootTableMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/storage/loot/LootTableMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.level.storage.loot; -import io.izzel.arclight.common.bridge.world.storage.loot.LootTableBridge; +import io.izzel.arclight.common.bridge.core.world.storage.loot.LootTableBridge; import io.izzel.arclight.mixin.Eject; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/AbstractSpawnerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/AbstractSpawnerMixin.java index 6d21a650..4930feca 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/AbstractSpawnerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/AbstractSpawnerMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.spawner; -import io.izzel.arclight.common.bridge.entity.MobEntityBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.bridge.world.server.ServerWorldBridge; +import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PatrolSpawnerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PatrolSpawnerMixin.java index 7e10f9d4..9b3202af 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PatrolSpawnerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PatrolSpawnerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.spawner; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import org.bukkit.event.entity.CreatureSpawnEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PhantomSpawnerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PhantomSpawnerMixin.java index 8c9e5231..5e8b75d1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PhantomSpawnerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/PhantomSpawnerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.spawner; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.levelgen.PhantomSpawner; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WanderingTraderSpawnerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WanderingTraderSpawnerMixin.java index f420df5b..b042ca3c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WanderingTraderSpawnerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WanderingTraderSpawnerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.spawner; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.npc.WanderingTrader; import net.minecraft.world.entity.npc.WanderingTraderSpawner; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WorldEntitySpawnerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WorldEntitySpawnerMixin.java index 02d832af..a27ea682 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WorldEntitySpawnerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WorldEntitySpawnerMixin.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.core.world.spawner; -import io.izzel.arclight.common.bridge.world.IWorldWriterBridge; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.common.bridge.world.spawner.WorldEntitySpawnerBridge; +import io.izzel.arclight.common.bridge.core.world.IWorldWriterBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.spawner.WorldEntitySpawnerBridge; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Mob; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WorldEntitySpawner_EntityDensityManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WorldEntitySpawner_EntityDensityManagerMixin.java index 06bfd46e..db01b512 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WorldEntitySpawner_EntityDensityManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/spawner/WorldEntitySpawner_EntityDensityManagerMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.spawner; -import io.izzel.arclight.common.bridge.world.spawner.WorldEntitySpawnerBridge; +import io.izzel.arclight.common.bridge.core.world.spawner.WorldEntitySpawnerBridge; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.EntityType; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/DerivedWorldInfoMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/DerivedWorldInfoMixin.java index 686f6d93..ccdfb210 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/DerivedWorldInfoMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/DerivedWorldInfoMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.storage; -import io.izzel.arclight.common.bridge.world.storage.DerivedWorldInfoBridge; +import io.izzel.arclight.common.bridge.core.world.storage.DerivedWorldInfoBridge; import io.izzel.arclight.i18n.ArclightConfig; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.dimension.DimensionType; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/PlayerDataMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/PlayerDataMixin.java index 618bd4ae..b63f2735 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/PlayerDataMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/PlayerDataMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.storage; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; -import io.izzel.arclight.common.bridge.world.storage.PlayerDataBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.world.storage.PlayerDataBridge; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.server.level.ServerPlayer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/SaveFormatMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/SaveFormatMixin.java index bcdfd4b0..f876d3b6 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/SaveFormatMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/SaveFormatMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.storage; -import io.izzel.arclight.common.bridge.world.storage.SaveFormatBridge; +import io.izzel.arclight.common.bridge.core.world.storage.SaveFormatBridge; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/SaveFormat_LevelSaveMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/SaveFormat_LevelSaveMixin.java index f4d23d04..23076d37 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/SaveFormat_LevelSaveMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/SaveFormat_LevelSaveMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.core.world.storage; -import io.izzel.arclight.common.bridge.world.storage.SaveFormatBridge; +import io.izzel.arclight.common.bridge.core.world.storage.SaveFormatBridge; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/ServerWorldInfoMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/ServerWorldInfoMixin.java index 140a7ab1..c1d3dc45 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/ServerWorldInfoMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/ServerWorldInfoMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mixin.core.world.storage; import com.mojang.serialization.Lifecycle; -import io.izzel.arclight.common.bridge.world.storage.WorldInfoBridge; +import io.izzel.arclight.common.bridge.core.world.storage.WorldInfoBridge; import net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/NetworkHooksMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/NetworkHooksMixin.java index 3b40dbf3..5534ae1a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/NetworkHooksMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/NetworkHooksMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mixin.forge; -import io.izzel.arclight.common.bridge.inventory.container.ContainerBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.ContainerBridge; import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.network.Connection; import net.minecraft.network.FriendlyByteBuf; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/CraftMagicNumbersMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/CraftMagicNumbersMixin.java similarity index 93% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/CraftMagicNumbersMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/CraftMagicNumbersMixin.java index 68cc156e..4f4d62ee 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/CraftMagicNumbersMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/CraftMagicNumbersMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.mixin.optimization.dfu; +package io.izzel.arclight.common.mixin.optimization.dfu; import io.izzel.arclight.i18n.ArclightLocale; import org.bukkit.craftbukkit.v.util.CraftMagicNumbers; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixerUpperMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/DataFixerUpperMixin.java similarity index 90% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixerUpperMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/DataFixerUpperMixin.java index 4b43844d..ac364cd6 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixerUpperMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/DataFixerUpperMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.mixin.optimization.dfu; +package io.izzel.arclight.common.mixin.optimization.dfu; import com.mojang.datafixers.DSL; import com.mojang.datafixers.DataFixerUpper; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixesManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/DataFixesManagerMixin.java similarity index 92% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixesManagerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/DataFixesManagerMixin.java index 00eb43ae..1362fc87 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixesManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/DataFixesManagerMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.mixin.optimization.dfu; +package io.izzel.arclight.common.mixin.optimization.dfu; import com.mojang.datafixers.DataFixer; import com.mojang.datafixers.DataFixerBuilder; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/MinecraftServerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/MinecraftServerMixin.java similarity index 93% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/MinecraftServerMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/MinecraftServerMixin.java index 3629e072..b7779fad 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/MinecraftServerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/dfu/MinecraftServerMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.mixin.optimization.dfu; +package io.izzel.arclight.common.mixin.optimization.dfu; import io.izzel.arclight.i18n.ArclightLocale; import net.minecraft.server.MinecraftServer; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/ClassInheritanceMultiMapMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/ClassInheritanceMultiMapMixin.java similarity index 98% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/ClassInheritanceMultiMapMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/ClassInheritanceMultiMapMixin.java index 2be9173a..fd7f9bc6 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/ClassInheritanceMultiMapMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/ClassInheritanceMultiMapMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.mixin.optimization.general; +package io.izzel.arclight.common.mixin.optimization.general; import net.minecraft.util.ClassInstanceMultiMap; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/EntityDataManagerMixin_Optimize.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/EntityDataManagerMixin_Optimize.java similarity index 85% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/EntityDataManagerMixin_Optimize.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/EntityDataManagerMixin_Optimize.java index e09ed598..f1ec7c7e 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/EntityDataManagerMixin_Optimize.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/EntityDataManagerMixin_Optimize.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.impl.mixin.optimization.general; +package io.izzel.arclight.common.mixin.optimization.general; -import io.izzel.arclight.impl.common.optimization.NoopReadWriteLock; +import io.izzel.arclight.common.mod.util.optimization.NoopReadWriteLock; import net.minecraft.network.syncher.SynchedEntityData; import net.minecraft.world.entity.Entity; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/VoxelShapesMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/VoxelShapesMixin.java similarity index 86% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/VoxelShapesMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/VoxelShapesMixin.java index ff1afd2f..f39c6e07 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/VoxelShapesMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/VoxelShapesMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.impl.mixin.optimization.general; +package io.izzel.arclight.common.mixin.optimization.general; -import io.izzel.arclight.impl.common.optimization.OptimizedIndirectMerger; +import io.izzel.arclight.common.mod.util.optimization.OptimizedIndirectMerger; import it.unimi.dsi.fastutil.doubles.DoubleList; import net.minecraft.world.phys.shapes.IndexMerger; import net.minecraft.world.phys.shapes.Shapes; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ActivationRangeMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/ActivationRangeMixin.java similarity index 75% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ActivationRangeMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/ActivationRangeMixin.java index f28cf9a0..6820032a 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ActivationRangeMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/ActivationRangeMixin.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.impl.mixin.optimization.general.activationrange; +package io.izzel.arclight.common.mixin.optimization.general.activationrange; -import io.izzel.arclight.impl.bridge.EntityBridge_ActivationRange; +import io.izzel.arclight.common.bridge.optimization.EntityBridge_ActivationRange; import net.minecraft.world.entity.Entity; import org.spigotmc.ActivationRange; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java similarity index 90% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java index af372cb0..1da96c5e 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.impl.mixin.optimization.general.activationrange; +package io.izzel.arclight.common.mixin.optimization.general.activationrange; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.mod.ArclightConstants; -import io.izzel.arclight.impl.bridge.EntityBridge_ActivationRange; +import io.izzel.arclight.common.bridge.optimization.EntityBridge_ActivationRange; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.Level; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ServerWorldMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/ServerWorldMixin_ActivationRange.java similarity index 88% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ServerWorldMixin_ActivationRange.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/ServerWorldMixin_ActivationRange.java index 85f130da..68ff6e4a 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ServerWorldMixin_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/ServerWorldMixin_ActivationRange.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.impl.mixin.optimization.general.activationrange; +package io.izzel.arclight.common.mixin.optimization.general.activationrange; -import io.izzel.arclight.impl.bridge.EntityBridge_ActivationRange; +import io.izzel.arclight.common.bridge.optimization.EntityBridge_ActivationRange; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import org.spigotmc.ActivationRange; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AbstractArrowEntityMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/AbstractArrowEntityMixin_ActivationRange.java similarity index 74% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AbstractArrowEntityMixin_ActivationRange.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/AbstractArrowEntityMixin_ActivationRange.java index f1601df9..b4778123 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AbstractArrowEntityMixin_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/AbstractArrowEntityMixin_ActivationRange.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.impl.mixin.optimization.general.activationrange.entity; +package io.izzel.arclight.common.mixin.optimization.general.activationrange.entity; -import io.izzel.arclight.impl.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; +import io.izzel.arclight.common.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; import net.minecraft.world.entity.projectile.AbstractArrow; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AgeableEntityMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/AgeableEntityMixin_ActivationRange.java similarity index 75% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AgeableEntityMixin_ActivationRange.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/AgeableEntityMixin_ActivationRange.java index 29da7814..74aeef99 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AgeableEntityMixin_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/AgeableEntityMixin_ActivationRange.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.impl.mixin.optimization.general.activationrange.entity; +package io.izzel.arclight.common.mixin.optimization.general.activationrange.entity; -import io.izzel.arclight.common.bridge.entity.AgeableEntityBridge; -import io.izzel.arclight.impl.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; +import io.izzel.arclight.common.bridge.core.entity.AgeableEntityBridge; +import io.izzel.arclight.common.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; import net.minecraft.world.entity.AgeableMob; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AreaEffectCloudEntityMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/AreaEffectCloudEntityMixin_ActivationRange.java similarity index 75% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AreaEffectCloudEntityMixin_ActivationRange.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/AreaEffectCloudEntityMixin_ActivationRange.java index fb92f33e..42f062c8 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AreaEffectCloudEntityMixin_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/AreaEffectCloudEntityMixin_ActivationRange.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.impl.mixin.optimization.general.activationrange.entity; +package io.izzel.arclight.common.mixin.optimization.general.activationrange.entity; -import io.izzel.arclight.impl.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; +import io.izzel.arclight.common.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; import net.minecraft.world.entity.AreaEffectCloud; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/FireworkRocketEntityMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/FireworkRocketEntityMixin_ActivationRange.java similarity index 77% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/FireworkRocketEntityMixin_ActivationRange.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/FireworkRocketEntityMixin_ActivationRange.java index 7b940796..d5f99ccc 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/FireworkRocketEntityMixin_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/FireworkRocketEntityMixin_ActivationRange.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.impl.mixin.optimization.general.activationrange.entity; +package io.izzel.arclight.common.mixin.optimization.general.activationrange.entity; -import io.izzel.arclight.impl.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; +import io.izzel.arclight.common.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; import net.minecraft.world.entity.projectile.FireworkRocketEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/ItemEntityMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/ItemEntityMixin_ActivationRange.java similarity index 90% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/ItemEntityMixin_ActivationRange.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/ItemEntityMixin_ActivationRange.java index 2b821454..86f8e089 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/ItemEntityMixin_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/ItemEntityMixin_ActivationRange.java @@ -1,8 +1,8 @@ -package io.izzel.arclight.impl.mixin.optimization.general.activationrange.entity; +package io.izzel.arclight.common.mixin.optimization.general.activationrange.entity; -import io.izzel.arclight.common.bridge.world.WorldBridge; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; import io.izzel.arclight.common.mod.ArclightConstants; -import io.izzel.arclight.impl.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/LivingEntityMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/LivingEntityMixin_ActivationRange.java similarity index 70% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/LivingEntityMixin_ActivationRange.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/LivingEntityMixin_ActivationRange.java index b01e01f3..f3ed25e5 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/LivingEntityMixin_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/LivingEntityMixin_ActivationRange.java @@ -1,6 +1,6 @@ -package io.izzel.arclight.impl.mixin.optimization.general.activationrange.entity; +package io.izzel.arclight.common.mixin.optimization.general.activationrange.entity; -import io.izzel.arclight.impl.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; +import io.izzel.arclight.common.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; import net.minecraft.world.entity.LivingEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/VillagerEntityMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/VillagerEntityMixin_ActivationRange.java similarity index 71% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/VillagerEntityMixin_ActivationRange.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/VillagerEntityMixin_ActivationRange.java index b40496e7..6b6b6ac6 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/VillagerEntityMixin_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/entity/VillagerEntityMixin_ActivationRange.java @@ -1,7 +1,7 @@ -package io.izzel.arclight.impl.mixin.optimization.general.activationrange.entity; +package io.izzel.arclight.common.mixin.optimization.general.activationrange.entity; -import io.izzel.arclight.common.bridge.world.WorldBridge; -import io.izzel.arclight.impl.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; +import io.izzel.arclight.common.bridge.core.world.WorldBridge; +import io.izzel.arclight.common.mixin.optimization.general.activationrange.EntityMixin_ActivationRange; import net.minecraft.world.entity.npc.Villager; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/realtime/ItemEntityMixin_Realtime.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/realtime/ItemEntityMixin_Realtime.java similarity index 94% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/realtime/ItemEntityMixin_Realtime.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/realtime/ItemEntityMixin_Realtime.java index a6e1518b..6a7d70d8 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/realtime/ItemEntityMixin_Realtime.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/realtime/ItemEntityMixin_Realtime.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.mixin.optimization.general.realtime; +package io.izzel.arclight.common.mixin.optimization.general.realtime; import io.izzel.arclight.common.mod.ArclightConstants; import net.minecraft.world.entity.item.ItemEntity; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/realtime/PlayerInteractionManagerMixin_Realtime.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/realtime/PlayerInteractionManagerMixin_Realtime.java similarity index 93% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/realtime/PlayerInteractionManagerMixin_Realtime.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/realtime/PlayerInteractionManagerMixin_Realtime.java index 279889df..91b466ac 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/realtime/PlayerInteractionManagerMixin_Realtime.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/realtime/PlayerInteractionManagerMixin_Realtime.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.mixin.optimization.general.realtime; +package io.izzel.arclight.common.mixin.optimization.general.realtime; import io.izzel.arclight.common.mod.ArclightConstants; import net.minecraft.server.level.ServerPlayerGameMode; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/trackingrange/ChunkManagerMixin_TrackingRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/trackingrange/ChunkManagerMixin_TrackingRange.java similarity index 89% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/trackingrange/ChunkManagerMixin_TrackingRange.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/trackingrange/ChunkManagerMixin_TrackingRange.java index 86d29f90..bd297377 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/trackingrange/ChunkManagerMixin_TrackingRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/trackingrange/ChunkManagerMixin_TrackingRange.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.mixin.optimization.general.trackingrange; +package io.izzel.arclight.common.mixin.optimization.general.trackingrange; import net.minecraft.server.level.ChunkMap; import net.minecraft.world.entity.Entity; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/GoalSelectorMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/GoalSelectorMixin.java similarity index 98% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/GoalSelectorMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/GoalSelectorMixin.java index afac0c7e..63eec3d6 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/GoalSelectorMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/GoalSelectorMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.mixin.optimization.stream; +package io.izzel.arclight.common.mixin.optimization.stream; import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.world.entity.ai.goal.Goal; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/ITaskQueue_PriorityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/ITaskQueue_PriorityMixin.java similarity index 92% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/ITaskQueue_PriorityMixin.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/ITaskQueue_PriorityMixin.java index 766bccac..4eff8da8 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/ITaskQueue_PriorityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/stream/ITaskQueue_PriorityMixin.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.mixin.optimization.stream; +package io.izzel.arclight.common.mixin.optimization.stream; import net.minecraft.util.thread.StrictQueue; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConnector.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConnector.java index a825e861..40d837ef 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConnector.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConnector.java @@ -1,6 +1,7 @@ package io.izzel.arclight.common.mod; import io.izzel.arclight.common.mod.util.log.ArclightI18nLogger; +import io.izzel.arclight.i18n.ArclightConfig; import io.izzel.arclight.mixin.injector.EjectorInfo; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.mixin.Mixins; @@ -19,5 +20,14 @@ public class ArclightConnector implements IMixinConnector { Mixins.addConfiguration("mixins.arclight.forge.json"); Mixins.addConfiguration("mixins.arclight.api.json"); LOGGER.info("mixin-load.core"); + if (true) return; + Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.json"); + if (ArclightConfig.spec().getOptimization().isRemoveStream()) { + Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.stream.json"); + } + if (ArclightConfig.spec().getOptimization().isDisableDFU()) { + Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.dfu.json"); + } + LOGGER.info("mixin-load.optimization"); } } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightMod.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightMod.java index e83848ac..36a4bccc 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightMod.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightMod.java @@ -1,6 +1,5 @@ package io.izzel.arclight.common.mod; -import io.izzel.arclight.api.ArclightVersion; import io.izzel.arclight.common.mod.server.ArclightPermissionHandler; import io.izzel.arclight.common.mod.server.event.ArclightEventDispatcherRegistry; import io.izzel.arclight.common.mod.util.log.ArclightI18nLogger; @@ -25,7 +24,6 @@ public class ArclightMod { public ArclightMod() { LOGGER.info("mod-load"); - ArclightVersion.setVersion(ArclightVersion.v1_17_R1); System.setOut(new LoggingPrintStream("STDOUT", System.out, Level.INFO)); System.setErr(new LoggingPrintStream("STDERR", System.err, Level.ERROR)); ArclightEventDispatcherRegistry.registerAllEventDispatchers(); diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/compat/CommandNodeHooks.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/compat/CommandNodeHooks.java new file mode 100644 index 00000000..130c64d0 --- /dev/null +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/compat/CommandNodeHooks.java @@ -0,0 +1,42 @@ +package io.izzel.arclight.common.mod.compat; + +import com.mojang.brigadier.tree.CommandNode; +import io.izzel.arclight.api.Unsafe; +import io.izzel.arclight.common.bridge.core.command.CommandSourceBridge; + +import java.util.Map; + +public class CommandNodeHooks { + + private static final long CHILDREN, LITERALS, ARGUMENTS; + + static { + try { + CHILDREN = Unsafe.objectFieldOffset(CommandNode.class.getDeclaredField("children")); + LITERALS = Unsafe.objectFieldOffset(CommandNode.class.getDeclaredField("literals")); + ARGUMENTS = Unsafe.objectFieldOffset(CommandNode.class.getDeclaredField("arguments")); + } catch (Throwable t) { + throw new RuntimeException(t); + } + } + + @SuppressWarnings("unchecked") + public static void removeCommand(CommandNode node, String command) { + ((Map) Unsafe.getObject(node, CHILDREN)).remove(command); + ((Map) Unsafe.getObject(node, LITERALS)).remove(command); + ((Map) Unsafe.getObject(node, ARGUMENTS)).remove(command); + } + + public static boolean canUse(CommandNode node, S source) { + if (source instanceof CommandSourceBridge s) { + try { + s.bridge$setCurrentCommand(node); + return node.canUse(source); + } finally { + s.bridge$setCurrentCommand(null); + } + } else { + return node.canUse(source); + } + } +} diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightContainer.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightContainer.java index db6a5f33..e4cb4fee 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightContainer.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightContainer.java @@ -1,9 +1,9 @@ package io.izzel.arclight.common.mod.server; import io.izzel.arclight.api.Unsafe; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; -import io.izzel.arclight.common.bridge.inventory.IInventoryBridge; -import io.izzel.arclight.common.bridge.inventory.container.PosContainerBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.inventory.IInventoryBridge; +import io.izzel.arclight.common.bridge.core.inventory.container.PosContainerBridge; import io.izzel.arclight.common.mod.ArclightMod; import io.izzel.arclight.common.mod.util.ArclightCaptures; import io.izzel.tools.product.Product; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightPermissionHandler.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightPermissionHandler.java index 772227f3..df1d870a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightPermissionHandler.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightPermissionHandler.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mod.server; import com.mojang.authlib.GameProfile; -import io.izzel.arclight.common.bridge.entity.player.PlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge; import net.minecraftforge.server.permission.DefaultPermissionLevel; import net.minecraftforge.server.permission.IPermissionHandler; import net.minecraftforge.server.permission.context.IContext; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightServer.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightServer.java index 1d6b61a2..d2d00176 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightServer.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/ArclightServer.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mod.server; import io.izzel.arclight.common.bridge.bukkit.CraftServerBridge; -import io.izzel.arclight.common.bridge.server.MinecraftServerBridge; +import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge; import io.izzel.arclight.common.mod.ArclightMod; import net.minecraft.resources.ResourceKey; import net.minecraft.server.MinecraftServer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/block/CauldronHooks.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/block/CauldronHooks.java index 955f074c..c1522f00 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/block/CauldronHooks.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/block/CauldronHooks.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mod.server.block; -import io.izzel.arclight.common.bridge.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventFactory.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventFactory.java index 915a0a3f..75f8d876 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventFactory.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ArclightEventFactory.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mod.server.event; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v.entity.CraftLivingEntity; import org.bukkit.entity.Entity; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockBreakEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockBreakEventDispatcher.java index 65d3d492..b2b8a52b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockBreakEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockBreakEventDispatcher.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mod.server.event; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.Blocks; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockPlaceEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockPlaceEventDispatcher.java index 55e425bd..ce2ae9ab 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockPlaceEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/BlockPlaceEventDispatcher.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mod.server.event; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import io.izzel.arclight.common.mod.util.ArclightBlockSnapshot; import io.izzel.arclight.common.mod.util.ArclightCaptures; import net.minecraft.core.Direction; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ChunkEventHandler.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ChunkEventHandler.java index 0a479fc4..b70d7b24 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ChunkEventHandler.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/ChunkEventHandler.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mod.server.event; -import io.izzel.arclight.common.bridge.world.chunk.ChunkBridge; +import io.izzel.arclight.common.bridge.core.world.chunk.ChunkBridge; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.world.level.chunk.ChunkAccess; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityPotionEffectEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityPotionEffectEventDispatcher.java index 1eedfb6f..e64a690f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityPotionEffectEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityPotionEffectEventDispatcher.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mod.server.event; -import io.izzel.arclight.common.bridge.entity.LivingEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge; import net.minecraftforge.event.entity.living.PotionEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.bukkit.craftbukkit.v.event.CraftEventFactory; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityTeleportEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityTeleportEventDispatcher.java index f769d9cb..cabf45f9 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityTeleportEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityTeleportEventDispatcher.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mod.server.event; -import io.izzel.arclight.common.bridge.entity.EntityBridge; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.EntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.bukkit.Bukkit; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightHeadLoader.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightHeadLoader.java deleted file mode 100644 index 579b9cc5..00000000 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightHeadLoader.java +++ /dev/null @@ -1,46 +0,0 @@ -package io.izzel.arclight.common.mod.util; - -import com.google.common.cache.CacheLoader; -import com.google.common.collect.Iterables; -import com.mojang.authlib.Agent; -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.ProfileLookupCallback; -import com.mojang.authlib.properties.Property; -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v.CraftServer; - -import java.util.UUID; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.block.entity.SkullBlockEntity; - -public class ArclightHeadLoader extends CacheLoader { - - @Override - public GameProfile load(String key) { - GameProfile[] profiles = {null}; - ProfileLookupCallback gameProfileLookup = new ProfileLookupCallback() { - @Override - public void onProfileLookupSucceeded(GameProfile gp) { - profiles[0] = gp; - } - - @Override - public void onProfileLookupFailed(GameProfile gp, Exception excptn) { - profiles[0] = gp; - } - }; - ((CraftServer) Bukkit.getServer()).getServer().getProfileRepository().findProfilesByNames(new String[]{key}, Agent.MINECRAFT, gameProfileLookup); - GameProfile profile = profiles[0]; - if (profile == null) { - UUID uuid = Player.createPlayerUUID(new GameProfile(null, key)); - profile = new GameProfile(uuid, key); - gameProfileLookup.onProfileLookupSucceeded(profile); - } else { - Property property = Iterables.getFirst((profile.getProperties()).get("textures"), null); - if (property == null) { - profile = SkullBlockEntity.sessionService.fillProfileProperties(profile, true); - } - } - return profile; - } -} diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightPingEvent.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightPingEvent.java index b335d926..6b783ff0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightPingEvent.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightPingEvent.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mod.util; -import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; +import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import net.minecraft.network.Connection; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightSpecialRecipe.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightSpecialRecipe.java index 11e37c4f..edb30f3b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightSpecialRecipe.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/ArclightSpecialRecipe.java @@ -1,6 +1,6 @@ package io.izzel.arclight.common.mod.util; -import io.izzel.arclight.common.bridge.item.crafting.RecipeManagerBridge; +import io.izzel.arclight.common.bridge.core.item.crafting.RecipeManagerBridge; import net.minecraft.world.item.crafting.Recipe; import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks; import org.bukkit.NamespacedKey; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/DelegateWorldInfo.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/DelegateWorldInfo.java index 4de9e67e..63ca4ade 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/DelegateWorldInfo.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/DelegateWorldInfo.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mod.util; import com.mojang.serialization.Lifecycle; -import io.izzel.arclight.common.bridge.world.storage.DerivedWorldInfoBridge; -import io.izzel.arclight.common.bridge.world.storage.WorldInfoBridge; +import io.izzel.arclight.common.bridge.core.world.storage.DerivedWorldInfoBridge; +import io.izzel.arclight.common.bridge.core.world.storage.WorldInfoBridge; import net.minecraft.core.BlockPos; import net.minecraft.server.MinecraftServer; import net.minecraft.world.Difficulty; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightI18nLogger.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightI18nLogger.java index 3fa1a42f..520eba65 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightI18nLogger.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightI18nLogger.java @@ -1,113 +1,28 @@ package io.izzel.arclight.common.mod.util.log; -import io.izzel.arclight.i18n.ArclightLocale; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; +import io.izzel.arclight.api.Unsafe; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.Marker; -import org.apache.logging.log4j.spi.ExtendedLogger; -import org.apache.logging.log4j.spi.ExtendedLoggerWrapper; -import org.apache.logging.log4j.util.MessageSupplier; -import org.apache.logging.log4j.util.Supplier; -public class ArclightI18nLogger extends ExtendedLoggerWrapper { +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodType; - public ArclightI18nLogger(ExtendedLogger logger) { - super(logger, logger.getName(), logger.getMessageFactory()); +public class ArclightI18nLogger { + + private static final MethodHandle MH_GET_LOGGER; + + static { + try { + MH_GET_LOGGER = Unsafe.lookup().findStatic(Class.forName("io.izzel.arclight.boot.log.ArclightI18nLogger"), "getLogger", MethodType.methodType(Logger.class, String.class)); + } catch (Throwable e) { + throw new RuntimeException(e); + } } public static Logger getLogger(String name) { - return new ArclightI18nLogger((ExtendedLogger) LogManager.getLogger(name)); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, CharSequence message, Throwable t) { - this.info("", ""); - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message.toString()), t); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, Object message, Throwable t) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message.toString()), t); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, MessageSupplier msgSupplier, Throwable t) { - super.logMessage(fqcn, level, marker, msgSupplier, t); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, Supplier msgSupplier, Throwable t) { - super.logMessage(fqcn, level, marker, msgSupplier, t); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Throwable t) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), t); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message)); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Object... params) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), params); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4, p5); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4, p5, p6); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4, p5, p6, p7); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4, p5, p6, p7, p8); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4, p5, p6, p7, p8, p9); - } - - @Override - protected void logMessage(String fqcn, Level level, Marker marker, String message, Supplier... paramSuppliers) { - super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), paramSuppliers); + try { + return (Logger) MH_GET_LOGGER.invokeExact(name); + } catch (Throwable throwable) { + throw new RuntimeException(throwable); + } } } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightLazyLogManager.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightLazyLogManager.java deleted file mode 100644 index 9ef74c77..00000000 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightLazyLogManager.java +++ /dev/null @@ -1,42 +0,0 @@ -package io.izzel.arclight.common.mod.util.log; - -import java.util.Enumeration; -import java.util.logging.LogManager; -import java.util.logging.Logger; - -public class ArclightLazyLogManager extends LogManager { - - private static final String SECURITY_LOGGER_NAME = "jdk.event.security"; - private volatile LogManager delegate; - - @Override - public boolean addLogger(Logger logger) { - tryGet(); - if (SECURITY_LOGGER_NAME.equals(logger.getName())) return true; - if (delegate != null) return delegate.addLogger(logger); - return super.addLogger(logger); - } - - @Override - public Logger getLogger(String name) { - tryGet(); - if (delegate != null && !SECURITY_LOGGER_NAME.equals(name)) return delegate.getLogger(name); - return Logger.getGlobal(); - } - - @Override - public Enumeration getLoggerNames() { - tryGet(); - if (delegate != null) return delegate.getLoggerNames(); - return super.getLoggerNames(); - } - - private void tryGet() { - if (delegate != null) return; - try { - Class name = Class.forName("org.apache.logging.log4j.jul.LogManager"); - delegate = (LogManager) name.newInstance(); - } catch (Exception ignored) { - } - } -} diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/common/optimization/NoopReadWriteLock.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/optimization/NoopReadWriteLock.java similarity index 95% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/common/optimization/NoopReadWriteLock.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/optimization/NoopReadWriteLock.java index 21acd7d4..93db1677 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/common/optimization/NoopReadWriteLock.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/optimization/NoopReadWriteLock.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.common.optimization; +package io.izzel.arclight.common.mod.util.optimization; import org.jetbrains.annotations.NotNull; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/common/optimization/OptimizedIndirectMerger.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/optimization/OptimizedIndirectMerger.java similarity index 98% rename from arclight-forge/src/main/java/io/izzel/arclight/impl/common/optimization/OptimizedIndirectMerger.java rename to arclight-common/src/main/java/io/izzel/arclight/common/mod/util/optimization/OptimizedIndirectMerger.java index df802432..6e3b2b6e 100644 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/common/optimization/OptimizedIndirectMerger.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/optimization/OptimizedIndirectMerger.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.impl.common.optimization; +package io.izzel.arclight.common.mod.util.optimization; import it.unimi.dsi.fastutil.doubles.DoubleArrayList; import it.unimi.dsi.fastutil.doubles.DoubleList; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightRemapper.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightRemapper.java index 36920b1b..e750a9b7 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightRemapper.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/ArclightRemapper.java @@ -19,11 +19,14 @@ import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; +import java.util.function.Function; +@SuppressWarnings("unchecked") public class ArclightRemapper { public static final ArclightRemapper INSTANCE; public static final File DUMP; + public static final Function SWITCH_TABLE_FIXER; static { ArclightI18nLogger.getLogger("Arclight").info("loading-mapping"); @@ -42,6 +45,7 @@ public class ArclightRemapper { } else { DUMP = null; } + SWITCH_TABLE_FIXER = (Function) Class.forName("io.izzel.arclight.boot.asm.SwitchTableFixer").getField("INSTANCE").get(null); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/generated/RemappingURLClassLoader.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/generated/RemappingURLClassLoader.java index 860754f3..bea0d0fa 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/generated/RemappingURLClassLoader.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/remapper/generated/RemappingURLClassLoader.java @@ -1,7 +1,6 @@ package io.izzel.arclight.common.mod.util.remapper.generated; import com.google.common.io.ByteStreams; -import io.izzel.arclight.common.asm.SwitchTableFixer; import io.izzel.arclight.common.mod.util.remapper.ArclightRemapper; import io.izzel.arclight.common.mod.util.remapper.ClassLoaderRemapper; import io.izzel.arclight.common.mod.util.remapper.RemappingClassLoader; @@ -50,7 +49,7 @@ public class RemappingURLClassLoader extends URLClassLoader implements Remapping byteSource = () -> { try (InputStream is = connection.getInputStream()) { byte[] classBytes = ByteStreams.toByteArray(is); - classBytes = SwitchTableFixer.INSTANCE.processClass(classBytes); + classBytes = ArclightRemapper.SWITCH_TABLE_FIXER.apply(classBytes); return classBytes; } }; diff --git a/arclight-common/src/main/resources/META-INF/accesstransformer.cfg b/arclight-common/src/main/resources/META-INF/accesstransformer.cfg index e49c2cd5..4f68b416 100644 --- a/arclight-common/src/main/resources/META-INF/accesstransformer.cfg +++ b/arclight-common/src/main/resources/META-INF/accesstransformer.cfg @@ -387,3 +387,60 @@ public net.minecraft.world.inventory.AnvilMenu f_39002_ public net.minecraft.world.inventory.AnvilMenu f_39001_ public net.minecraft.world.level.block.state.StateHolder f_61110_ public net.minecraft.world.level.storage.LevelStorageSource f_78194_ +# Bukkit 1.17 +public net.minecraft.world.level.block.ComposterBlock$InputContainer +public net.minecraft.world.level.block.ComposterBlock$OutputContainer +public net.minecraft.server.level.ServerLevel m_142646_()Lnet/minecraft/world/level/entity/LevelEntityGetter; +public net.minecraft.world.level.Level m_142646_()Lnet/minecraft/world/level/entity/LevelEntityGetter; +public net.minecraft.world.entity.Mob m_7582_()Lnet/minecraft/resources/ResourceLocation; +public net.minecraft.world.entity.monster.Slime m_7582_()Lnet/minecraft/resources/ResourceLocation; +public net.minecraft.server.MinecraftServer m_6681_(Ljava/lang/Runnable;)Lnet/minecraft/server/TickTask; +public net.minecraft.server.level.ServerBossEvent m_143224_(Ljava/util/function/Function;)V +public net.minecraft.server.level.ServerPlayer m_143399_(Lnet/minecraft/world/inventory/AbstractContainerMenu;)V +public net.minecraft.server.level.ServerLevel f_143244_ +public net.minecraft.util.datafix.fixes.BlockStateData m_14942_(ILjava/lang/String;[Ljava/lang/String;)V +public net.minecraft.world.entity.Entity m_146912_()V +public net.minecraft.world.entity.Entity f_146813_ +public net.minecraft.world.entity.GlowSquid m_147119_(I)V +public net.minecraft.world.entity.ai.attributes.RangedAttribute f_22308_ +public net.minecraft.world.entity.animal.Ocelot m_29038_()Z +public net.minecraft.world.entity.animal.Ocelot m_29045_(Z)V +public net.minecraft.world.entity.animal.axolotl.Axolotl m_149117_(Lnet/minecraft/world/entity/animal/axolotl/Axolotl$Variant;)V +public net.minecraft.world.entity.monster.Creeper f_32270_ +public net.minecraft.world.entity.monster.Shulker m_33463_()I +public net.minecraft.world.entity.monster.Shulker m_149788_(Lnet/minecraft/core/Direction;)V +public net.minecraft.world.entity.monster.Shulker m_33418_(I)V +public net.minecraft.world.entity.monster.Skeleton f_149828_ +public net.minecraft.world.entity.monster.Skeleton m_149830_(I)V +public net.minecraft.world.entity.monster.piglin.Piglin f_34678_ +public net.minecraft.world.entity.npc.Villager m_35518_()V +public net.minecraft.world.entity.projectile.FishingHook m_150155_(Lnet/minecraft/world/entity/Entity;)V +public net.minecraft.world.entity.projectile.FishingHook m_150157_(Lnet/minecraft/world/entity/Entity;)V +public net.minecraft.world.entity.projectile.LargeFireball f_37197_ +public net.minecraft.world.item.MapItem m_151120_(Lnet/minecraft/world/level/Level;IIIZZLnet/minecraft/resources/ResourceKey;)I +public net.minecraft.world.level.BaseSpawner m_151332_(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/resources/ResourceLocation; +public net.minecraft.world.level.Level f_46438_ +public net.minecraft.world.level.Level f_46440_ +public net.minecraft.world.level.block.Block m_49805_(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;I)V +public net.minecraft.world.level.block.FireBlock f_53421_ +public net.minecraft.world.level.block.entity.SculkSensorBlockEntity f_155633_ +public net.minecraft.world.level.block.entity.BarrelBlockEntity f_155050_ +public net.minecraft.world.level.block.entity.ChestBlockEntity f_155324_ +public net.minecraft.world.level.block.entity.ChestBlockEntity m_155338_(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/sounds/SoundEvent;)V +public net.minecraft.world.level.saveddata.maps.MapItemSavedData f_77893_ +public net.minecraft.world.level.saveddata.maps.MapItemSavedData f_77894_ +public net.minecraft.world.level.saveddata.maps.MapItemSavedData m_164812_()V +public net.minecraft.world.level.saveddata.maps.MapItemSavedData m_164789_(II)V +public-f net.minecraft.network.protocol.handshake.ClientIntentionPacket f_134721_ +public-f net.minecraft.world.inventory.AbstractContainerMenu f_150394_ +public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData f_77887_ +public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData f_77892_ +public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData f_77890_ +public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData f_77888_ +public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData f_77889_ +public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData f_77885_ +public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData f_77886_ +public net.minecraft.server.MinecraftServer f_129750_ +public net.minecraft.util.datafix.fixes.BlockStateData m_14942_(ILjava/lang/String;[Ljava/lang/String;)V +public net.minecraft.world.entity.monster.Skeleton f_149826_ +public net.minecraft.world.scores.criteria.ObjectiveCriteria f_166108_ diff --git a/arclight-forge/src/main/resources/META-INF/mods.toml b/arclight-common/src/main/resources/META-INF/mods.toml similarity index 100% rename from arclight-forge/src/main/resources/META-INF/mods.toml rename to arclight-common/src/main/resources/META-INF/mods.toml diff --git a/arclight-common/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService b/arclight-common/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService deleted file mode 100644 index b2330511..00000000 --- a/arclight-common/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService +++ /dev/null @@ -1 +0,0 @@ -io.izzel.arclight.common.asm.ArclightImplementer \ No newline at end of file diff --git a/arclight-common/src/main/resources/mixins.arclight.core.json b/arclight-common/src/main/resources/mixins.arclight.core.json index 9f8db632..78ec7e52 100644 --- a/arclight-common/src/main/resources/mixins.arclight.core.json +++ b/arclight-common/src/main/resources/mixins.arclight.core.json @@ -17,7 +17,6 @@ "compatibilityLevel": "JAVA_11", "mixins": [ "advancements.AdvancementMixin", - "commands.CommandNodeMixin", "commands.CommandsMixin", "commands.CommandSourceMixin", "commands.CommandSourceStackMixin", diff --git a/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.dfu.json b/arclight-common/src/main/resources/mixins.arclight.impl.forge.optimization.dfu.json similarity index 65% rename from arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.dfu.json rename to arclight-common/src/main/resources/mixins.arclight.impl.forge.optimization.dfu.json index bdbe3fd6..a8b0cd60 100644 --- a/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.dfu.json +++ b/arclight-common/src/main/resources/mixins.arclight.impl.forge.optimization.dfu.json @@ -1,8 +1,8 @@ { "minVersion": "0.8", - "package": "io.izzel.arclight.impl.mixin.optimization.dfu", + "package": "io.izzel.arclight.common.mixin.optimization.dfu", "target": "@env(DEFAULT)", - "refmap": "mixins.arclight.impl.forge.refmap.json", + "refmap": "mixins.arclight.refmap.json", "compatibilityLevel": "JAVA_11", "mixins": [ "CraftMagicNumbersMixin", diff --git a/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.json b/arclight-common/src/main/resources/mixins.arclight.impl.forge.optimization.json similarity index 93% rename from arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.json rename to arclight-common/src/main/resources/mixins.arclight.impl.forge.optimization.json index 13717581..840981bb 100644 --- a/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.json +++ b/arclight-common/src/main/resources/mixins.arclight.impl.forge.optimization.json @@ -1,6 +1,6 @@ { "minVersion": "0.8", - "package": "io.izzel.arclight.impl.mixin.optimization.general", + "package": "io.izzel.arclight.common.mixin.optimization.general", "target": "@env(DEFAULT)", "refmap": "mixins.arclight.impl.forge.refmap.json", "compatibilityLevel": "JAVA_11", diff --git a/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.stream.json b/arclight-common/src/main/resources/mixins.arclight.impl.forge.optimization.stream.json similarity index 57% rename from arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.stream.json rename to arclight-common/src/main/resources/mixins.arclight.impl.forge.optimization.stream.json index cf734224..bd00af1a 100644 --- a/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.stream.json +++ b/arclight-common/src/main/resources/mixins.arclight.impl.forge.optimization.stream.json @@ -1,8 +1,8 @@ { "minVersion": "0.8", - "package": "io.izzel.arclight.impl.mixin.optimization.stream", + "package": "io.izzel.arclight.common.mixin.optimization.stream", "target": "@env(DEFAULT)", - "refmap": "mixins.arclight.impl.forge.refmap.json", + "refmap": "mixins.arclight.refmap.json", "compatibilityLevel": "JAVA_11", "mixins": [ "GoalSelectorMixin", diff --git a/arclight-forge/src/main/resources/pack.mcmeta b/arclight-common/src/main/resources/pack.mcmeta similarity index 100% rename from arclight-forge/src/main/resources/pack.mcmeta rename to arclight-common/src/main/resources/pack.mcmeta diff --git a/arclight-forge/build.gradle b/arclight-forge/build.gradle index ad010109..8a0103f8 100644 --- a/arclight-forge/build.gradle +++ b/arclight-forge/build.gradle @@ -1,38 +1,13 @@ -buildscript { - repositories { - maven { url = 'https://files.minecraftforge.net/maven' } - maven { url = 'https://repo.spongepowered.org/maven' } - mavenCentral() - maven { url = 'https://maven.izzel.io/releases' } - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: "${forge_gradle_version}" - classpath 'org.spongepowered:mixingradle:0.7.2-SNAPSHOT' - classpath "io.izzel.arclight:arclight-gradle-plugin:$agpVersion" - } -} +import java.security.MessageDigest plugins { - id 'org.javamodularity.moduleplugin' version '1.8.7' apply false + id 'com.github.johnrengelman.shadow' version '7.0.0' apply false } -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'org.spongepowered.mixin' apply plugin: 'java' apply plugin: 'idea' -apply plugin: 'io.izzel.arclight' apply plugin: 'maven-publish' -apply plugin: 'org.javamodularity.moduleplugin' - -arclight { - mcVersion = minecraftVersion - forgeVersion = project.ext.forgeVersion - bukkitVersion = 'v1_17_R1' - wipeVersion = true - reobfVersion = true - accessTransformer = project(':arclight-common').file('bukkit.at') - // packageName = 'spigot' -} +apply plugin: 'com.github.johnrengelman.shadow' archivesBaseName = archivesBaseName + '-' + minecraftVersion @@ -43,27 +18,16 @@ sourceSets { runtimeClasspath += main.output } } - module { - java { - compileClasspath += main.output - compileClasspath += main.compileClasspath - runtimeClasspath += main.output - } - } } java.toolchain.languageVersion = JavaLanguageVersion.of(16) configurations { + installer embed implementation.extendsFrom(embed) } -minecraft { - mappings channel: 'official', version: minecraftVersion - accessTransformer = project(':arclight-common').file('src/main/resources/META-INF/accesstransformer.cfg') -} - repositories { maven { name = 'sponge-repo' @@ -91,50 +55,39 @@ def embedLibs = ['org.spongepowered:mixin:0.8.3.2', 'org.yaml:snakeyaml:1.28', 'org.apache.maven.resolver:maven-resolver-spi:1.6.2', 'org.apache.maven.resolver:maven-resolver-util:1.6.2', 'org.apache.maven.resolver:maven-resolver-impl:1.6.2', 'org.apache.httpcomponents:httpclient:4.5.12', 'org.apache.httpcomponents:httpcore:4.4.13', 'commons-codec:commons-codec:1.11', - 'org.slf4j:jcl-over-slf4j:1.7.30', 'org.apache.logging.log4j:log4j-slf4j18-impl:2.14.1'] + 'org.slf4j:jcl-over-slf4j:1.7.30', 'org.apache.logging.log4j:log4j-slf4j18-impl:2.14.1', + 'org.spongepowered:configurate-hocon:3.6.1', 'org.spongepowered:configurate-core:3.6.1', + 'com.typesafe:config:1.3.1'] dependencies { - minecraft "net.minecraftforge:forge:$minecraftVersion-$forgeVersion" - implementation group: 'org.jetbrains', name: 'annotations', version: '19.0.0' - // implementation 'org.spongepowered:mixin:0.8.3' - implementation(project(':arclight-common')) { - exclude module: 'forge' - } - embed project(':i18n-config') - embed project(':forge-installer') + implementation 'com.google.guava:guava:21.0' + implementation 'org.ow2.asm:asm:9.1' + implementation 'org.ow2.asm:asm-tree:9.1' + implementation 'cpw.mods:modlauncher:9.0.7' + implementation 'cpw.mods:securejarhandler:0.9.45' + implementation 'net.minecraftforge:forgespi:4.0.9' + implementation 'com.google.code.gson:gson:2.8.0' + implementation 'org.apache.logging.log4j:log4j-api:2.14.1' + implementation 'org.jetbrains:annotations:19.0.0' + implementation 'org.spongepowered:mixin:0.8.3' + implementation 'org.apache.logging.log4j:log4j-jul:2.11.2' for (def lib : embedLibs) { - arclight lib + installer lib } - embed 'net.md-5:bungeecord-chat:1.16-R0.4@jar' - embed "org.spigotmc:spigot-api:$minecraftVersion-R0.1-SNAPSHOT@jar" embed 'io.izzel.arclight:mixin-tools:1.0.1' embed "io.izzel:tools:$toolsVersion" embed "io.izzel.arclight:arclight-api:$apiVersion" embed 'commons-lang:commons-lang:2.6@jar' - annotationProcessor 'org.spongepowered:mixin:0.8.3:processor' - annotationProcessor 'com.github.ArclightTeam:mixin-tools:1.0.0' -} - -def getGitHash = { -> - def stdout = new ByteArrayOutputStream() - exec { - commandLine 'git', 'rev-parse', '--short', 'HEAD' - standardOutput = stdout - } - return stdout.toString().trim() -} - -processResources { - filesMatching("**/mods.toml") { - expand 'version': "$minecraftVersion-${project.version}-${getGitHash()}" + embed(project(':i18n-config')) { + transitive = false } + embed(project(':forge-installer')) } jar { - manifest.attributes 'MixinConnector': 'io.izzel.arclight.impl.ArclightConnector_Forge' manifest.attributes 'Main-Class': 'io.izzel.arclight.server.Launcher' manifest.attributes 'Implementation-Title': 'Arclight' - manifest.attributes 'Implementation-Version': "arclight-$minecraftVersion-${project.version}-${getGitHash()}" + manifest.attributes 'Implementation-Version': "arclight-$minecraftVersion-${project.version}-$gitHash" manifest.attributes 'Implementation-Vendor': 'Arclight Team' manifest.attributes 'Implementation-Timestamp': new Date().format("yyyy-MM-dd HH:mm:ss") manifest.attributes 'Automatic-Module-Name': 'arclight.boot' @@ -147,24 +100,82 @@ jar { exclude "META-INF/services/**" exclude "org/apache/commons/lang/enum/**" } - from(project(':arclight-common').tasks.jar.outputs.files.collect { it.isDirectory() ? it : zipTree(it) }) + into('/') { + it.from(project(':arclight-common').tasks.jar.outputs.files.collect()) + it.rename { name -> 'common.jar' } + } from sourceSets.applaunch.output.classesDirs - from sourceSets.module.output.classesDirs duplicatesStrategy = DuplicatesStrategy.EXCLUDE + dependsOn(project(':arclight-common').tasks.jar) } -tasks.generateArclightMeta.doLast { - new File(project.buildDir, "arclight_cache/meta/META-INF/services").deleteDir() +task generateInstallerInfo { + def installer = file("${project.buildDir}/arclight_installer/META-INF/installer.json") + outputs.file(installer) + doLast { + def libs = project.configurations.installer.dependencies.collect { Dependency dep -> + def classifier = null + if (dep.artifacts) { + dep.artifacts.each { DependencyArtifact artifact -> + if (artifact.classifier) { + classifier = artifact.classifier + } + } + } + if (classifier) { + return "${dep.group}:${dep.name}:${dep.version}:$classifier" + } else { + return "${dep.group}:${dep.name}:${dep.version}" + } + } + def sha1 = { file -> + MessageDigest md = MessageDigest.getInstance('SHA-1') + file.eachByte 4096, { bytes, size -> + md.update(bytes, 0 as byte, size) + } + return md.digest().collect { String.format "%02x", it }.join() + } + def artifacts = { List arts -> + def ret = new HashMap() + def cfg = project.configurations.create("art_rev_" + System.currentTimeMillis()) + cfg.transitive = false + arts.each { + def dep = project.dependencies.create(it) + cfg.dependencies.add(dep) + } + cfg.resolve() + cfg.resolvedConfiguration.resolvedArtifacts.each { rev -> + def art = [ + group : rev.moduleVersion.id.group, + name : rev.moduleVersion.id.name, + version : rev.moduleVersion.id.version, + classifier: rev.classifier, + extension : rev.extension, + file : rev.file + ] + def desc = "${art.group}:${art.name}:${art.version}" + if (art.classifier != null) + desc += ":${art.classifier}" + if (art.extension != 'jar') + desc += "@${art.extension}" + ret.put(desc.toString(), sha1(art.file)) + } + return arts.collectEntries { [(it.toString()): ret.get(it.toString())] } + } + def output = [ + installer: [ + minecraft: minecraftVersion, + forge : forgeVersion, + hash : sha1(project(':arclight-common').file("${project(':arclight-common').buildDir}/arclight_cache/forge-$minecraftVersion-$forgeVersion-installer.jar")) + ], + libraries: artifacts(libs) + ] + installer.text = groovy.json.JsonOutput.toJson(output) + } + dependsOn(project(':arclight-common').tasks.downloadInstaller) } -remapSpigotJar { - includes.add('net/minecraft/block/ChestBlock$DoubleInventory') - includes.add('net/minecraft/tileentity/LecternTileEntity$LecternInventory') -} - -mixin { - add sourceSets.main, 'mixins.arclight.impl.forge.refmap.json' -} +project.sourceSets.main.output.dir file("${project.buildDir}/arclight_installer"), builtBy: tasks.generateInstallerInfo compileJava { sourceCompatibility = targetCompatibility = JavaVersion.VERSION_16 @@ -176,10 +187,6 @@ compileApplaunchJava { sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_7 } -compileModuleJava { - sourceCompatibility = targetCompatibility = JavaVersion.VERSION_16 -} - task srgJar(type: Jar) { from(tasks.jar.outputs.files.collect { it.isDirectory() ? it : zipTree(it) }) { include 'io/izzel/**' @@ -202,7 +209,7 @@ task spigotJar(type: Jar) { } archiveClassifier.set('spigot') } - +/* task sourceJar(type: Jar) { from(sourceSets.main.allSource) for (def s in [':i18n-config', ':arclight-common', ':forge-installer']) { @@ -211,7 +218,7 @@ task sourceJar(type: Jar) { } } classifier = 'sources' -} +}*/ publishing { repositories { @@ -228,7 +235,7 @@ publishing { mavenJava(MavenPublication) { artifact srgJar artifact spigotJar - artifact sourceJar + //artifact sourceJar } } } diff --git a/arclight-forge/src/applaunch/java/io/izzel/arclight/server/Launcher.java b/arclight-forge/src/applaunch/java/io/izzel/arclight/server/Launcher.java index cd0fb233..e7f8d190 100644 --- a/arclight-forge/src/applaunch/java/io/izzel/arclight/server/Launcher.java +++ b/arclight-forge/src/applaunch/java/io/izzel/arclight/server/Launcher.java @@ -1,5 +1,7 @@ package io.izzel.arclight.server; +import io.izzel.arclight.boot.Main_Forge; + public class Launcher { private static final int MIN_CLASS_VERSION = 60; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/ArclightMain.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/ArclightBootstrap.java similarity index 57% rename from arclight-common/src/main/java/io/izzel/arclight/common/ArclightMain.java rename to arclight-forge/src/main/java/io/izzel/arclight/boot/ArclightBootstrap.java index fe5ca574..785d55be 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/ArclightMain.java +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/ArclightBootstrap.java @@ -1,36 +1,42 @@ -package io.izzel.arclight.common; +package io.izzel.arclight.boot; import com.google.common.collect.ImmutableMap; import com.google.gson.internal.bind.TypeAdapters; import com.google.gson.reflect.TypeToken; +import io.izzel.arclight.api.ArclightVersion; import io.izzel.arclight.api.EnumHelper; import io.izzel.arclight.api.Unsafe; -import io.izzel.arclight.common.mod.util.log.ArclightI18nLogger; -import io.izzel.arclight.common.mod.util.log.ArclightLazyLogManager; -import io.izzel.arclight.common.util.EnumTypeFactory; import io.izzel.arclight.i18n.ArclightConfig; import io.izzel.arclight.i18n.ArclightLocale; +import org.apache.logging.log4j.LogManager; +import java.io.File; import java.io.InputStream; import java.lang.reflect.Field; import java.net.URI; import java.nio.file.FileSystem; import java.nio.file.FileSystems; import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ServiceLoader; +import java.util.function.Consumer; import java.util.jar.Attributes; import java.util.jar.Manifest; +import java.util.stream.Collectors; -public abstract class ArclightMain { +public class ArclightBootstrap implements Consumer { private static final int MIN_DEPRECATED_VERSION = 60; private static final int MIN_DEPRECATED_JAVA_VERSION = 16; - public void run(String[] args) throws Throwable { - System.setProperty("java.util.logging.manager", ArclightLazyLogManager.class.getCanonicalName()); - System.setProperty("log4j.jul.LoggerAdapter", "io.izzel.arclight.common.mod.util.log.ArclightLoggerAdapter"); + @Override + @SuppressWarnings("unchecked") + public void accept(String[] args) { + System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager"); + System.setProperty("log4j.jul.LoggerAdapter", "io.izzel.arclight.boot.log.ArclightLoggerAdapter"); System.setProperty("log4j.configurationFile", "arclight-log4j2.xml"); ArclightLocale.info("i18n.using-language", ArclightConfig.spec().getLocale().getCurrent(), ArclightConfig.spec().getLocale().getFallback()); - this.afterSetup(); try { int javaVersion = (int) Float.parseFloat(System.getProperty("java.class.version")); if (javaVersion < MIN_DEPRECATED_VERSION) { @@ -44,9 +50,11 @@ public abstract class ArclightMain { return; } try { - printLogo(); + this.setupMod(); this.dirtyHacks(); - this.beforeStart(); + ServiceLoader.load(getClass().getModule().getLayer(), Consumer.class).stream() + .filter(it -> !it.type().getName().contains("Arclight")) + .findFirst().orElseThrow().get().accept(args); } catch (Exception e) { e.printStackTrace(); System.err.println("Fail to launch Arclight."); @@ -54,28 +62,39 @@ public abstract class ArclightMain { } private void dirtyHacks() throws Exception { - TypeAdapters.ENUM_FACTORY.create(null, TypeToken.get(ArclightMain.class)); + TypeAdapters.ENUM_FACTORY.create(null, TypeToken.get(Object.class)); Field field = TypeAdapters.class.getDeclaredField("ENUM_FACTORY"); Object base = Unsafe.staticFieldBase(field); long offset = Unsafe.staticFieldOffset(field); Unsafe.putObjectVolatile(base, offset, new EnumTypeFactory()); } - private void printLogo() throws Exception { - URI uri = getClass().getProtectionDomain().getCodeSource().getLocation().toURI(); + private void setupMod() throws Exception { + ArclightVersion.setVersion(ArclightVersion.v1_17_R1); + URI uri = new File(System.getProperty("arclight.selfPath")).toURI(); FileSystem fs = FileSystems.newFileSystem(URI.create("jar:" + uri), ImmutableMap.of("create", "true")); try (InputStream stream = Files.newInputStream(fs.getPath("/META-INF/MANIFEST.MF"))) { Manifest manifest = new Manifest(stream); Attributes attributes = manifest.getMainAttributes(); String version = attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION); + extract(fs.getPath("/common.jar"), version); String buildTime = attributes.getValue("Implementation-Timestamp"); - ArclightI18nLogger.getLogger("Arclight").info("logo", version, buildTime); + LogManager.getLogger("Arclight").info(ArclightLocale.getInstance().get("logo"), version, buildTime); } } - protected void afterSetup() throws Throwable { - } - - protected void beforeStart() throws Throwable { + private void extract(Path path, String version) throws Exception { + System.setProperty("arclight.version", version); + var dir = Paths.get(".arclight", "mod_file"); + if (!Files.exists(dir)) { + Files.createDirectories(dir); + } + var mod = dir.resolve(version + ".jar"); + if (!Files.exists(mod) || Boolean.getBoolean("arclight.alwaysExtract")) { + for (Path old : Files.list(dir).collect(Collectors.toList())) { + Files.delete(old); + } + Files.copy(path, mod); + } } } diff --git a/arclight-forge/src/module/java/io/izzel/arclight/boot/ArclightLocator_Forge.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/ArclightLocator_Forge.java similarity index 83% rename from arclight-forge/src/module/java/io/izzel/arclight/boot/ArclightLocator_Forge.java rename to arclight-forge/src/main/java/io/izzel/arclight/boot/ArclightLocator_Forge.java index 9ee83317..561db6e5 100644 --- a/arclight-forge/src/module/java/io/izzel/arclight/boot/ArclightLocator_Forge.java +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/ArclightLocator_Forge.java @@ -6,12 +6,12 @@ import cpw.mods.jarhandling.impl.SimpleJarMetadata; import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModLocator; -import java.io.File; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.List; import java.util.Map; import java.util.Set; @@ -63,23 +63,20 @@ public class ArclightLocator_Forge implements IModLocator { var cl = forName("net.minecraftforge.fml.loading.moddiscovery.ModFile"); var lookup = MethodHandles.lookup(); var handle = lookup.findStatic(cl, "newFMLInstance", MethodType.methodType(cl, IModLocator.class, SecureJar.class)); - var path = new File(System.getProperty("arclight.selfPath")).toPath(); - return (IModFile) handle.invoke(this, SecureJar.from(this::excludePackages, path)); + var version = System.getProperty("arclight.version"); + var path = Paths.get(".arclight", "mod_file", version + ".jar"); + return (IModFile) handle.invoke(this, SecureJar.from(it -> excludePackages(it, version), path)); } catch (Throwable e) { throw new RuntimeException(e); } } private static final Set EXCLUDES = Set.of( - "com.google", - "io.izzel.arclight.boot", - "javax", - "org.slf4j", - "org.apache.logging.slf4j" + "net.minecraft.world.level.block" ); - private JarMetadata excludePackages(SecureJar secureJar) { + private JarMetadata excludePackages(SecureJar secureJar, String version) { secureJar.getPackages().removeIf(it -> EXCLUDES.stream().anyMatch(it::startsWith)); - return new SimpleJarMetadata("arclight", null, secureJar.getPackages(), List.of()); + return new SimpleJarMetadata("arclight", version.substring(version.indexOf('-')+1), secureJar.getPackages(), List.of()); } } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/util/EnumTypeFactory.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/EnumTypeFactory.java similarity index 96% rename from arclight-common/src/main/java/io/izzel/arclight/common/util/EnumTypeFactory.java rename to arclight-forge/src/main/java/io/izzel/arclight/boot/EnumTypeFactory.java index 2f8e114c..a3c98ba0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/util/EnumTypeFactory.java +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/EnumTypeFactory.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.util; +package io.izzel.arclight.boot; import com.google.gson.Gson; import com.google.gson.TypeAdapter; @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.Map; // code from gson, Apache license -// mute the assetiong error throwing because we dynamically add elements to enums +// mute the assertion error throwing because we dynamically add elements to enums public class EnumTypeFactory implements TypeAdapterFactory { @Override diff --git a/arclight-forge/src/main/java/io/izzel/arclight/boot/Main_Forge.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/Main_Forge.java new file mode 100644 index 00000000..ff6df54a --- /dev/null +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/Main_Forge.java @@ -0,0 +1,27 @@ +package io.izzel.arclight.boot; + +import io.izzel.arclight.forgeinstaller.ForgeInstaller; + +import java.io.File; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + +public class Main_Forge { + + public static void main(String[] args) throws Throwable { + try { + Map.Entry> install = ForgeInstaller.install(); + var path = new File(Main_Forge.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getCanonicalPath(); + System.setProperty("arclight.selfPath", path); + var cl = Class.forName(install.getKey()); + var method = cl.getMethod("main", String[].class); + var target = Stream.concat(install.getValue().stream(), Arrays.stream(args)).toArray(String[]::new); + method.invoke(null, (Object) target); + } catch (Exception e) { + e.printStackTrace(); + System.err.println("Fail to launch Arclight."); + } + } +} diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/asm/ArclightImplementer.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/ArclightImplementer.java similarity index 88% rename from arclight-common/src/main/java/io/izzel/arclight/common/asm/ArclightImplementer.java rename to arclight-forge/src/main/java/io/izzel/arclight/boot/asm/ArclightImplementer.java index 0e8a480e..46604d8f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/asm/ArclightImplementer.java +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/ArclightImplementer.java @@ -1,9 +1,8 @@ -package io.izzel.arclight.common.asm; +package io.izzel.arclight.boot.asm; import cpw.mods.modlauncher.api.NamedPath; import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; -import io.izzel.arclight.api.ArclightVersion; -import io.izzel.arclight.common.mod.util.log.ArclightI18nLogger; +import io.izzel.arclight.boot.log.ArclightI18nLogger; import org.apache.logging.log4j.Logger; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; @@ -11,7 +10,6 @@ import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.InsnList; import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.VarInsnNode; -import org.spongepowered.asm.launch.MixinLaunchPlugin; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -23,12 +21,6 @@ import java.util.function.Consumer; public class ArclightImplementer implements ILaunchPluginService { - static { - try { - ArclightVersion.setVersion(ArclightVersion.v1_17_R1); - } catch (Throwable ignored) {} - } - static final Logger LOGGER = ArclightI18nLogger.getLogger("Implementer"); private static final EnumSet OH_YES_SIR = EnumSet.of(Phase.AFTER); @@ -54,7 +46,7 @@ public class ArclightImplementer implements ILaunchPluginService { @Override public EnumSet handlesClass(Type classType, boolean isEmpty, String reason) { - if (MixinLaunchPlugin.NAME.equals(reason)) { + if ("mixin".equals(reason)) { return NOT_TODAY; } return isEmpty ? NOT_TODAY : OH_YES_SIR; @@ -72,7 +64,7 @@ public class ArclightImplementer implements ILaunchPluginService { @Override public boolean processClass(Phase phase, ClassNode classNode, Type classType, String reason) { - if (MixinLaunchPlugin.NAME.equals(reason)) { + if ("mixin".equals(reason)) { return false; } List trails = new ArrayList<>(); diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/asm/AsyncCatcher.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/AsyncCatcher.java similarity index 95% rename from arclight-common/src/main/java/io/izzel/arclight/common/asm/AsyncCatcher.java rename to arclight-forge/src/main/java/io/izzel/arclight/boot/asm/AsyncCatcher.java index 937ec8a7..592cda0e 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/asm/AsyncCatcher.java +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/AsyncCatcher.java @@ -1,11 +1,10 @@ -package io.izzel.arclight.common.asm; +package io.izzel.arclight.boot.asm; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; import io.izzel.arclight.api.Unsafe; -import io.izzel.arclight.common.mod.server.ArclightServer; import io.izzel.arclight.i18n.ArclightConfig; import io.izzel.arclight.i18n.conf.AsyncCatcherSpec; import org.apache.logging.log4j.Marker; @@ -37,6 +36,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; @@ -96,7 +96,8 @@ public class AsyncCatcher implements Implementer { instantiateCallback(node, methodNode, insnList); insnList.add(new FieldInsnNode(Opcodes.GETSTATIC, Type.getType(AsyncCatcherSpec.Operation.class).getInternalName(), operation.name(), Type.getType(AsyncCatcherSpec.Operation.class).getDescriptor())); insnList.add(new LdcInsnNode(reason)); - insnList.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Type.getType(AsyncCatcher.class).getInternalName(), "checkOp", "(Ljava/util/function/Supplier;Lio/izzel/arclight/i18n/conf/AsyncCatcherSpec$Operation;Ljava/lang/String;)Lorg/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable;")); + insnList.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "io/izzel/arclight/common/mod/server/ArclightServer", "getMainThreadExecutor", "()Ljava/util/concurrent/Executor;", false)); + insnList.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Type.getType(AsyncCatcher.class).getInternalName(), "checkOp", "(Ljava/util/function/Supplier;Lio/izzel/arclight/i18n/conf/AsyncCatcherSpec$Operation;Ljava/lang/String;Ljava/util/concurrent/Executor;)Lorg/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable;")); Type returnType = Type.getMethodType(methodNode.desc).getReturnType(); boolean hasReturn = !returnType.equals(Type.VOID_TYPE); if (hasReturn) { @@ -227,7 +228,7 @@ public class AsyncCatcher implements Implementer { } @SuppressWarnings("unchecked") - public static CallbackInfoReturnable checkOp(Supplier method, AsyncCatcherSpec.Operation operation, String reason) throws Throwable { + public static CallbackInfoReturnable checkOp(Supplier method, AsyncCatcherSpec.Operation operation, String reason, Executor executor) throws Throwable { if (INSTANCE.warn) { ArclightImplementer.LOGGER.warn(MARKER, "Async " + reason); } @@ -240,12 +241,12 @@ public class AsyncCatcher implements Implementer { case EXCEPTION: throw exception; case BLOCK: { CallbackInfoReturnable cir = new CallbackInfoReturnable<>(reason, true); - CompletableFuture future = CompletableFuture.supplyAsync(method, ArclightServer.getMainThreadExecutor()); + CompletableFuture future = CompletableFuture.supplyAsync(method, executor); cir.setReturnValue(future.get(5, TimeUnit.SECONDS)); return cir; } case DISPATCH: { - ArclightServer.executeOnMainThread(method::get); + executor.execute(method::get); CallbackInfoReturnable cir = new CallbackInfoReturnable<>(reason, true); cir.cancel(); return cir; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/asm/EntityTypePatcher.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/EntityTypePatcher.java similarity index 95% rename from arclight-common/src/main/java/io/izzel/arclight/common/asm/EntityTypePatcher.java rename to arclight-forge/src/main/java/io/izzel/arclight/boot/asm/EntityTypePatcher.java index e0eab4c6..2e77d4d5 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/asm/EntityTypePatcher.java +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/EntityTypePatcher.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.asm; +package io.izzel.arclight.boot.asm; import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; import io.izzel.arclight.api.ArclightVersion; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/asm/Implementer.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/Implementer.java similarity index 86% rename from arclight-common/src/main/java/io/izzel/arclight/common/asm/Implementer.java rename to arclight-forge/src/main/java/io/izzel/arclight/boot/asm/Implementer.java index 4cb91b6e..d52da30f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/asm/Implementer.java +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/Implementer.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.asm; +package io.izzel.arclight.boot.asm; import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; import org.objectweb.asm.tree.ClassNode; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/asm/InventoryImplementer.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/InventoryImplementer.java similarity index 99% rename from arclight-common/src/main/java/io/izzel/arclight/common/asm/InventoryImplementer.java rename to arclight-forge/src/main/java/io/izzel/arclight/boot/asm/InventoryImplementer.java index 4931c7a9..38ac636f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/asm/InventoryImplementer.java +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/InventoryImplementer.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.asm; +package io.izzel.arclight.boot.asm; import com.google.common.io.ByteStreams; import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; @@ -35,7 +35,7 @@ public class InventoryImplementer implements Implementer { private static final Marker MARKER = MarkerManager.getMarker("INVENTORY"); private static final String INV_TYPE = "net/minecraft/world/Container"; - private static final String BRIDGE_TYPE = "io/izzel/arclight/common/bridge/inventory/IInventoryBridge"; + private static final String BRIDGE_TYPE = "io/izzel/arclight/common/bridge/core/inventory/IInventoryBridge"; private final Map map = new ConcurrentHashMap<>(); diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/asm/SwitchTableFixer.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/SwitchTableFixer.java similarity index 98% rename from arclight-common/src/main/java/io/izzel/arclight/common/asm/SwitchTableFixer.java rename to arclight-forge/src/main/java/io/izzel/arclight/boot/asm/SwitchTableFixer.java index 9886f3a5..ba92f86b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/asm/SwitchTableFixer.java +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/asm/SwitchTableFixer.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.asm; +package io.izzel.arclight.boot.asm; import com.google.common.collect.ImmutableSet; import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; @@ -21,8 +21,9 @@ import org.objectweb.asm.tree.TryCatchBlockNode; import java.lang.reflect.Modifier; import java.util.Set; +import java.util.function.Function; -public class SwitchTableFixer implements Implementer { +public class SwitchTableFixer implements Implementer, Function { public static final SwitchTableFixer INSTANCE = new SwitchTableFixer(); private static final Marker MARKER = MarkerManager.getMarker("SWITCH_TABLE"); @@ -34,7 +35,8 @@ public class SwitchTableFixer implements Implementer { .add("org/bukkit/block/Biome") .build(); - public byte[] processClass(byte[] bytes) { + @Override + public byte[] apply(byte[] bytes) { ClassNode node = new ClassNode(); new ClassReader(bytes).accept(node, ClassReader.SKIP_FRAMES); processClass(node, null); diff --git a/arclight-forge/src/main/java/io/izzel/arclight/boot/log/ArclightI18nLogger.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/log/ArclightI18nLogger.java new file mode 100644 index 00000000..82e0d32c --- /dev/null +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/log/ArclightI18nLogger.java @@ -0,0 +1,112 @@ +package io.izzel.arclight.boot.log; + +import io.izzel.arclight.i18n.ArclightLocale; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.Marker; +import org.apache.logging.log4j.spi.ExtendedLogger; +import org.apache.logging.log4j.spi.ExtendedLoggerWrapper; +import org.apache.logging.log4j.util.MessageSupplier; +import org.apache.logging.log4j.util.Supplier; + +public class ArclightI18nLogger extends ExtendedLoggerWrapper { + + public ArclightI18nLogger(ExtendedLogger logger) { + super(logger, logger.getName(), logger.getMessageFactory()); + } + + public static Logger getLogger(String name) { + return new ArclightI18nLogger((ExtendedLogger) LogManager.getLogger(name)); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, CharSequence message, Throwable t) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message.toString()), t); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, Object message, Throwable t) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message.toString()), t); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, MessageSupplier msgSupplier, Throwable t) { + super.logMessage(fqcn, level, marker, msgSupplier, t); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, Supplier msgSupplier, Throwable t) { + super.logMessage(fqcn, level, marker, msgSupplier, t); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Throwable t) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), t); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message)); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Object... params) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), params); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4, p5); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4, p5, p6); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4, p5, p6, p7); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4, p5, p6, p7, p8); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), p0, p1, p2, p3, p4, p5, p6, p7, p8, p9); + } + + @Override + protected void logMessage(String fqcn, Level level, Marker marker, String message, Supplier... paramSuppliers) { + super.logMessage(fqcn, level, marker, ArclightLocale.getInstance().get(message), paramSuppliers); + } +} diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightLoggerAdapter.java b/arclight-forge/src/main/java/io/izzel/arclight/boot/log/ArclightLoggerAdapter.java similarity index 99% rename from arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightLoggerAdapter.java rename to arclight-forge/src/main/java/io/izzel/arclight/boot/log/ArclightLoggerAdapter.java index 36bd4b19..a76a30aa 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightLoggerAdapter.java +++ b/arclight-forge/src/main/java/io/izzel/arclight/boot/log/ArclightLoggerAdapter.java @@ -1,4 +1,4 @@ -package io.izzel.arclight.common.mod.util.log; +package io.izzel.arclight.boot.log; import org.apache.logging.log4j.jul.ApiLogger; import org.apache.logging.log4j.jul.CoreLoggerAdapter; diff --git a/arclight-forge/src/main/java/io/izzel/arclight/impl/ArclightConnector_Forge.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/ArclightConnector_Forge.java deleted file mode 100644 index 5c8ef030..00000000 --- a/arclight-forge/src/main/java/io/izzel/arclight/impl/ArclightConnector_Forge.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.izzel.arclight.impl; - -import cpw.mods.modlauncher.TransformingClassLoader; -import io.izzel.arclight.common.mod.ArclightConnector; -import io.izzel.arclight.i18n.ArclightConfig; -import org.spongepowered.asm.mixin.Mixins; - -@SuppressWarnings("unused") -public class ArclightConnector_Forge extends ArclightConnector { - - @Override - public void connect() { - injectMcl(); - super.connect(); - if (true) return; - Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.json"); - if (ArclightConfig.spec().getOptimization().isRemoveStream()) { - Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.stream.json"); - } - if (ArclightConfig.spec().getOptimization().isDisableDFU()) { - Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.dfu.json"); - } - LOGGER.info("mixin-load.optimization"); - } - - private void injectMcl() { - var loader = (TransformingClassLoader) getClass().getClassLoader(); - - } -} diff --git a/arclight-forge/src/main/java/io/izzel/arclight/server/Main_Forge.java b/arclight-forge/src/main/java/io/izzel/arclight/server/Main_Forge.java deleted file mode 100644 index 06f4216f..00000000 --- a/arclight-forge/src/main/java/io/izzel/arclight/server/Main_Forge.java +++ /dev/null @@ -1,38 +0,0 @@ -package io.izzel.arclight.server; - -import io.izzel.arclight.api.ArclightVersion; -import io.izzel.arclight.api.Unsafe; -import io.izzel.arclight.common.ArclightMain; -import io.izzel.arclight.forgeinstaller.ForgeInstaller; - -import java.io.File; -import java.lang.invoke.MethodType; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - -public class Main_Forge { - - public static void main(String[] args) throws Throwable { - new ArclightMain() { - private Map.Entry> install; - - @Override - protected void afterSetup() throws Throwable { - ArclightVersion.setVersion(ArclightVersion.v1_17_R1); - install = ForgeInstaller.install(); - } - - @Override - protected void beforeStart() throws Throwable { - var path = new File(getClass().getProtectionDomain().getCodeSource().getLocation().toURI()).getCanonicalPath(); - System.setProperty("arclight.selfPath", path); - var cl = Class.forName(install.getKey()); - var handle = Unsafe.lookup().findStatic(cl, "main", MethodType.methodType(void.class, String[].class)); - var target = Stream.concat(install.getValue().stream(), Arrays.stream(args)).toArray(String[]::new); - handle.invoke((Object) target); - } - }.run(args); - } -} diff --git a/arclight-forge/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService b/arclight-forge/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService new file mode 100644 index 00000000..7adee4a3 --- /dev/null +++ b/arclight-forge/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService @@ -0,0 +1 @@ +io.izzel.arclight.boot.asm.ArclightImplementer \ No newline at end of file diff --git a/arclight-forge/src/main/resources/META-INF/services/java.util.function.Consumer b/arclight-forge/src/main/resources/META-INF/services/java.util.function.Consumer new file mode 100644 index 00000000..ba29b782 --- /dev/null +++ b/arclight-forge/src/main/resources/META-INF/services/java.util.function.Consumer @@ -0,0 +1 @@ +io.izzel.arclight.boot.ArclightBootstrap \ No newline at end of file diff --git a/arclight-common/src/main/resources/arclight-log4j2.xml b/arclight-forge/src/main/resources/arclight-log4j2.xml similarity index 100% rename from arclight-common/src/main/resources/arclight-log4j2.xml rename to arclight-forge/src/main/resources/arclight-log4j2.xml diff --git a/arclight-common/src/main/resources/async_catcher.json b/arclight-forge/src/main/resources/async_catcher.json similarity index 100% rename from arclight-common/src/main/resources/async_catcher.json rename to arclight-forge/src/main/resources/async_catcher.json diff --git a/arclight-forge/src/module/java/io/izzel/arclight/boot/ArclightImplementer_Forge.java b/arclight-forge/src/module/java/io/izzel/arclight/boot/ArclightImplementer_Forge.java deleted file mode 100644 index 7154ce56..00000000 --- a/arclight-forge/src/module/java/io/izzel/arclight/boot/ArclightImplementer_Forge.java +++ /dev/null @@ -1,60 +0,0 @@ -package io.izzel.arclight.boot; - -import cpw.mods.modlauncher.api.NamedPath; -import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; -import org.objectweb.asm.Type; -import org.objectweb.asm.tree.ClassNode; - -import java.util.EnumSet; -import java.util.function.Consumer; - -public class ArclightImplementer_Forge implements ILaunchPluginService { - - private final ILaunchPluginService delegate; - - public ArclightImplementer_Forge() { - var module = getClass().getModule(); - for (var m : module.getLayer().modules()) { - module.addReads(m); - } - for (var layer : module.getLayer().parents()) { - layer.modules().forEach(module::addReads); - } - try { - delegate = (ILaunchPluginService) Class.forName("io.izzel.arclight.common.asm.ArclightImplementer") - .getConstructor().newInstance(); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - @Override - public String name() { - return delegate.name(); - } - - @Override - public EnumSet handlesClass(Type classType, boolean isEmpty) { - return delegate.handlesClass(classType, isEmpty); - } - - @Override - public EnumSet handlesClass(Type classType, boolean isEmpty, String reason) { - return delegate.handlesClass(classType, isEmpty, reason); - } - - @Override - public boolean processClass(Phase phase, ClassNode classNode, Type classType, String reason) { - return delegate.processClass(phase, classNode, classType, reason); - } - - @Override - public void initializeLaunch(ITransformerLoader transformerLoader, NamedPath[] specialPaths) { - delegate.initializeLaunch(transformerLoader, specialPaths); - } - - @Override - public void customAuditConsumer(String className, Consumer auditDataAcceptor) { - delegate.customAuditConsumer(className, auditDataAcceptor); - } -} diff --git a/arclight-forge/src/module/java/module-info.java b/arclight-forge/src/module/java/module-info.java deleted file mode 100644 index 8f445ea1..00000000 --- a/arclight-forge/src/module/java/module-info.java +++ /dev/null @@ -1,20 +0,0 @@ -import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; -import io.izzel.arclight.boot.ArclightImplementer_Forge; -import io.izzel.arclight.boot.ArclightLocator_Forge; -import net.minecraftforge.forgespi.locating.IModLocator; - -open module arclight.boot { - requires net.minecraftforge.forgespi; - requires cpw.mods.securejarhandler; - requires cpw.mods.modlauncher; - requires org.objectweb.asm; - requires jdk.unsupported; - requires org.objectweb.asm.tree; - - exports io.izzel.arclight.boot; - - uses IModLocator; - provides IModLocator with ArclightLocator_Forge; - uses ILaunchPluginService; - provides ILaunchPluginService with ArclightImplementer_Forge; -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index dac9b36b..de02d550 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,22 @@ allprojects { group 'io.izzel.arclight' version '1.0.0-SNAPSHOT' + def getGitHash = { -> + def stdout = new ByteArrayOutputStream() + exec { + commandLine 'git', 'rev-parse', '--short', 'HEAD' + standardOutput = stdout + } + return stdout.toString().trim() + } + ext { agpVersion = '1.20' minecraftVersion = '1.17.1' forgeVersion = '37.0.1' apiVersion = '1.0.+' toolsVersion = '1.3.+' + gitHash = getGitHash() } task cleanBuild { diff --git a/forge-installer/build.gradle b/forge-installer/build.gradle index c1214ccc..dbef38ca 100644 --- a/forge-installer/build.gradle +++ b/forge-installer/build.gradle @@ -13,7 +13,5 @@ repositories { dependencies { implementation 'com.google.code.gson:gson:2.8.0' - implementation 'com.google.guava:guava:30.1.1-jre' implementation "io.izzel.arclight:arclight-api:$apiVersion" - implementation project(':i18n-config') } diff --git a/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/FileDownloader.java b/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/FileDownloader.java index a83c390b..b627c03a 100644 --- a/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/FileDownloader.java +++ b/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/FileDownloader.java @@ -1,7 +1,6 @@ package io.izzel.arclight.forgeinstaller; import io.izzel.arclight.api.Unsafe; -import io.izzel.arclight.i18n.LocalizedException; import javax.net.ssl.SSLException; import java.io.File; @@ -11,26 +10,19 @@ import java.net.HttpURLConnection; import java.net.SocketTimeoutException; import java.net.URL; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.nio.file.AccessDeniedException; +import java.nio.file.FileAlreadyExistsException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; +import java.rmi.RemoteException; import java.util.HashSet; import java.util.Set; import java.util.StringJoiner; import java.util.function.Supplier; -public class FileDownloader implements Supplier { - - private final String url; - private final String target; - private final String hash; - - public FileDownloader(String url, String target, String hash) { - this.url = url; - this.target = target; - this.hash = hash; - } +public record FileDownloader(String url, String target, String hash) implements Supplier { @Override public Path get() { @@ -41,7 +33,7 @@ public class FileDownloader implements Supplier { } if (Files.exists(path)) { if (Files.isDirectory(path)) { - throw LocalizedException.checked("downloader.dir", target); + throw new FileAlreadyExistsException(target); } else { if (Util.hash(path).equals(hash)) return path; else Files.delete(path); @@ -54,20 +46,20 @@ public class FileDownloader implements Supplier { try (InputStream stream = redirect(url)) { Files.copy(stream, path, StandardCopyOption.REPLACE_EXISTING); } catch (SocketTimeoutException | SSLException e) { - throw LocalizedException.checked("downloader.timeout", e, url); + throw new RuntimeException("Timeout " + url); } if (Files.exists(path)) { String hash = Util.hash(path); if (hash.equalsIgnoreCase(this.hash)) return path; else { Files.delete(path); - throw LocalizedException.checked("downloader.hash-not-match", this.hash, hash, url); + throw new RuntimeException("Hash not match, expect %s found %s in %s".formatted(this.hash, hash, url)); } } else { - throw LocalizedException.checked("downloader.not-found", url); + throw new RuntimeException("Not found " + url); } } catch (AccessDeniedException e) { - throw LocalizedException.unchecked("downloader.access-denied", e.getFile(), e); + throw new RuntimeException("Access denied for file " + e.getFile(), e); } catch (Exception e) { Unsafe.throwException(e); return null; @@ -83,7 +75,7 @@ public class FileDownloader implements Supplier { StringJoiner joiner = new StringJoiner("\n "); joiner.add(""); history.forEach(joiner::add); - throw LocalizedException.unchecked("downloader.redirect-error", joiner.toString()); + throw new RuntimeException("Redirect error " + joiner); } else { history.add(url.toString()); } @@ -95,12 +87,12 @@ public class FileDownloader implements Supplier { if (responseCode == HttpURLConnection.HTTP_OK) { return connection.getInputStream(); } else if (responseCode == HttpURLConnection.HTTP_MOVED_PERM || responseCode == HttpURLConnection.HTTP_MOVED_TEMP) { - String location = URLDecoder.decode(connection.getHeaderField("Location"), "UTF-8"); + String location = URLDecoder.decode(connection.getHeaderField("Location"), StandardCharsets.UTF_8); return redirect(new URL(url, location)); } else if (responseCode == HttpURLConnection.HTTP_NOT_FOUND || responseCode == HttpURLConnection.HTTP_FORBIDDEN) { - throw LocalizedException.unchecked("downloader.not-found", url); + throw new RuntimeException("Not found " + url); } else { - throw LocalizedException.unchecked("downloader.http-error", responseCode, url); + throw new RemoteException("Http " + responseCode + " " + url); } } } diff --git a/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java b/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java index 140ea7e3..8e654058 100644 --- a/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java +++ b/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java @@ -1,14 +1,11 @@ package io.izzel.arclight.forgeinstaller; -import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import io.izzel.arclight.api.Unsafe; -import io.izzel.arclight.i18n.ArclightLocale; -import io.izzel.arclight.i18n.LocalizedException; import java.io.File; import java.io.IOException; @@ -59,7 +56,7 @@ public class ForgeInstaller { }; private static final String INSTALLER_URL = "https://arclight.mcxk.net/net/minecraftforge/forge/%s-%s/forge-%s-%s-installer.jar"; private static final String SERVER_URL = "https://arclight.mcxk.net/net/minecraft/server/minecraft_server.%s.jar"; - private static final Map VERSION_HASH = ImmutableMap.of( + private static final Map VERSION_HASH = Map.of( "1.17.1", "A16D67E5807F57FC4E550299CF20226194497DC2" ); @@ -69,13 +66,13 @@ public class ForgeInstaller { List> suppliers = checkMavenNoSource(installInfo.libraries); Path path = Paths.get("libraries", "net", "minecraftforge", "forge", installInfo.installer.minecraft + "-" + installInfo.installer.forge, "win_args.txt"); if (!suppliers.isEmpty() || !Files.exists(path)) { - ArclightLocale.info("downloader.info2"); + System.out.println("Downloading missing libraries ..."); ExecutorService pool = Executors.newFixedThreadPool(8); CompletableFuture[] array = suppliers.stream().map(reportSupply(pool)).toArray(CompletableFuture[]::new); if (!Files.exists(path)) { CompletableFuture[] futures = installForge(installInfo, pool); handleFutures(futures); - ArclightLocale.info("downloader.forge-install"); + System.out.println("Forge installation is starting, please wait... "); try { ProcessBuilder builder = new ProcessBuilder(); File file = new File(System.getProperty("java.home"), "bin/java"); @@ -99,7 +96,7 @@ public class ForgeInstaller { private static Function, CompletableFuture> reportSupply(ExecutorService service) { return it -> CompletableFuture.supplyAsync(it, service).thenApply(path -> { - ArclightLocale.info("downloader.complete", path); + System.out.println("Downloaded " + path); return path; }); } @@ -135,10 +132,7 @@ public class ForgeInstaller { try { future.join(); } catch (CompletionException e) { - Throwable cause = e.getCause(); - if (cause instanceof LocalizedException local) { - ArclightLocale.error(local.node(), local.args()); - } else throw e; + System.err.println(e.getCause().toString()); } catch (Exception e) { e.printStackTrace(); } @@ -196,6 +190,7 @@ public class ForgeInstaller { List userArgs = new ArrayList<>(); List opens = new ArrayList<>(); List exports = new ArrayList<>(); + exports.add("cpw.mods.bootstraplauncher/cpw.mods.bootstraplauncher=ALL-UNNAMED"); List ignores = new ArrayList<>(); List merges = new ArrayList<>(); var self = new File(ForgeInstaller.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getCanonicalPath(); @@ -210,12 +205,9 @@ public class ForgeInstaller { } else if (arg.startsWith("-D")) { var split = arg.substring(2).split("=", 2); if (split[0].equals("legacyClassPath")) { - for (String lib : split[1].split(File.pathSeparator)) { - addToPath(Paths.get(lib), ignores.stream().anyMatch(lib::contains)); - } split[1] = Stream.concat( - Stream.concat(Stream.of(split[1]), installInfo.libraries.keySet().stream() + Stream.concat(Stream.of(self, split[1]), installInfo.libraries.keySet().stream() .map(it -> Paths.get("libraries", Util.mavenToPath(it))) .peek(it -> { var name = it.getFileName().toString(); @@ -224,7 +216,8 @@ public class ForgeInstaller { } }) .map(Path::toString)), - Stream.of(self) + Stream.empty() + //Stream.of(self) ).collect(Collectors.joining(File.pathSeparator)); } else if (split[0].equals("ignoreList")) { ignores.addAll(Arrays.asList(split[1].split(","))); @@ -259,31 +252,35 @@ public class ForgeInstaller { for (String library : installInfo.libraries.keySet()) { addToPath(Paths.get("libraries", Util.mavenToPath(library))); } - addToPath(path);*/ + addToPath(path); for (String library : installInfo.libraries.keySet()) { addToPath(Paths.get("libraries", Util.mavenToPath(library)), false); - } + }*/ return Map.entry(Objects.requireNonNull(mainClass, "No main class found"), userArgs); } - private static void addToPath(Path path, boolean boot) throws Throwable { - ClassLoader loader = boot ? ClassLoader.getPlatformClassLoader() : ForgeInstaller.class.getClassLoader(); - Field ucpField; + private static void addToPath(Path path) { try { - ucpField = loader.getClass().getDeclaredField("ucp"); - } catch (NoSuchFieldException e) { - ucpField = loader.getClass().getSuperclass().getDeclaredField("ucp"); + ClassLoader loader = ClassLoader.getPlatformClassLoader(); + Field ucpField; + try { + ucpField = loader.getClass().getDeclaredField("ucp"); + } catch (NoSuchFieldException e) { + ucpField = loader.getClass().getSuperclass().getDeclaredField("ucp"); + } + long offset = Unsafe.objectFieldOffset(ucpField); + Object ucp = Unsafe.getObject(loader, offset); + if (ucp == null) { + var cl = Class.forName("jdk.internal.loader.URLClassPath"); + var handle = Unsafe.lookup().findConstructor(cl, MethodType.methodType(void.class, URL[].class, AccessControlContext.class)); + ucp = handle.invoke(new URL[]{}, (AccessControlContext) null); + Unsafe.putObjectVolatile(loader, offset, ucp); + } + Method method = ucp.getClass().getDeclaredMethod("addURL", URL.class); + Unsafe.lookup().unreflect(method).invoke(ucp, path.toUri().toURL()); + } catch (Throwable t) { + t.printStackTrace(); } - long offset = Unsafe.objectFieldOffset(ucpField); - Object ucp = Unsafe.getObject(loader, offset); - if (ucp == null) { - var cl = Class.forName("jdk.internal.loader.URLClassPath"); - var handle = Unsafe.lookup().findConstructor(cl, MethodType.methodType(void.class, URL[].class, AccessControlContext.class)); - ucp = handle.invoke(new URL[]{}, (AccessControlContext) null); - Unsafe.putObjectVolatile(loader, offset, ucp); - } - Method method = ucp.getClass().getDeclaredMethod("addURL", URL.class); - Unsafe.lookup().unreflect(method).invoke(ucp, path.toUri().toURL()); } public static void addExports(List exports) throws Throwable { @@ -355,7 +352,7 @@ public class ForgeInstaller { private static void addModules(String modulePath) throws Throwable { // Find all extra modules - ModuleFinder finder = ModuleFinder.of(Arrays.stream(modulePath.split(File.pathSeparator)).map(Paths::get).toArray(Path[]::new)); + ModuleFinder finder = ModuleFinder.of(Arrays.stream(modulePath.split(File.pathSeparator)).map(Paths::get).peek(ForgeInstaller::addToPath).toArray(Path[]::new)); MethodHandle loadModuleMH = IMPL_LOOKUP.findVirtual(Class.forName("jdk.internal.loader.BuiltinClassLoader"), "loadModule", MethodType.methodType(void.class, ModuleReference.class)); // Resolve modules to a new config diff --git a/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/MavenDownloader.java b/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/MavenDownloader.java index 8c8b95f9..136c5e9a 100644 --- a/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/MavenDownloader.java +++ b/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/MavenDownloader.java @@ -1,8 +1,5 @@ package io.izzel.arclight.forgeinstaller; -import io.izzel.arclight.i18n.ArclightLocale; -import io.izzel.arclight.i18n.LocalizedException; - import java.nio.file.Path; import java.util.ArrayList; import java.util.LinkedList; @@ -54,13 +51,8 @@ public class MavenDownloader implements Supplier { joiner.add(""); for (int i = 0; i < exceptions.size(); i++) { Exception exception = exceptions.get(i); - if (exception instanceof LocalizedException local) { - String format = ArclightLocale.getInstance().format(local.node(), local.args()); - joiner.add("(" + (i + 1) + ") " + format); - } else { - joiner.add("(" + (i + 1) + ") " + exception); - } + joiner.add("(" + (i + 1) + ") " + exception); } - throw LocalizedException.unchecked("downloader.maven-fail", coord, joiner.toString()); + throw new RuntimeException("Failed %s %s".formatted(coord, joiner.toString())); } } diff --git a/i18n-config/src/main/resources/META-INF/i18n/en_us.conf b/i18n-config/src/main/resources/META-INF/i18n/en_us.conf index 7f746f2e..fa36a6b3 100644 --- a/i18n-config/src/main/resources/META-INF/i18n/en_us.conf +++ b/i18n-config/src/main/resources/META-INF/i18n/en_us.conf @@ -12,22 +12,6 @@ logo = [ " §aBuild Date {}" "" ] -downloader { - info2 = [ - "Libraries are missing, downloading!" - "Support MinecraftForge project https://www.patreon.com/LexManos/" - ] - http-error = "HTTP Error {0} {1}" - not-found = "Not found in {0}" - redirect-error = "Redirect error {0}" - dir = "Existing folder in destination {0}" - timeout = "Timeout {0} {1}" - hash-not-match = "File sha1 mismatch, expect {0} found {1}: {2}" - maven-fail = "{0} failed to download: {1}" - complete = "{0} complete" - forge-install = "Forge installation is starting, please wait... " - access-denied = "Access denied for file {0}: {1}" -} java { deprecated = [ "You are running an outdated Java version" diff --git a/i18n-config/src/main/resources/META-INF/i18n/fr_fr.conf b/i18n-config/src/main/resources/META-INF/i18n/fr_fr.conf index ee3bd0db..4917ba7e 100644 --- a/i18n-config/src/main/resources/META-INF/i18n/fr_fr.conf +++ b/i18n-config/src/main/resources/META-INF/i18n/fr_fr.conf @@ -12,22 +12,6 @@ logo = [ " §aDate du Build {}" "" ] -downloader { - info2 = [ - "Librairies manquantes, téléchargement en cours !" - "Soutenir le projet MinecraftForge https://www.patreon.com/LexManos/" - ] - http-error = "Erreur HTTP {0} {1}" - not-found = "Non trouvé dans {0}" - redirect-error = "Erreur de redirection {0}" - dir = "Dossier existant dans la destination {0}" - timeout = "Timeout {0} {1}" - hash-not-match = "SHA1 du fichier non-correspondant, SHA1 attendu -> {0} SHA1 trouvé -> {1}: {2}" - maven-fail = "{0} échec du téléchargement: {1}" - complete = "{0} téléchargement terminé" - forge-install = "L''installation de Forge démarre, veuillez patienter... " - access-denied = "Accès d'écriture du fichier refusé {0}: {1}" -} implementer { not-found = "Class non trouvée {}" diff --git a/i18n-config/src/main/resources/META-INF/i18n/ru_ru.conf b/i18n-config/src/main/resources/META-INF/i18n/ru_ru.conf index 0d14517f..b835e0c2 100644 --- a/i18n-config/src/main/resources/META-INF/i18n/ru_ru.conf +++ b/i18n-config/src/main/resources/META-INF/i18n/ru_ru.conf @@ -12,22 +12,6 @@ logo = [ " §aДата сборки {}" "" ] -downloader { - info2 = [ - "Библиотеки отсутствуют, загружаем!" - "Поддержите проект MinecraftForge https://www.patreon.com/LexManos/" - ] - http-error = "Ошибка HTTP {0} {1}" - not-found = "Не найден в {0}" - redirect-error = "Ошибка перенаправления {0}" - dir = "Директория загрузки уже существует {0}" - timeout = "Превышено ожидание {0} {1}" - hash-not-match = "Несовпадение суммы sha1, ожидалось {0} вычислено {1}: {2}" - maven-fail = "Не удалось загрузить {0}: {1}" - complete = "{0} завершено" - forge-install = "Запускается установка Forge, пожалуйста подождите... " - access-denied = "Отсутствует доступ к файлу {0}: {1}" -} java { deprecated = [ "Вы используете устаревшую версию Java" diff --git a/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf b/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf index 58031510..180fcbda 100644 --- a/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf +++ b/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf @@ -12,22 +12,6 @@ logo = [ " §a构建日期 {}" "" ] -downloader { - info2 = [ - "文件不完整，正在自动下载" - "支持 MinecraftForge 项目 https://www.patreon.com/LexManos/" - ] - http-error = "HTTP 错误 {0} {1}" - not-found = "文件不存在 {0}" - redirect-error = "重定向错误 {0}" - dir = "下载地址已经有存在的文件夹 {0}" - timeout = "下载超时 {0} {1}" - hash-not-match = "文件 sha1 不符，期望 {0} 实际 {1}: {2}" - maven-fail = "{0} 下载失败 {1}" - complete = "{0} 下载完成" - forge-install = "即将开始 Forge 安装，请等待一段时间" - access-denied = "没有对 {0} 操作的权限: {1}" -} java { deprecated = [ "您正在使用过时的 Java 版本"