From 94315bcf3026ba2c1da55e2a3c6fede5bf1c2a2d Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Fri, 29 May 2020 19:57:19 +0800 Subject: [PATCH] Remove all cb package version. --- arclight-coremod/build.gradle | 4 +++- .../arclight/bridge/entity/EntityBridge.java | 2 +- .../bridge/entity/InternalEntityBridge.java | 2 +- .../bridge/entity/LivingEntityBridge.java | 2 +- .../entity/merchant/IMerchantBridge.java | 2 +- .../entity/player/PlayerEntityBridge.java | 2 +- .../player/ServerPlayerEntityBridge.java | 2 +- .../bridge/inventory/IInventoryBridge.java | 2 +- .../inventory/container/ContainerBridge.java | 2 +- .../bridge/item/MerchantOfferBridge.java | 2 +- .../bridge/server/MinecraftServerBridge.java | 2 +- .../server/management/PlayerListBridge.java | 2 +- .../arclight/bridge/world/WorldBridge.java | 4 ++-- .../bridge/world/storage/MapDataBridge.java | 2 +- .../bukkit/BukkitCommandWrapperMixin.java | 2 +- .../bukkit/ColouredConsoleSenderMixin.java | 2 +- .../mixin/bukkit/CraftBlockStateMixin.java | 2 +- .../mixin/bukkit/CraftChunkMixin.java | 2 +- .../CraftConsoleCommandSenderMixin.java | 4 ++-- .../mixin/bukkit/CraftEventFactoryMixin.java | 4 ++-- .../mixin/bukkit/CraftMagicNumbersMixin.java | 2 +- .../mixin/bukkit/CraftServerMixin.java | 10 +++++----- .../core/advancements/AdvancementMixin.java | 2 +- .../core/block/AbstractButtonBlockMixin.java | 2 +- .../AbstractPressurePlateBlockMixin.java | 2 +- .../mixin/core/block/BambooBlockMixin.java | 2 +- .../core/block/BambooSaplingBlockMixin.java | 2 +- .../mixin/core/block/BushBlockMixin.java | 2 +- .../mixin/core/block/CactusBlockMixin.java | 4 ++-- .../mixin/core/block/CakeBlockMixin.java | 2 +- .../mixin/core/block/CampfireBlockMixin.java | 2 +- .../core/block/CarvedPumpkinBlockMixin.java | 2 +- .../mixin/core/block/CauldronBlockMixin.java | 2 +- .../core/block/ChorusFlowerBlockMixin.java | 2 +- .../mixin/core/block/CocoaBlockMixin.java | 2 +- .../core/block/CommandBlockBlockMixin.java | 2 +- .../core/block/ComparatorBlockMixin.java | 2 +- .../mixin/core/block/ComposterBlockMixin.java | 2 +- .../ComposterBlock_EmptyInventoryMixin.java | 2 +- .../ComposterBlock_FullInventoryMixin.java | 2 +- .../ComposterBlock_PartialInventoryMixin.java | 2 +- .../core/block/ConcretePowderBlockMixin.java | 4 ++-- .../mixin/core/block/CoralBlockMixin.java | 2 +- .../mixin/core/block/CoralFinBlockMixin.java | 2 +- .../core/block/CoralPlantBlockMixin.java | 2 +- .../core/block/CoralWallFanBlockMixin.java | 2 +- .../mixin/core/block/CropsBlockMixin.java | 2 +- .../block/DaylightDetectorBlockMixin.java | 2 +- .../core/block/DetectorRailBlockMixin.java | 2 +- .../mixin/core/block/DoorBlockMixin.java | 2 +- .../core/block/DoublePlantBlockMixin.java | 2 +- .../mixin/core/block/DragonEggBlockMixin.java | 2 +- .../mixin/core/block/DropperBlockMixin.java | 4 ++-- .../mixin/core/block/FarmlandBlockMixin.java | 2 +- .../mixin/core/block/FireBlockMixin.java | 6 +++--- .../core/block/FlowingFluidBlockMixin.java | 2 +- .../mixin/core/block/GrassBlockMixin.java | 2 +- .../mixin/core/block/IceBlockMixin.java | 2 +- .../mixin/core/block/KelpTopBlockMixin.java | 2 +- .../mixin/core/block/LeavesBlockMixin.java | 2 +- .../mixin/core/block/LeverBlockMixin.java | 2 +- .../mixin/core/block/LilyPadBlockMixin.java | 2 +- .../mixin/core/block/MagmaBlockMixin.java | 4 ++-- .../mixin/core/block/MushroomBlockMixin.java | 2 +- .../block/NetherPortalBlock_SizeMixin.java | 6 +++--- .../core/block/NetherWartBlockMixin.java | 2 +- .../mixin/core/block/NoteBlockMixin.java | 2 +- .../mixin/core/block/ObserverBlockMixin.java | 2 +- .../mixin/core/block/PistonBlockMixin.java | 2 +- .../core/block/PoweredRailBlockMixin.java | 2 +- .../core/block/PressurePlateBlockMixin.java | 4 ++-- .../core/block/RedstoneDiodeBlockMixin.java | 2 +- .../core/block/RedstoneLampBlockMixin.java | 2 +- .../core/block/RedstoneOreBlockMixin.java | 4 ++-- .../core/block/RedstoneTorchBlockMixin.java | 2 +- .../core/block/RedstoneWireBlockMixin.java | 2 +- .../mixin/core/block/SaplingBlockMixin.java | 4 ++-- .../core/block/ScaffoldingBlockMixin.java | 2 +- .../mixin/core/block/SnowBlockMixin.java | 2 +- .../mixin/core/block/SpongeBlockMixin.java | 6 +++--- .../block/SpreadableSnowyDirtBlockMixin.java | 2 +- .../mixin/core/block/StemBlockMixin.java | 2 +- .../mixin/core/block/SugarCaneBlockMixin.java | 2 +- .../core/block/SweetBerryBushBlockMixin.java | 4 ++-- .../mixin/core/block/TNTBlockMixin.java | 2 +- .../mixin/core/block/TrapDoorBlockMixin.java | 2 +- .../mixin/core/block/TripWireBlockMixin.java | 4 ++-- .../core/block/TripWireHookBlockMixin.java | 2 +- .../mixin/core/block/TurtleEggBlockMixin.java | 4 ++-- .../mixin/core/block/VineBlockMixin.java | 2 +- .../WeightedPressurePlateBlockMixin.java | 4 ++-- .../block/WitherSkeletonSkullBlockMixin.java | 2 +- .../core/command/CommandSourceMixin.java | 4 ++-- .../command/impl/TeleportCommandMixin.java | 2 +- .../FrostWalkerEnchantmentMixin.java | 2 +- .../entity/AreaEffectCloudEntityMixin.java | 4 ++-- .../mixin/core/entity/EntityMixin.java | 10 +++++----- .../mixin/core/entity/LivingEntityMixin.java | 10 +++++----- .../mixin/core/entity/MobEntityMixin.java | 4 ++-- .../brain/task/AssignProfessionTaskMixin.java | 4 ++-- .../ai/brain/task/ChangeJobTaskMixin.java | 4 ++-- .../task/CreateBabyVillagerTaskMixin.java | 2 +- .../brain/task/InteractWithDoorTaskMixin.java | 2 +- .../entity/ai/goal/BreakBlockGoalMixin.java | 2 +- .../entity/ai/goal/BreakDoorGoalMixin.java | 2 +- .../core/entity/ai/goal/BreedGoalMixin.java | 2 +- .../entity/ai/goal/EatGrassGoalMixin.java | 2 +- .../entity/ai/goal/FollowOwnerGoalMixin.java | 2 +- .../core/entity/ai/goal/TemptGoalMixin.java | 4 ++-- .../core/entity/boss/WitherEntityMixin.java | 2 +- .../boss/dragon/EnderDragonEntityMixin.java | 2 +- .../boss/dragon/phase/PhaseManagerMixin.java | 2 +- .../effect/LightningBoltEntityMixin.java | 2 +- .../entity/item/ArmorStandEntityMixin.java | 6 +++--- .../entity/item/EnderCrystalEntityMixin.java | 2 +- .../entity/item/EnderPearlEntityMixin.java | 2 +- .../item/ExperienceBottleEntityMixin.java | 2 +- .../entity/item/ExperienceOrbEntityMixin.java | 4 ++-- .../entity/item/FallingBlockEntityMixin.java | 2 +- .../item/FireworkRocketEntityMixin.java | 2 +- .../core/entity/item/ItemEntityMixin.java | 2 +- .../entity/item/ItemFrameEntityMixin.java | 2 +- .../entity/item/LeashKnotEntityMixin.java | 2 +- .../ContainerMinecartEntityMixin.java | 2 +- .../core/entity/merchant/IMerchantMixin.java | 2 +- .../villager/AbstractVillagerEntityMixin.java | 4 ++-- .../villager/VillagerEntityMixin.java | 2 +- .../villager/WanderingTraderEntityMixin.java | 2 +- .../monster/AbstractSkeletonEntityMixin.java | 2 +- .../entity/monster/CreeperEntityMixin.java | 2 +- .../EndermanEntity_PlaceBlockGoalMixin.java | 2 +- .../EndermanEntity_TakeBlockGoalMixin.java | 2 +- .../entity/monster/RavagerEntityMixin.java | 2 +- ...SilverfishEntity_HideInStoneGoalMixin.java | 2 +- ...rfishEntity_SummonSilverfishGoalMixin.java | 2 +- .../core/entity/monster/SlimeEntityMixin.java | 2 +- .../entity/monster/ZombieEntityMixin.java | 2 +- .../monster/ZombieVillagerEntityMixin.java | 2 +- .../core/entity/passive/BatEntityMixin.java | 2 +- .../core/entity/passive/CatEntityMixin.java | 2 +- .../core/entity/passive/CowEntityMixin.java | 4 ++-- .../entity/passive/DolphinEntityMixin.java | 2 +- .../core/entity/passive/FoxEntityMixin.java | 2 +- .../FoxEntity_EatBerriesGoalMixin.java | 2 +- .../passive/FoxEntity_MateGoalMixin.java | 2 +- .../entity/passive/MooshroomEntityMixin.java | 2 +- .../core/entity/passive/PandaEntityMixin.java | 2 +- .../core/entity/passive/PigEntityMixin.java | 2 +- .../RabbitEntity_RaidFarmGoalMixin.java | 2 +- .../entity/passive/SnowGolemEntityMixin.java | 2 +- .../entity/passive/TurtleEntityMixin.java | 2 +- .../passive/TurtleEntity_LayEggGoalMixin.java | 2 +- .../horse/AbstractHorseEntityMixin.java | 2 +- .../core/entity/player/PlayerEntityMixin.java | 8 ++++---- .../entity/player/PlayerInventoryMixin.java | 2 +- .../player/ServerPlayerEntityMixin.java | 16 +++++++-------- .../projectile/AbstractArrowEntityMixin.java | 6 +++--- .../DamagingProjectileEntityMixin.java | 2 +- .../projectile/EvokerFangsEntityMixin.java | 2 +- .../projectile/FishingBobberEntityMixin.java | 2 +- .../projectile/LlamaSpitEntityMixin.java | 2 +- .../entity/projectile/PotionEntityMixin.java | 4 ++-- .../projectile/ShulkerBulletEntityMixin.java | 2 +- .../projectile/SmallFireballEntityMixin.java | 2 +- .../projectile/ThrowableEntityMixin.java | 2 +- .../mixin/core/fluid/FlowingFluidMixin.java | 6 +++--- .../mixin/core/fluid/LavaFluidMixin.java | 2 +- .../inventory/CraftResultInventoryMixin.java | 2 +- .../inventory/CraftingInventoryMixin.java | 2 +- .../inventory/DoubleSidedInventoryMixin.java | 2 +- .../inventory/EnderChestInventoryMixin.java | 2 +- .../mixin/core/inventory/IInventoryMixin.java | 2 +- .../mixin/core/inventory/InventoryMixin.java | 2 +- .../inventory/MerchantInventoryMixin.java | 4 ++-- .../AbstractFurnaceContainerMixin.java | 4 ++-- .../container/BeaconContainerMixin.java | 6 +++--- .../container/BrewingStandContainerMixin.java | 4 ++-- .../container/CartographyContainerMixin.java | 4 ++-- .../container/ChestContainerMixin.java | 8 ++++---- .../inventory/container/ContainerMixin.java | 4 ++-- .../container/DispenserContainerMixin.java | 4 ++-- .../container/EnchantmentContainerMixin.java | 8 ++++---- .../container/GrindstoneContainerMixin.java | 4 ++-- .../container/HopperContainerMixin.java | 4 ++-- .../HorseInventoryContainerMixin.java | 2 +- .../container/LecternContainerMixin.java | 4 ++-- .../container/LoomContainerMixin.java | 4 ++-- .../container/MerchantContainerMixin.java | 4 ++-- .../container/PlayerContainerMixin.java | 4 ++-- .../container/RepairContainerMixin.java | 8 ++++---- .../container/ShulkerBoxContainerMixin.java | 4 ++-- .../container/StonecutterContainerMixin.java | 4 ++-- .../container/WorkbenchContainerMixin.java | 6 +++--- .../mixin/core/item/ArmorStandItemMixin.java | 2 +- .../mixin/core/item/BlockItemMixin.java | 4 ++-- .../mixin/core/item/BoatItemMixin.java | 2 +- .../mixin/core/item/BowItemMixin.java | 2 +- .../mixin/core/item/CrossbowItemMixin.java | 2 +- .../core/item/EnderCrystalItemMixin.java | 2 +- .../mixin/core/item/FireChargeItemMixin.java | 2 +- .../core/item/FlintAndSteelItemMixin.java | 2 +- .../core/item/HangingEntityItemMixin.java | 2 +- .../mixin/core/item/ItemStackMixin.java | 2 +- .../mixin/core/item/LeadItemMixin.java | 4 ++-- .../mixin/core/item/MerchantOfferMixin.java | 2 +- .../mixin/core/item/MinecartItemMixin.java | 2 +- .../mixin/core/item/TridentItemMixin.java | 2 +- .../item/crafting/BlastingRecipeMixin.java | 8 ++++---- .../crafting/CampfireCookingRecipeMixin.java | 8 ++++---- .../item/crafting/FurnaceRecipeMixin.java | 8 ++++---- .../core/item/crafting/IRecipeMixin.java | 2 +- .../item/crafting/ServerRecipeBookMixin.java | 2 +- .../core/item/crafting/ShapedRecipeMixin.java | 6 +++--- .../item/crafting/ShapelessRecipeMixin.java | 6 +++--- .../item/crafting/ShieldRecipesMixin.java | 2 +- .../ShulkerBoxColoringRecipeMixin.java | 2 +- .../item/crafting/SmokingRecipeMixin.java | 8 ++++---- .../crafting/StonecuttingRecipeMixin.java | 8 ++++---- .../item/crafting/TippedArrowRecipeMixin.java | 2 +- .../login/ServerLoginNetHandler1Mixin.java | 4 ++-- .../play/ServerPlayNetHandlerMixin.java | 20 +++++++++---------- .../mixin/core/potion/EffectMixin.java | 2 +- .../server/CustomServerBossInfoMixin.java | 2 +- .../core/server/MinecraftServerMixin.java | 4 ++-- .../dedicated/DedicatedServerMixin.java | 4 ++-- .../PlayerInteractionManagerMixin.java | 4 ++-- .../server/management/PlayerListMixin.java | 10 +++++----- .../core/stats/StatisticsManagerMixin.java | 2 +- .../AbstractFurnaceTileEntityMixin.java | 8 ++++---- .../tileentity/BarrelTileEntityMixin.java | 2 +- .../tileentity/BeaconTileEntityMixin.java | 2 +- .../BrewingStandTileEntityMixin.java | 6 +++--- .../tileentity/CampfireTileEntityMixin.java | 4 ++-- .../core/tileentity/ChestTileEntityMixin.java | 4 ++-- .../CommandBlockTileEntity1Mixin.java | 2 +- .../tileentity/ConduitTileEntityMixin.java | 4 ++-- .../tileentity/DispenserTileEntityMixin.java | 2 +- .../tileentity/EndGatewayTileEntityMixin.java | 2 +- .../tileentity/HopperTileEntityMixin.java | 6 +++--- .../tileentity/LecternTileEntity1Mixin.java | 2 +- .../tileentity/LecternTileEntityMixin.java | 2 +- .../tileentity/LockableTileEntityMixin.java | 2 +- .../tileentity/ShulkerBoxTileEntityMixin.java | 2 +- .../core/tileentity/SignTileEntityMixin.java | 2 +- .../core/tileentity/SkullTileEntityMixin.java | 2 +- .../core/tileentity/TileEntityMixin.java | 6 +++--- .../mixin/core/util/BootstrapMixin.java | 4 ++-- .../mixin/core/util/FoodStatsMixin.java | 2 +- .../mixin/core/world/ExplosionMixin.java | 2 +- .../arclight/mixin/core/world/WorldMixin.java | 10 +++++----- .../mixin/core/world/chunk/ChunkMixin.java | 2 +- .../core/world/raid/RaidManagerMixin.java | 2 +- .../mixin/core/world/raid/RaidMixin.java | 2 +- .../core/world/server/ServerWorldMixin.java | 4 ++-- .../core/world/storage/MapDataMixin.java | 6 +++--- .../world/storage/MapData_MapInfoMixin.java | 4 ++-- .../core/world/storage/SaveHandlerMixin.java | 2 +- .../io/izzel/arclight/mod/ArclightMod.java | 2 +- .../arclight/mod/server/BukkitRegistry.java | 6 +++--- .../server/event/ArclightEventFactory.java | 2 +- .../event/BlockBreakEventDispatcher.java | 4 ++-- .../event/BlockPlaceEventDispatcher.java | 4 ++-- .../server/event/EntityEventDispatcher.java | 4 ++-- .../EntityPotionEffectEventDispatcher.java | 2 +- .../event/EntityTeleportEventDispatcher.java | 4 ++-- .../event/ItemEntityEventDispatcher.java | 2 +- .../mod/util/ArclightBlockPopulator.java | 2 +- .../mod/util/ArclightBlockSnapshot.java | 2 +- .../arclight/mod/util/ArclightHeadLoader.java | 2 +- .../mod/util/ArclightSpecialRecipe.java | 10 +++++----- .../mod/util/potion/ArclightPotionEffect.java | 2 +- 271 files changed, 427 insertions(+), 425 deletions(-) diff --git a/arclight-coremod/build.gradle b/arclight-coremod/build.gradle index f6d73911..beb450c6 100644 --- a/arclight-coremod/build.gradle +++ b/arclight-coremod/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' - classpath 'com.github.IzzelAliz:arclight-gradle-plugin:1.1' + classpath 'com.github.IzzelAliz:arclight-gradle-plugin:1.2' } } @@ -28,6 +28,8 @@ arclight { mcVersion = minecraftVersion forgeVersion = project.ext.forgeVersion bukkitVersion = 'v1_14_R1' + wipeVersion = true + reobfVersion = true } sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/EntityBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/EntityBridge.java index 86b8a09a..a0caf64e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/EntityBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/EntityBridge.java @@ -4,7 +4,7 @@ import io.izzel.arclight.bridge.command.ICommandSourceBridge; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.dimension.DimensionType; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v.entity.CraftEntity; import org.bukkit.projectiles.ProjectileSource; import java.util.List; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/InternalEntityBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/InternalEntityBridge.java index 3258c255..3e828b5d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/InternalEntityBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/InternalEntityBridge.java @@ -1,6 +1,6 @@ package io.izzel.arclight.bridge.entity; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v.entity.CraftEntity; public interface InternalEntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/LivingEntityBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/LivingEntityBridge.java index a8b5ed66..5d15e917 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/LivingEntityBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/LivingEntityBridge.java @@ -2,7 +2,7 @@ package io.izzel.arclight.bridge.entity; import net.minecraft.potion.Effect; import net.minecraft.potion.EffectInstance; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v.entity.CraftLivingEntity; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.bukkit.event.entity.EntityRegainHealthEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/merchant/IMerchantBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/merchant/IMerchantBridge.java index f850309d..0eba7c07 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/merchant/IMerchantBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/merchant/IMerchantBridge.java @@ -1,6 +1,6 @@ package io.izzel.arclight.bridge.entity.merchant; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftMerchant; +import org.bukkit.craftbukkit.v.inventory.CraftMerchant; public interface IMerchantBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/PlayerEntityBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/PlayerEntityBridge.java index 3b2bb55e..9f2d1686 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/PlayerEntityBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/PlayerEntityBridge.java @@ -4,7 +4,7 @@ import com.mojang.datafixers.util.Either; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.Unit; import net.minecraft.util.math.BlockPos; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import io.izzel.arclight.bridge.entity.LivingEntityBridge; public interface PlayerEntityBridge extends LivingEntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/ServerPlayerEntityBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/ServerPlayerEntityBridge.java index 851e35de..45504f7d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/ServerPlayerEntityBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/entity/player/ServerPlayerEntityBridge.java @@ -6,7 +6,7 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.server.ServerWorld; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v.entity.CraftPlayer; import org.bukkit.event.player.PlayerTeleportEvent; public interface ServerPlayerEntityBridge extends PlayerEntityBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/IInventoryBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/IInventoryBridge.java index f4bddb7d..eaa5756b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/IInventoryBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/IInventoryBridge.java @@ -3,7 +3,7 @@ package io.izzel.arclight.bridge.inventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/ContainerBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/ContainerBridge.java index 07824e43..3828455e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/ContainerBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/inventory/container/ContainerBridge.java @@ -2,7 +2,7 @@ package io.izzel.arclight.bridge.inventory.container; import net.minecraft.inventory.container.Container; import net.minecraft.util.text.ITextComponent; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.inventory.InventoryView; public interface ContainerBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/MerchantOfferBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/MerchantOfferBridge.java index 6d535706..f366a079 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/MerchantOfferBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/item/MerchantOfferBridge.java @@ -1,6 +1,6 @@ package io.izzel.arclight.bridge.item; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftMerchantRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftMerchantRecipe; public interface MerchantOfferBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/MinecraftServerBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/MinecraftServerBridge.java index c16fc377..9cbab579 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/MinecraftServerBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/MinecraftServerBridge.java @@ -2,7 +2,7 @@ package io.izzel.arclight.bridge.server; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.RemoteConsoleCommandSender; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; +import org.bukkit.craftbukkit.v.CraftServer; public interface MinecraftServerBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/PlayerListBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/PlayerListBridge.java index f32b0c09..9764ba01 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/PlayerListBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/server/management/PlayerListBridge.java @@ -1,7 +1,7 @@ package io.izzel.arclight.bridge.server.management; import net.minecraft.entity.player.ServerPlayerEntity; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; +import org.bukkit.craftbukkit.v.CraftServer; import java.util.List; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/WorldBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/WorldBridge.java index 9c4b0174..95d355fb 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/WorldBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/WorldBridge.java @@ -1,7 +1,7 @@ package io.izzel.arclight.bridge.world; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.CraftWorld; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.CraftWorld; import org.bukkit.generator.ChunkGenerator; public interface WorldBridge extends IWorldWriterBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/MapDataBridge.java b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/MapDataBridge.java index dfc4de49..a0e7799c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/MapDataBridge.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/bridge/world/storage/MapDataBridge.java @@ -1,6 +1,6 @@ package io.izzel.arclight.bridge.world.storage; -import org.bukkit.craftbukkit.v1_14_R1.map.CraftMapView; +import org.bukkit.craftbukkit.v.map.CraftMapView; public interface MapDataBridge { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/BukkitCommandWrapperMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/BukkitCommandWrapperMixin.java index e3d0349c..c20a13d5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/BukkitCommandWrapperMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/BukkitCommandWrapperMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.mixin.bukkit; import com.mojang.brigadier.context.CommandContext; -import org.bukkit.craftbukkit.v1_14_R1.command.BukkitCommandWrapper; +import org.bukkit.craftbukkit.v.command.BukkitCommandWrapper; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/ColouredConsoleSenderMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/ColouredConsoleSenderMixin.java index f5ca7754..f09380d9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/ColouredConsoleSenderMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/ColouredConsoleSenderMixin.java @@ -2,7 +2,7 @@ package io.izzel.arclight.mixin.bukkit; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.bukkit.craftbukkit.v1_14_R1.command.ColouredConsoleSender; +import org.bukkit.craftbukkit.v.command.ColouredConsoleSender; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftBlockStateMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftBlockStateMixin.java index c7773270..959a7bc8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftBlockStateMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftBlockStateMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.mixin.bukkit; import net.minecraft.block.BlockState; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlockState; +import org.bukkit.craftbukkit.v.block.CraftBlockState; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftChunkMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftChunkMixin.java index 3556a8aa..7de8f51e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftChunkMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftChunkMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mixin.bukkit; import io.izzel.arclight.bridge.entity.EntityBridge; import net.minecraft.world.chunk.Chunk; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_14_R1.CraftChunk; +import org.bukkit.craftbukkit.v.CraftChunk; import org.bukkit.entity.Entity; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftConsoleCommandSenderMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftConsoleCommandSenderMixin.java index b015dba8..d9cf6fda 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftConsoleCommandSenderMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftConsoleCommandSenderMixin.java @@ -2,8 +2,8 @@ package io.izzel.arclight.mixin.bukkit; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.bukkit.craftbukkit.v1_14_R1.command.CraftConsoleCommandSender; -import org.bukkit.craftbukkit.v1_14_R1.conversations.ConversationTracker; +import org.bukkit.craftbukkit.v.command.CraftConsoleCommandSender; +import org.bukkit.craftbukkit.v.conversations.ConversationTracker; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftEventFactoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftEventFactoryMixin.java index 6b5a58a7..96ef83f0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftEventFactoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftEventFactoryMixin.java @@ -6,8 +6,8 @@ import net.minecraft.entity.Entity; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityDamageEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftMagicNumbersMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftMagicNumbersMixin.java index e5158345..1a19e5d8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftMagicNumbersMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftMagicNumbersMixin.java @@ -1,6 +1,6 @@ package io.izzel.arclight.mixin.bukkit; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v.util.CraftMagicNumbers; import org.spongepowered.asm.mixin.Mixin; @Mixin(CraftMagicNumbers.class) diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftServerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftServerMixin.java index 4f5cd926..ecf14c6e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftServerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/bukkit/CraftServerMixin.java @@ -5,11 +5,11 @@ import net.minecraft.command.Commands; import net.minecraft.server.dedicated.DedicatedServer; import net.minecraft.server.management.PlayerList; import org.bukkit.command.Command; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.command.BukkitCommandWrapper; -import org.bukkit.craftbukkit.v1_14_R1.command.CraftCommandMap; -import org.bukkit.craftbukkit.v1_14_R1.help.SimpleHelpMap; -import org.bukkit.craftbukkit.v1_14_R1.util.permissions.CraftDefaultPermissions; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.command.BukkitCommandWrapper; +import org.bukkit.craftbukkit.v.command.CraftCommandMap; +import org.bukkit.craftbukkit.v.help.SimpleHelpMap; +import org.bukkit.craftbukkit.v.util.permissions.CraftDefaultPermissions; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.plugin.SimplePluginManager; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/advancements/AdvancementMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/advancements/AdvancementMixin.java index 92068fe3..881d62cb 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/advancements/AdvancementMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/advancements/AdvancementMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.mixin.core.advancements; import net.minecraft.advancements.Advancement; -import org.bukkit.craftbukkit.v1_14_R1.advancement.CraftAdvancement; +import org.bukkit.craftbukkit.v.advancement.CraftAdvancement; import org.spongepowered.asm.mixin.Mixin; import io.izzel.arclight.bridge.advancement.AdvancementBridge; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractButtonBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractButtonBlockMixin.java index ac950f09..4694554f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractButtonBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractButtonBlockMixin.java @@ -11,7 +11,7 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; import org.bukkit.Bukkit; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; import org.bukkit.event.entity.EntityInteractEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractPressurePlateBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractPressurePlateBlockMixin.java index 55332b2f..412f1de8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractPressurePlateBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/AbstractPressurePlateBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooBlockMixin.java index eedbf344..ddd795ff 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooBlockMixin.java @@ -8,7 +8,7 @@ import net.minecraft.state.IntegerProperty; import net.minecraft.state.properties.BambooLeaves; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooSaplingBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooSaplingBlockMixin.java index eaf2a289..0eb52499 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooSaplingBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BambooSaplingBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BambooSaplingBlock; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BushBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BushBlockMixin.java index d34a0341..3ca02cc5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BushBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/BushBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.block.BushBlock; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CactusBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CactusBlockMixin.java index 02930411..3f3010bc 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CactusBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CactusBlockMixin.java @@ -5,8 +5,8 @@ import net.minecraft.block.CactusBlock; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CakeBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CakeBlockMixin.java index acef95ee..2ff7a7a2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CakeBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CakeBlockMixin.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.FoodStats; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.FoodLevelChangeEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CampfireBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CampfireBlockMixin.java index de25d11f..1a8009bd 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CampfireBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CampfireBlockMixin.java @@ -7,7 +7,7 @@ import net.minecraft.entity.projectile.AbstractArrowEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CarvedPumpkinBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CarvedPumpkinBlockMixin.java index e4298ec4..0ac774cc 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CarvedPumpkinBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CarvedPumpkinBlockMixin.java @@ -7,7 +7,7 @@ import net.minecraft.block.CarvedPumpkinBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; -import org.bukkit.craftbukkit.v1_14_R1.util.BlockStateListPopulator; +import org.bukkit.craftbukkit.v.util.BlockStateListPopulator; import org.bukkit.event.entity.CreatureSpawnEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CauldronBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CauldronBlockMixin.java index cbfe1634..0c620c39 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CauldronBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CauldronBlockMixin.java @@ -16,7 +16,7 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.CauldronLevelChangeEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ChorusFlowerBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ChorusFlowerBlockMixin.java index dfb6fc04..911b91b8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ChorusFlowerBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ChorusFlowerBlockMixin.java @@ -11,7 +11,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CocoaBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CocoaBlockMixin.java index 13c3fa59..0ee93bd6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CocoaBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CocoaBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.CocoaBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CommandBlockBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CommandBlockBlockMixin.java index 32c354db..f0eec4e2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CommandBlockBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CommandBlockBlockMixin.java @@ -9,7 +9,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComparatorBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComparatorBlockMixin.java index 641a63c2..a27c4a3a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComparatorBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComparatorBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.ComparatorBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlockMixin.java index 28b8d0b4..fd2c1297 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.ComposterBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftBlockInventoryHolder; +import org.bukkit.craftbukkit.v.inventory.CraftBlockInventoryHolder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_EmptyInventoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_EmptyInventoryMixin.java index d7afca66..0e2a2457 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_EmptyInventoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_EmptyInventoryMixin.java @@ -4,7 +4,7 @@ import io.izzel.arclight.mixin.core.inventory.InventoryMixin; import net.minecraft.block.ComposterBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftBlockInventoryHolder; +import org.bukkit.craftbukkit.v.inventory.CraftBlockInventoryHolder; import org.spongepowered.asm.mixin.Mixin; @Mixin(ComposterBlock.EmptyInventory.class) diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_FullInventoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_FullInventoryMixin.java index da8226b9..524501c1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_FullInventoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_FullInventoryMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftBlockInventoryHolder; +import org.bukkit.craftbukkit.v.inventory.CraftBlockInventoryHolder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_PartialInventoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_PartialInventoryMixin.java index 02b0316f..dfe31826 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_PartialInventoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ComposterBlock_PartialInventoryMixin.java @@ -4,7 +4,7 @@ import io.izzel.arclight.mixin.core.inventory.InventoryMixin; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftBlockInventoryHolder; +import org.bukkit.craftbukkit.v.inventory.CraftBlockInventoryHolder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ConcretePowderBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ConcretePowderBlockMixin.java index 1d70f276..3f04a664 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ConcretePowderBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ConcretePowderBlockMixin.java @@ -8,8 +8,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlockState; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlockState; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.block.BlockFormEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralBlockMixin.java index b8c3c546..0233718a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.CoralBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralFinBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralFinBlockMixin.java index 75d59d5f..202e4c59 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralFinBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralFinBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.CoralFinBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralPlantBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralPlantBlockMixin.java index f4fa3697..1749a974 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralPlantBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralPlantBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.CoralPlantBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralWallFanBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralWallFanBlockMixin.java index 0b60d0a5..08976c10 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralWallFanBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CoralWallFanBlockMixin.java @@ -7,7 +7,7 @@ import net.minecraft.block.CoralWallFanBlock; import net.minecraft.block.DeadCoralWallFanBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CropsBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CropsBlockMixin.java index a8e7d459..9c342975 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CropsBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/CropsBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityChangeBlockEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DaylightDetectorBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DaylightDetectorBlockMixin.java index 00aea233..02afe623 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DaylightDetectorBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DaylightDetectorBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.DaylightDetectorBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DetectorRailBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DetectorRailBlockMixin.java index ab86f069..c527253b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DetectorRailBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DetectorRailBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoorBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoorBlockMixin.java index 80ed2047..9230d5a5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoorBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoorBlockMixin.java @@ -10,7 +10,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoublePlantBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoublePlantBlockMixin.java index aff41bc0..bc1158db 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoublePlantBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DoublePlantBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.DoublePlantBlock; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DragonEggBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DragonEggBlockMixin.java index 1092386c..cd3b3461 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DragonEggBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DragonEggBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.DragonEggBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockFromToEvent; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DropperBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DropperBlockMixin.java index 428484e5..a2696de3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DropperBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/DropperBlockMixin.java @@ -14,8 +14,8 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryDoubleChest; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryDoubleChest; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.event.inventory.InventoryMoveItemEvent; import org.bukkit.inventory.Inventory; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FarmlandBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FarmlandBlockMixin.java index 3f1dda0a..2f0577d2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FarmlandBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FarmlandBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.Blocks; import net.minecraft.block.FarmlandBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FireBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FireBlockMixin.java index 251d4df1..dcef5cac 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FireBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FireBlockMixin.java @@ -10,9 +10,9 @@ import net.minecraft.world.IWorld; import net.minecraft.world.World; import org.bukkit.Bukkit; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlockState; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlockState; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockFadeEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FlowingFluidBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FlowingFluidBlockMixin.java index 2788a5cc..cf581a26 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FlowingFluidBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/FlowingFluidBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.FlowingFluidBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/GrassBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/GrassBlockMixin.java index 3648b9e5..1104b8f9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/GrassBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/GrassBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.GrassBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/IceBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/IceBlockMixin.java index 4d3417b4..f4e4a488 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/IceBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/IceBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.Blocks; import net.minecraft.block.IceBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/KelpTopBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/KelpTopBlockMixin.java index 2022d73f..fa637ad9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/KelpTopBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/KelpTopBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.KelpTopBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeavesBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeavesBlockMixin.java index 238d7951..22d02cf6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeavesBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeavesBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.LeavesBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.LeavesDecayEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeverBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeverBlockMixin.java index aa79848e..a11dce8a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeverBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LeverBlockMixin.java @@ -9,7 +9,7 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; import org.bukkit.Bukkit; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LilyPadBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LilyPadBlockMixin.java index e022e2a0..ab485bfa 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LilyPadBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/LilyPadBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.block.LilyPadBlock; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MagmaBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MagmaBlockMixin.java index f5432163..1a7d6719 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MagmaBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MagmaBlockMixin.java @@ -4,8 +4,8 @@ import net.minecraft.block.MagmaBlock; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MushroomBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MushroomBlockMixin.java index c38b7413..8d14a7ba 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MushroomBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/MushroomBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.MushroomBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherPortalBlock_SizeMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherPortalBlock_SizeMixin.java index eb587aa6..5030dd30 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherPortalBlock_SizeMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherPortalBlock_SizeMixin.java @@ -10,9 +10,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; import org.bukkit.Bukkit; import org.bukkit.block.BlockState; -import org.bukkit.craftbukkit.v1_14_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlockState; +import org.bukkit.craftbukkit.v.CraftWorld; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlockState; import org.bukkit.event.world.PortalCreateEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherWartBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherWartBlockMixin.java index 4d62e7e2..e92c32ae 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherWartBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NetherWartBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.NetherWartBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NoteBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NoteBlockMixin.java index 5e480906..0850a094 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NoteBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/NoteBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.NoteBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.block.NotePlayEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ObserverBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ObserverBlockMixin.java index 8f8350fb..ed81f5c0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ObserverBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ObserverBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.ObserverBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PistonBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PistonBlockMixin.java index 56383894..0c782b34 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PistonBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PistonBlockMixin.java @@ -10,7 +10,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockPistonEvent; import org.bukkit.event.block.BlockPistonExtendEvent; import org.bukkit.event.block.BlockPistonRetractEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PoweredRailBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PoweredRailBlockMixin.java index 2e562561..b094a661 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PoweredRailBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PoweredRailBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.PoweredRailBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PressurePlateBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PressurePlateBlockMixin.java index 395100fd..2cd626ea 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PressurePlateBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/PressurePlateBlockMixin.java @@ -10,8 +10,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.Cancellable; import org.bukkit.event.block.Action; import org.bukkit.event.entity.EntityInteractEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneDiodeBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneDiodeBlockMixin.java index a603b7a6..2c2152f1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneDiodeBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneDiodeBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.RedstoneDiodeBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneLampBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneLampBlockMixin.java index 42abe95e..c2b45106 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneLampBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneLampBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.RedstoneLampBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneOreBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneOreBlockMixin.java index 1bc9fdfc..d4f1d877 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneOreBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneOreBlockMixin.java @@ -10,8 +10,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.block.Action; import org.bukkit.event.entity.EntityInteractEvent; import org.bukkit.event.player.PlayerInteractEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneTorchBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneTorchBlockMixin.java index 719bf84b..a68c41e0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneTorchBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneTorchBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.RedstoneTorchBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneWireBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneWireBlockMixin.java index d17cac6b..6ae9a004 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneWireBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/RedstoneWireBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.RedstoneWireBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SaplingBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SaplingBlockMixin.java index d4d3d8fb..236c8ff6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SaplingBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SaplingBlockMixin.java @@ -7,8 +7,8 @@ import net.minecraft.world.IWorld; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.TreeType; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.util.BlockStateListPopulator; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.util.BlockStateListPopulator; import org.bukkit.event.world.StructureGrowEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ScaffoldingBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ScaffoldingBlockMixin.java index e5d2131a..cb7a12b0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ScaffoldingBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/ScaffoldingBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.block.ScaffoldingBlock; import net.minecraft.state.IProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SnowBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SnowBlockMixin.java index 9b00c8ee..e17457ac 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SnowBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SnowBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.Blocks; import net.minecraft.block.SnowBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpongeBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpongeBlockMixin.java index b0880ac1..7f62e204 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpongeBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpongeBlockMixin.java @@ -17,9 +17,9 @@ import net.minecraft.util.Tuple; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlockState; -import org.bukkit.craftbukkit.v1_14_R1.util.BlockStateListPopulator; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlockState; +import org.bukkit.craftbukkit.v.util.BlockStateListPopulator; import org.bukkit.event.block.SpongeAbsorbEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpreadableSnowyDirtBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpreadableSnowyDirtBlockMixin.java index 41e9e741..bec034d9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpreadableSnowyDirtBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SpreadableSnowyDirtBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.Blocks; import net.minecraft.block.SpreadableSnowyDirtBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/StemBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/StemBlockMixin.java index 58961819..c8313356 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/StemBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/StemBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.StemBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SugarCaneBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SugarCaneBlockMixin.java index 4be86a53..0e646212 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SugarCaneBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SugarCaneBlockMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.SugarCaneBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SweetBerryBushBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SweetBerryBushBlockMixin.java index 4346314b..10dba0d2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SweetBerryBushBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/SweetBerryBushBlockMixin.java @@ -5,8 +5,8 @@ import net.minecraft.block.SweetBerryBushBlock; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TNTBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TNTBlockMixin.java index 4bfce4b0..c36623f1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TNTBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TNTBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.block.TNTBlock; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TrapDoorBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TrapDoorBlockMixin.java index be66056f..0f0aac01 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TrapDoorBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TrapDoorBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.block.TrapDoorBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireBlockMixin.java index 8dfdc466..c14b850a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireBlockMixin.java @@ -10,8 +10,8 @@ import net.minecraft.state.BooleanProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.Cancellable; import org.bukkit.event.block.Action; import org.bukkit.event.entity.EntityInteractEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireHookBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireHookBlockMixin.java index e934e81e..6d3faa55 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireHookBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TripWireHookBlockMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.TripWireHookBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.block.BlockRedstoneEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TurtleEggBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TurtleEggBlockMixin.java index 67a4c9e0..8d3364eb 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TurtleEggBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/TurtleEggBlockMixin.java @@ -7,8 +7,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.Cancellable; import org.bukkit.event.block.Action; import org.bukkit.event.entity.EntityInteractEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/VineBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/VineBlockMixin.java index 4797a255..cd3eb875 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/VineBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/VineBlockMixin.java @@ -8,7 +8,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WeightedPressurePlateBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WeightedPressurePlateBlockMixin.java index 6f56c50f..ee576b92 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WeightedPressurePlateBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WeightedPressurePlateBlockMixin.java @@ -7,8 +7,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.Cancellable; import org.bukkit.event.block.Action; import org.bukkit.event.entity.EntityInteractEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WitherSkeletonSkullBlockMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WitherSkeletonSkullBlockMixin.java index f75e7014..f0a947e1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WitherSkeletonSkullBlockMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/block/WitherSkeletonSkullBlockMixin.java @@ -8,7 +8,7 @@ import net.minecraft.tileentity.SkullTileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; -import org.bukkit.craftbukkit.v1_14_R1.util.BlockStateListPopulator; +import org.bukkit.craftbukkit.v.util.BlockStateListPopulator; import org.bukkit.event.entity.CreatureSpawnEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/CommandSourceMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/CommandSourceMixin.java index 190a9372..492dfaef 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/CommandSourceMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/CommandSourceMixin.java @@ -8,8 +8,8 @@ import net.minecraft.command.ICommandSource; import net.minecraft.world.server.ServerWorld; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.command.VanillaCommandWrapper; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.command.VanillaCommandWrapper; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/TeleportCommandMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/TeleportCommandMixin.java index 58d01dcd..f1fe7129 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/TeleportCommandMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/command/impl/TeleportCommandMixin.java @@ -16,7 +16,7 @@ import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.TicketType; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.CraftWorld; +import org.bukkit.craftbukkit.v.CraftWorld; import org.bukkit.event.entity.EntityTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java index e05a4d51..b80288f9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java @@ -13,7 +13,7 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.world.World; import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.event.ForgeEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/AreaEffectCloudEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/AreaEffectCloudEntityMixin.java index 8d910dd9..5f297e57 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/AreaEffectCloudEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/AreaEffectCloudEntityMixin.java @@ -14,8 +14,8 @@ import net.minecraft.potion.PotionUtils; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.AreaEffectCloudApplyEvent; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/EntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/EntityMixin.java index 1743fba3..a092795a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/EntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/EntityMixin.java @@ -46,11 +46,11 @@ import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.block.BlockFace; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.CraftWorld; +import org.bukkit.craftbukkit.v.entity.CraftEntity; +import org.bukkit.craftbukkit.v.entity.CraftPlayer; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.Hanging; import org.bukkit.entity.Vehicle; import org.bukkit.event.entity.EntityAirChangeEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/LivingEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/LivingEntityMixin.java index 06f4d367..854c706d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/LivingEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/LivingEntityMixin.java @@ -48,11 +48,11 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.living.PotionEvent; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.attribute.CraftAttributeMap; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.attribute.CraftAttributeMap; +import org.bukkit.craftbukkit.v.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v.entity.CraftPlayer; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/MobEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/MobEntityMixin.java index e7948eb9..be86d73a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/MobEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/MobEntityMixin.java @@ -20,8 +20,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import org.apache.logging.log4j.Level; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.EntityTargetLivingEntityEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/AssignProfessionTaskMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/AssignProfessionTaskMixin.java index 75598ef6..b64a08a0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/AssignProfessionTaskMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/AssignProfessionTaskMixin.java @@ -4,8 +4,8 @@ import net.minecraft.entity.ai.brain.task.AssignProfessionTask; import net.minecraft.entity.merchant.villager.VillagerData; import net.minecraft.entity.merchant.villager.VillagerEntity; import net.minecraft.entity.merchant.villager.VillagerProfession; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftVillager; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.entity.CraftVillager; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.VillagerCareerChangeEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/ChangeJobTaskMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/ChangeJobTaskMixin.java index 102c510a..e9302cb6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/ChangeJobTaskMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/ChangeJobTaskMixin.java @@ -4,8 +4,8 @@ import net.minecraft.entity.ai.brain.task.ChangeJobTask; import net.minecraft.entity.merchant.villager.VillagerData; import net.minecraft.entity.merchant.villager.VillagerEntity; import net.minecraft.entity.merchant.villager.VillagerProfession; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftVillager; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.entity.CraftVillager; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.VillagerCareerChangeEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/CreateBabyVillagerTaskMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/CreateBabyVillagerTaskMixin.java index 912180c1..9bf2bbef 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/CreateBabyVillagerTaskMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/CreateBabyVillagerTaskMixin.java @@ -2,7 +2,7 @@ package io.izzel.arclight.mixin.core.entity.ai.brain.task; import net.minecraft.entity.ai.brain.task.CreateBabyVillagerTask; import net.minecraft.entity.merchant.villager.VillagerEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/InteractWithDoorTaskMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/InteractWithDoorTaskMixin.java index 7a7528c6..f2b59d5c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/InteractWithDoorTaskMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/brain/task/InteractWithDoorTaskMixin.java @@ -14,7 +14,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.GlobalPos; import net.minecraft.world.server.ServerWorld; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.entity.EntityInteractEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakBlockGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakBlockGoalMixin.java index 02966891..35d05317 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakBlockGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakBlockGoalMixin.java @@ -6,7 +6,7 @@ import net.minecraft.entity.ai.goal.BreakBlockGoal; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.entity.EntityInteractEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakDoorGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakDoorGoalMixin.java index d2f0c7b0..65e2273c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakDoorGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreakDoorGoalMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mixin.core.entity.ai.goal; import net.minecraft.entity.MobEntity; import net.minecraft.entity.ai.goal.BreakDoorGoal; import net.minecraft.entity.ai.goal.InteractDoorGoal; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreedGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreedGoalMixin.java index 6045a532..094e1bd6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreedGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/BreedGoalMixin.java @@ -8,7 +8,7 @@ import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityBreedEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/EatGrassGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/EatGrassGoalMixin.java index e818cc3a..182323c8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/EatGrassGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/EatGrassGoalMixin.java @@ -6,7 +6,7 @@ import net.minecraft.entity.ai.goal.EatGrassGoal; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityChangeBlockEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/FollowOwnerGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/FollowOwnerGoalMixin.java index 23f79c93..949c9444 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/FollowOwnerGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/FollowOwnerGoalMixin.java @@ -5,7 +5,7 @@ import net.minecraft.entity.ai.goal.FollowOwnerGoal; import net.minecraft.entity.passive.TameableEntity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v.entity.CraftEntity; import org.bukkit.event.entity.EntityTeleportEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TemptGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TemptGoalMixin.java index 8f471774..89fa7253 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TemptGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/ai/goal/TemptGoalMixin.java @@ -4,8 +4,8 @@ import net.minecraft.entity.CreatureEntity; import net.minecraft.entity.ai.goal.TemptGoal; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.EntityTargetLivingEntityEvent; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/WitherEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/WitherEntityMixin.java index 1bd5570f..58466f4a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/WitherEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/WitherEntityMixin.java @@ -15,7 +15,7 @@ import net.minecraft.world.Explosion; import net.minecraft.world.ServerBossInfo; import net.minecraftforge.event.ForgeEventFactory; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.ExplosionPrimeEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/EnderDragonEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/EnderDragonEntityMixin.java index bd0a8adb..a5929310 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/EnderDragonEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/EnderDragonEntityMixin.java @@ -18,7 +18,7 @@ import net.minecraft.world.server.ServerWorld; import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.LootParameters; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityRegainHealthEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/phase/PhaseManagerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/phase/PhaseManagerMixin.java index a8b09e64..196a5bef 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/phase/PhaseManagerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/boss/dragon/phase/PhaseManagerMixin.java @@ -7,7 +7,7 @@ import net.minecraft.entity.boss.dragon.phase.PhaseManager; import net.minecraft.entity.boss.dragon.phase.PhaseType; import org.apache.logging.log4j.Logger; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEnderDragon; +import org.bukkit.craftbukkit.v.entity.CraftEnderDragon; import org.bukkit.event.entity.EnderDragonChangePhaseEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/effect/LightningBoltEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/effect/LightningBoltEntityMixin.java index dd7a350a..0bccaf60 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/effect/LightningBoltEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/effect/LightningBoltEntityMixin.java @@ -6,7 +6,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.effect.LightningBoltEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ArmorStandEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ArmorStandEntityMixin.java index 3a310a56..a87ecc9b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ArmorStandEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ArmorStandEntityMixin.java @@ -14,9 +14,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.GameRules; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.CraftEquipmentSlot; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.CraftEquipmentSlot; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerArmorStandManipulateEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderCrystalEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderCrystalEntityMixin.java index 857a5fb0..9c408350 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderCrystalEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderCrystalEntityMixin.java @@ -7,7 +7,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.Explosion; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.ExplosionPrimeEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderPearlEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderPearlEntityMixin.java index dd440174..f67312c0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderPearlEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/EnderPearlEntityMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mixin.core.entity.item; import io.izzel.arclight.bridge.world.WorldBridge; import net.minecraft.entity.item.EnderPearlEntity; import net.minecraft.util.math.RayTraceResult; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.CreatureSpawnEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceBottleEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceBottleEntityMixin.java index b5cae7c6..32cadaad 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceBottleEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceBottleEntityMixin.java @@ -7,7 +7,7 @@ import net.minecraft.potion.PotionUtils; import net.minecraft.potion.Potions; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.ExpBottleEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceOrbEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceOrbEntityMixin.java index d41cbfd4..300dfa87 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceOrbEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ExperienceOrbEntityMixin.java @@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.EntityTargetLivingEntityEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FallingBlockEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FallingBlockEntityMixin.java index ac305a3e..3d2142ef 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FallingBlockEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FallingBlockEntityMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.item.FallingBlockEntity; import net.minecraft.util.math.BlockPos; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FireworkRocketEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FireworkRocketEntityMixin.java index d6b2c581..0200ec54 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FireworkRocketEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/FireworkRocketEntityMixin.java @@ -2,7 +2,7 @@ package io.izzel.arclight.mixin.core.entity.item; import io.izzel.arclight.mixin.core.entity.EntityMixin; import net.minecraft.entity.item.FireworkRocketEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemEntityMixin.java index 732fb28b..6ebd6997 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemEntityMixin.java @@ -13,7 +13,7 @@ import net.minecraft.network.datasync.DataParameter; import net.minecraft.stats.Stats; import net.minecraft.util.DamageSource; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.Item; import org.bukkit.event.entity.EntityPickupItemEvent; import org.bukkit.event.player.PlayerPickupItemEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemFrameEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemFrameEntityMixin.java index f3ae3995..c4c58561 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemFrameEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/ItemFrameEntityMixin.java @@ -10,7 +10,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/LeashKnotEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/LeashKnotEntityMixin.java index 60fbf712..0f58dcf5 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/LeashKnotEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/LeashKnotEntityMixin.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.play.server.SMountEntityPacket; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/ContainerMinecartEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/ContainerMinecartEntityMixin.java index 3ba58e6e..8e2556df 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/ContainerMinecartEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/item/minecart/ContainerMinecartEntityMixin.java @@ -9,7 +9,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/IMerchantMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/IMerchantMixin.java index 87316cd5..c8cb2d9a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/IMerchantMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/IMerchantMixin.java @@ -2,7 +2,7 @@ package io.izzel.arclight.mixin.core.entity.merchant; import io.izzel.arclight.bridge.entity.merchant.IMerchantBridge; import net.minecraft.entity.merchant.IMerchant; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftMerchant; +import org.bukkit.craftbukkit.v.inventory.CraftMerchant; import org.spongepowered.asm.mixin.Mixin; @Mixin(IMerchant.class) diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/AbstractVillagerEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/AbstractVillagerEntityMixin.java index 41045598..cf7c1f57 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/AbstractVillagerEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/AbstractVillagerEntityMixin.java @@ -10,8 +10,8 @@ import net.minecraft.item.MerchantOffer; import net.minecraft.item.MerchantOffers; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftMerchant; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftMerchantRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftMerchant; +import org.bukkit.craftbukkit.v.inventory.CraftMerchantRecipe; import org.bukkit.entity.AbstractVillager; import org.bukkit.event.entity.VillagerAcquireTradeEvent; import org.bukkit.inventory.InventoryHolder; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/VillagerEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/VillagerEntityMixin.java index f6d95540..c54a3629 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/VillagerEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/VillagerEntityMixin.java @@ -7,7 +7,7 @@ import net.minecraft.entity.monster.WitchEntity; import net.minecraft.entity.passive.IronGolemEntity; import net.minecraft.item.MerchantOffer; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.Villager; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/WanderingTraderEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/WanderingTraderEntityMixin.java index d88ac3c8..9411648d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/WanderingTraderEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/merchant/villager/WanderingTraderEntityMixin.java @@ -4,7 +4,7 @@ import net.minecraft.entity.merchant.villager.WanderingTraderEntity; import net.minecraft.item.MerchantOffer; import net.minecraft.item.MerchantOffers; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftMerchantRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftMerchantRecipe; import org.bukkit.entity.AbstractVillager; import org.bukkit.event.entity.VillagerAcquireTradeEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/AbstractSkeletonEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/AbstractSkeletonEntityMixin.java index 4f06f471..eebfde53 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/AbstractSkeletonEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/AbstractSkeletonEntityMixin.java @@ -7,7 +7,7 @@ import net.minecraft.entity.monster.AbstractSkeletonEntity; import net.minecraft.entity.projectile.AbstractArrowEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundEvents; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityShootBowEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/CreeperEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/CreeperEntityMixin.java index b0b38c28..e0b019ed 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/CreeperEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/CreeperEntityMixin.java @@ -10,7 +10,7 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.world.Explosion; import net.minecraftforge.event.ForgeEventFactory; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.CreeperPowerEvent; import org.bukkit.event.entity.ExplosionPrimeEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_PlaceBlockGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_PlaceBlockGoalMixin.java index 92c07e27..b2b72189 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_PlaceBlockGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_PlaceBlockGoalMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.monster.EndermanEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_TakeBlockGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_TakeBlockGoalMixin.java index bc7cee78..a27592d2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_TakeBlockGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/EndermanEntity_TakeBlockGoalMixin.java @@ -4,7 +4,7 @@ import net.minecraft.block.Blocks; import net.minecraft.entity.monster.EndermanEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/RavagerEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/RavagerEntityMixin.java index aed4e414..89faf23d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/RavagerEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/RavagerEntityMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.Blocks; import net.minecraft.entity.monster.RavagerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_HideInStoneGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_HideInStoneGoalMixin.java index 97c96291..4d8a2305 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_HideInStoneGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_HideInStoneGoalMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.SilverfishBlock; import net.minecraft.entity.CreatureEntity; import net.minecraft.entity.ai.goal.RandomWalkingGoal; import net.minecraft.util.math.BlockPos; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_SummonSilverfishGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_SummonSilverfishGoalMixin.java index c6fccf56..16296999 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_SummonSilverfishGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SilverfishEntity_SummonSilverfishGoalMixin.java @@ -9,7 +9,7 @@ import net.minecraft.entity.monster.SilverfishEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SlimeEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SlimeEntityMixin.java index 6ac53d62..7f55818d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SlimeEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/SlimeEntityMixin.java @@ -6,7 +6,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.monster.SlimeEntity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.Slime; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityTransformEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieEntityMixin.java index 4ebd0d2b..f1aa729d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieEntityMixin.java @@ -17,7 +17,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.IWorld; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.Zombie; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityCombustByEntityEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieVillagerEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieVillagerEntityMixin.java index 1e3bb5db..020b715b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieVillagerEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/monster/ZombieVillagerEntityMixin.java @@ -5,7 +5,7 @@ import io.izzel.arclight.bridge.world.WorldBridge; import net.minecraft.entity.merchant.villager.VillagerEntity; import net.minecraft.entity.monster.ZombieVillagerEntity; import net.minecraft.world.server.ServerWorld; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.ZombieVillager; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityPotionEffectEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/BatEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/BatEntityMixin.java index 1193cecc..97b9036c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/BatEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/BatEntityMixin.java @@ -2,7 +2,7 @@ package io.izzel.arclight.mixin.core.entity.passive; import io.izzel.arclight.mixin.core.entity.MobEntityMixin; import net.minecraft.entity.passive.BatEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CatEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CatEntityMixin.java index 1cda63d6..9816b103 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CatEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CatEntityMixin.java @@ -2,7 +2,7 @@ package io.izzel.arclight.mixin.core.entity.passive; import net.minecraft.entity.passive.CatEntity; import net.minecraft.entity.player.PlayerEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CowEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CowEntityMixin.java index dae8798e..c51c7246 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CowEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/CowEntityMixin.java @@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.Hand; import net.minecraft.util.SoundEvents; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.event.player.PlayerBucketFillEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/DolphinEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/DolphinEntityMixin.java index 4b1c166b..acde8864 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/DolphinEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/DolphinEntityMixin.java @@ -2,7 +2,7 @@ package io.izzel.arclight.mixin.core.entity.passive; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.passive.DolphinEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntityMixin.java index 51058e0c..278762bb 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntityMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mixin.core.entity.passive; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.passive.FoxEntity; import net.minecraft.item.ItemStack; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_EatBerriesGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_EatBerriesGoalMixin.java index 5b90b917..b254e707 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_EatBerriesGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_EatBerriesGoalMixin.java @@ -5,7 +5,7 @@ import net.minecraft.block.SweetBerryBushBlock; import net.minecraft.entity.CreatureEntity; import net.minecraft.entity.ai.goal.MoveToBlockGoal; import net.minecraft.entity.passive.FoxEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_MateGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_MateGoalMixin.java index 35314d81..ec937680 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_MateGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/FoxEntity_MateGoalMixin.java @@ -9,7 +9,7 @@ import net.minecraft.entity.passive.FoxEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.stats.Stats; import net.minecraft.world.GameRules; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityBreedEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/MooshroomEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/MooshroomEntityMixin.java index 84beb093..c89e5008 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/MooshroomEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/MooshroomEntityMixin.java @@ -6,7 +6,7 @@ import net.minecraft.entity.passive.MooshroomEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityTransformEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntityMixin.java index 0f37f4e9..1021469c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PandaEntityMixin.java @@ -4,7 +4,7 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.passive.PandaEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PigEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PigEntityMixin.java index d7af7967..801d608a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PigEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/PigEntityMixin.java @@ -4,7 +4,7 @@ import io.izzel.arclight.bridge.world.WorldBridge; import net.minecraft.entity.effect.LightningBoltEntity; import net.minecraft.entity.monster.ZombiePigmanEntity; import net.minecraft.entity.passive.PigEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.CreatureSpawnEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/RabbitEntity_RaidFarmGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/RabbitEntity_RaidFarmGoalMixin.java index b48418d7..10466377 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/RabbitEntity_RaidFarmGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/RabbitEntity_RaidFarmGoalMixin.java @@ -7,7 +7,7 @@ import net.minecraft.block.CarrotBlock; import net.minecraft.entity.passive.RabbitEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SnowGolemEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SnowGolemEntityMixin.java index c40fcb8a..67c60335 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SnowGolemEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/SnowGolemEntityMixin.java @@ -5,7 +5,7 @@ import net.minecraft.entity.passive.SnowGolemEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntityMixin.java index 66ce89f1..8ede8f15 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntityMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mixin.core.entity.passive; import io.izzel.arclight.bridge.entity.passive.TurtleEntityBridge; import net.minecraft.entity.effect.LightningBoltEntity; import net.minecraft.entity.passive.TurtleEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Invoker; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntity_LayEggGoalMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntity_LayEggGoalMixin.java index 5cfd0414..3606d4ee 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntity_LayEggGoalMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/TurtleEntity_LayEggGoalMixin.java @@ -10,7 +10,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/horse/AbstractHorseEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/horse/AbstractHorseEntityMixin.java index 7367baa3..22ea2507 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/horse/AbstractHorseEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/passive/horse/AbstractHorseEntityMixin.java @@ -9,7 +9,7 @@ import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.HorseJumpEvent; import org.bukkit.inventory.InventoryHolder; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerEntityMixin.java index eab77e52..fc2232a8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerEntityMixin.java @@ -54,10 +54,10 @@ import net.minecraftforge.common.ForgeHooks; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftVector; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.util.CraftVector; import org.bukkit.entity.Item; import org.bukkit.entity.Player; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerInventoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerInventoryMixin.java index 74d00951..6b5e7e4b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerInventoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/PlayerInventoryMixin.java @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/ServerPlayerEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/ServerPlayerEntityMixin.java index c0dfe94a..ca72357d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/ServerPlayerEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/player/ServerPlayerEntityMixin.java @@ -74,14 +74,14 @@ import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.WeatherType; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_14_R1.scoreboard.CraftScoreboardManager; -import org.bukkit.craftbukkit.v1_14_R1.util.BlockStateListPopulator; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftChatMessage; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.CraftWorld; +import org.bukkit.craftbukkit.v.entity.CraftPlayer; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.scoreboard.CraftScoreboardManager; +import org.bukkit.craftbukkit.v.util.BlockStateListPopulator; +import org.bukkit.craftbukkit.v.util.CraftChatMessage; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.inventory.InventoryType; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/AbstractArrowEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/AbstractArrowEntityMixin.java index 1f1976fa..0035f092 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/AbstractArrowEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/AbstractArrowEntityMixin.java @@ -11,9 +11,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.EntityRayTraceResult; import net.minecraft.util.math.RayTraceResult; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftItem; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.entity.CraftItem; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.AbstractArrow; import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.player.PlayerPickupArrowEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/DamagingProjectileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/DamagingProjectileEntityMixin.java index 37188ca0..5d6950d1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/DamagingProjectileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/DamagingProjectileEntityMixin.java @@ -8,7 +8,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/EvokerFangsEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/EvokerFangsEntityMixin.java index 93b94763..c3869fea 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/EvokerFangsEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/EvokerFangsEntityMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mixin.core.entity.projectile; import io.izzel.arclight.mixin.core.entity.EntityMixin; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.projectile.EvokerFangsEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/FishingBobberEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/FishingBobberEntityMixin.java index 1926277f..5cf66f9f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/FishingBobberEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/FishingBobberEntityMixin.java @@ -24,7 +24,7 @@ import net.minecraft.world.storage.loot.LootTables; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ItemFishedEvent; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.FishHook; import org.bukkit.event.player.PlayerFishEvent; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/LlamaSpitEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/LlamaSpitEntityMixin.java index e089dd67..2f086b1e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/LlamaSpitEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/LlamaSpitEntityMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mixin.core.entity.projectile; import io.izzel.arclight.mixin.core.entity.EntityMixin; import net.minecraft.entity.projectile.LlamaSpitEntity; import net.minecraft.util.math.RayTraceResult; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/PotionEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/PotionEntityMixin.java index 5334d6b5..6c1dc3fc 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/PotionEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/PotionEntityMixin.java @@ -12,8 +12,8 @@ import net.minecraft.potion.Effect; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Potion; import net.minecraft.util.math.AxisAlignedBB; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.bukkit.event.entity.LingeringPotionSplashEvent; import org.bukkit.event.entity.PotionSplashEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ShulkerBulletEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ShulkerBulletEntityMixin.java index 090dc93b..0541147f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ShulkerBulletEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ShulkerBulletEntityMixin.java @@ -9,7 +9,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.EntityRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/SmallFireballEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/SmallFireballEntityMixin.java index 0375b625..46215a0a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/SmallFireballEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/SmallFireballEntityMixin.java @@ -15,7 +15,7 @@ import net.minecraft.world.GameRules; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ThrowableEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ThrowableEntityMixin.java index 624c3f4c..6cc5fc25 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ThrowableEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/entity/projectile/ThrowableEntityMixin.java @@ -7,7 +7,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.projectile.ThrowableEntity; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/FlowingFluidMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/FlowingFluidMixin.java index 3028ed2c..6f0ef463 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/FlowingFluidMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/FlowingFluidMixin.java @@ -14,9 +14,9 @@ import net.minecraft.world.World; import org.bukkit.Bukkit; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.data.CraftBlockData; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.FluidLevelChangeEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/LavaFluidMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/LavaFluidMixin.java index a01b597e..98064769 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/LavaFluidMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/fluid/LavaFluidMixin.java @@ -9,7 +9,7 @@ import net.minecraft.world.GameRules; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftResultInventoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftResultInventoryMixin.java index acba9540..19f08dba 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftResultInventoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftResultInventoryMixin.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftingInventoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftingInventoryMixin.java index 11ed5eb3..91b24ff1 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftingInventoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/CraftingInventoryMixin.java @@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.InventoryHolder; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/DoubleSidedInventoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/DoubleSidedInventoryMixin.java index becc1008..daa88dd6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/DoubleSidedInventoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/DoubleSidedInventoryMixin.java @@ -6,7 +6,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/EnderChestInventoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/EnderChestInventoryMixin.java index 4ec9af9e..25d70def 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/EnderChestInventoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/EnderChestInventoryMixin.java @@ -7,7 +7,7 @@ import net.minecraft.inventory.EnderChestInventory; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.EnderChestTileEntity; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/IInventoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/IInventoryMixin.java index 0839cb76..c79d6925 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/IInventoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/IInventoryMixin.java @@ -5,7 +5,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/InventoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/InventoryMixin.java index a11e8c28..b816213c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/InventoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/InventoryMixin.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/MerchantInventoryMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/MerchantInventoryMixin.java index 936b7fa3..2b5de056 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/MerchantInventoryMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/MerchantInventoryMixin.java @@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftAbstractVillager; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftAbstractVillager; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/AbstractFurnaceContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/AbstractFurnaceContainerMixin.java index 06cadf1d..8ea91065 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/AbstractFurnaceContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/AbstractFurnaceContainerMixin.java @@ -11,8 +11,8 @@ import net.minecraft.item.crafting.AbstractCookingRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.tileentity.AbstractFurnaceTileEntity; import net.minecraft.util.IIntArray; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryFurnace; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryFurnace; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BeaconContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BeaconContainerMixin.java index 1554c795..fc3462f0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BeaconContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BeaconContainerMixin.java @@ -8,9 +8,9 @@ import net.minecraft.inventory.container.BeaconContainer; import net.minecraft.inventory.container.Container; import net.minecraft.util.IIntArray; import net.minecraft.util.IWorldPosCallable; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryBeacon; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventory; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryBeacon; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BrewingStandContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BrewingStandContainerMixin.java index 6c77396c..7de8d415 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BrewingStandContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/BrewingStandContainerMixin.java @@ -7,8 +7,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.BrewingStandContainer; import net.minecraft.inventory.container.Container; import net.minecraft.util.IIntArray; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryBrewer; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryBrewer; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/CartographyContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/CartographyContainerMixin.java index 3886eede..3e8bcc7c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/CartographyContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/CartographyContainerMixin.java @@ -9,8 +9,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.CartographyContainer; import net.minecraft.inventory.container.Container; import net.minecraft.util.IWorldPosCallable; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryCartography; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryCartography; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.bukkit.entity.Player; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ChestContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ChestContainerMixin.java index a25cda10..f804fbd4 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ChestContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ChestContainerMixin.java @@ -8,10 +8,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.ChestContainer; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.ContainerType; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryDoubleChest; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryPlayer; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventory; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryDoubleChest; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ContainerMixin.java index cb5e0960..d5ec2c94 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ContainerMixin.java @@ -5,8 +5,8 @@ import io.izzel.arclight.bridge.inventory.IInventoryBridge; import io.izzel.arclight.bridge.inventory.container.ContainerBridge; import net.minecraft.inventory.container.Container; import net.minecraft.util.text.ITextComponent; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.inventory.CraftInventory; import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/DispenserContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/DispenserContainerMixin.java index 46a2eb41..0f1d83d6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/DispenserContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/DispenserContainerMixin.java @@ -6,8 +6,8 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.DispenserContainer; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventory; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/EnchantmentContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/EnchantmentContainerMixin.java index 4af0a113..b328230e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/EnchantmentContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/EnchantmentContainerMixin.java @@ -27,10 +27,10 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.registries.ForgeRegistries; import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryEnchanting; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryEnchanting; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.util.CraftNamespacedKey; import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.EnchantmentOffer; import org.bukkit.entity.Player; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/GrindstoneContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/GrindstoneContainerMixin.java index 5a28b68a..b2039fd6 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/GrindstoneContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/GrindstoneContainerMixin.java @@ -6,8 +6,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.GrindstoneContainer; import net.minecraft.util.IWorldPosCallable; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryGrindstone; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryGrindstone; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.bukkit.entity.Player; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HopperContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HopperContainerMixin.java index 517f9ec9..6b278700 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HopperContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HopperContainerMixin.java @@ -6,8 +6,8 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.HopperContainer; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventory; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HorseInventoryContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HorseInventoryContainerMixin.java index 7db3f38c..e0d05270 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HorseInventoryContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/HorseInventoryContainerMixin.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.HorseInventoryContainer; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LecternContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LecternContainerMixin.java index a40453fe..3cde0abb 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LecternContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LecternContainerMixin.java @@ -9,8 +9,8 @@ import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.LecternContainer; import net.minecraft.util.IIntArray; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryLectern; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryLectern; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerTakeLecternBookEvent; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainerMixin.java index 651dac78..70429b65 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/LoomContainerMixin.java @@ -7,8 +7,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.LoomContainer; import net.minecraft.util.IWorldPosCallable; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryLoom; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryLoom; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.bukkit.entity.Player; import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/MerchantContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/MerchantContainerMixin.java index b5c560e1..663fc92f 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/MerchantContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/MerchantContainerMixin.java @@ -7,8 +7,8 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.MerchantInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.MerchantContainer; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryMerchant; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryMerchant; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/PlayerContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/PlayerContainerMixin.java index fc063180..2f49938a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/PlayerContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/PlayerContainerMixin.java @@ -11,8 +11,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.PlayerContainer; import net.minecraft.util.text.TranslationTextComponent; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryCrafting; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryCrafting; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/RepairContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/RepairContainerMixin.java index 8fbf86ca..6d0ca2b0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/RepairContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/RepairContainerMixin.java @@ -17,10 +17,10 @@ import net.minecraft.util.IntReferenceHolder; import net.minecraft.util.text.StringTextComponent; import net.minecraftforge.common.ForgeHooks; import org.apache.commons.lang3.StringUtils; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryAnvil; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.inventory.CraftInventory; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryAnvil; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ShulkerBoxContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ShulkerBoxContainerMixin.java index 96b449b3..49fbc806 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ShulkerBoxContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/ShulkerBoxContainerMixin.java @@ -5,8 +5,8 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.ShulkerBoxContainer; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventory; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/StonecutterContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/StonecutterContainerMixin.java index f1439f0f..49239d34 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/StonecutterContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/StonecutterContainerMixin.java @@ -7,8 +7,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.StonecutterContainer; import net.minecraft.util.IWorldPosCallable; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryStonecutter; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryStonecutter; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.bukkit.entity.Player; import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/WorkbenchContainerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/WorkbenchContainerMixin.java index 9fa63798..8941073b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/WorkbenchContainerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/inventory/container/WorkbenchContainerMixin.java @@ -17,9 +17,9 @@ import net.minecraft.item.crafting.IRecipeType; import net.minecraft.network.play.server.SSetSlotPacket; import net.minecraft.util.IWorldPosCallable; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryCrafting; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryCrafting; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ArmorStandItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ArmorStandItemMixin.java index 7c1655e0..f6fc02a7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ArmorStandItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ArmorStandItemMixin.java @@ -4,7 +4,7 @@ import net.minecraft.entity.item.ArmorStandEntity; import net.minecraft.item.ArmorStandItem; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BlockItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BlockItemMixin.java index 76c89291..ea770b06 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BlockItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BlockItemMixin.java @@ -11,8 +11,8 @@ import net.minecraft.state.IProperty; import net.minecraft.state.StateContainer; import net.minecraft.util.math.shapes.ISelectionContext; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.block.data.CraftBlockData; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.data.CraftBlockData; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockCanBuildEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BoatItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BoatItemMixin.java index d48f07b9..8a8c2f5a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BoatItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BoatItemMixin.java @@ -9,7 +9,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BowItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BowItemMixin.java index 18d47e21..64b6da34 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BowItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/BowItemMixin.java @@ -17,7 +17,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityShootBowEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/CrossbowItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/CrossbowItemMixin.java index e639f75f..3a411230 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/CrossbowItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/CrossbowItemMixin.java @@ -10,7 +10,7 @@ import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityShootBowEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/EnderCrystalItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/EnderCrystalItemMixin.java index c0e15429..a9caa238 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/EnderCrystalItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/EnderCrystalItemMixin.java @@ -4,7 +4,7 @@ import net.minecraft.entity.item.EnderCrystalEntity; import net.minecraft.item.EnderCrystalItem; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FireChargeItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FireChargeItemMixin.java index a957d0a5..69506e71 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FireChargeItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FireChargeItemMixin.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.block.BlockIgniteEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FlintAndSteelItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FlintAndSteelItemMixin.java index b50ccab1..884d13cf 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FlintAndSteelItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/FlintAndSteelItemMixin.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.block.BlockIgniteEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/HangingEntityItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/HangingEntityItemMixin.java index 14c80b8f..aa62538b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/HangingEntityItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/HangingEntityItemMixin.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; import org.bukkit.Bukkit; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.entity.Hanging; import org.bukkit.entity.Player; import org.bukkit.event.hanging.HangingPlaceEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ItemStackMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ItemStackMixin.java index ff44d585..230adb00 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ItemStackMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/ItemStackMixin.java @@ -4,7 +4,7 @@ import io.izzel.arclight.bridge.item.ItemStackBridge; import net.minecraft.item.ItemStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v.util.CraftMagicNumbers; import org.spongepowered.asm.mixin.Mixin; @Mixin(ItemStack.class) diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/LeadItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/LeadItemMixin.java index 034cd65a..1b09ce15 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/LeadItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/LeadItemMixin.java @@ -11,8 +11,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.bukkit.Bukkit; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.Hanging; import org.bukkit.entity.Player; import org.bukkit.event.hanging.HangingPlaceEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MerchantOfferMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MerchantOfferMixin.java index 7b4f79b7..13b06616 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MerchantOfferMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MerchantOfferMixin.java @@ -2,7 +2,7 @@ package io.izzel.arclight.mixin.core.item; import net.minecraft.item.ItemStack; import net.minecraft.item.MerchantOffer; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftMerchantRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftMerchantRecipe; import org.spongepowered.asm.mixin.Mixin; import io.izzel.arclight.bridge.item.MerchantOfferBridge; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MinecartItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MinecartItemMixin.java index 7e6d101d..ce92478c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MinecartItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/MinecartItemMixin.java @@ -11,7 +11,7 @@ import net.minecraft.tags.BlockTags; import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/TridentItemMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/TridentItemMixin.java index a41846bf..69dc3e37 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/TridentItemMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/TridentItemMixin.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.TridentItem; import net.minecraft.world.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.event.player.PlayerRiptideEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BlastingRecipeMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BlastingRecipeMixin.java index 40bfef2b..ca1c47be 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BlastingRecipeMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/BlastingRecipeMixin.java @@ -7,10 +7,10 @@ import net.minecraft.item.crafting.BlastingRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftBlastingRecipe; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftRecipe; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v.inventory.CraftBlastingRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftRecipe; +import org.bukkit.craftbukkit.v.util.CraftNamespacedKey; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/CampfireCookingRecipeMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/CampfireCookingRecipeMixin.java index 5da42700..2e52bbb2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/CampfireCookingRecipeMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/CampfireCookingRecipeMixin.java @@ -7,10 +7,10 @@ import net.minecraft.item.crafting.CampfireCookingRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftCampfireRecipe; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftRecipe; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v.inventory.CraftCampfireRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftRecipe; +import org.bukkit.craftbukkit.v.util.CraftNamespacedKey; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FurnaceRecipeMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FurnaceRecipeMixin.java index 0c3da3d3..24281829 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FurnaceRecipeMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/FurnaceRecipeMixin.java @@ -7,10 +7,10 @@ import net.minecraft.item.crafting.FurnaceRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftFurnaceRecipe; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftRecipe; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v.inventory.CraftFurnaceRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftRecipe; +import org.bukkit.craftbukkit.v.util.CraftNamespacedKey; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/IRecipeMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/IRecipeMixin.java index c3ab15ab..04c81d09 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/IRecipeMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/IRecipeMixin.java @@ -4,7 +4,7 @@ import io.izzel.arclight.bridge.item.crafting.IRecipeBridge; import io.izzel.arclight.mod.util.ArclightSpecialRecipe; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ServerRecipeBookMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ServerRecipeBookMixin.java index 367faa2e..8e764044 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ServerRecipeBookMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ServerRecipeBookMixin.java @@ -5,7 +5,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ServerRecipeBook; import net.minecraft.network.play.server.SRecipeBookPacket; import net.minecraft.util.ResourceLocation; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapedRecipeMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapedRecipeMixin.java index 3e4e8184..327d99ee 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapedRecipeMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapedRecipeMixin.java @@ -5,9 +5,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapedRecipe; import net.minecraft.util.NonNullList; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftRecipe; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftShapedRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftShapedRecipe; import org.bukkit.inventory.Recipe; import org.bukkit.inventory.RecipeChoice; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapelessRecipeMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapelessRecipeMixin.java index 38f205d8..6e5e224d 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapelessRecipeMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShapelessRecipeMixin.java @@ -5,9 +5,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapelessRecipe; import net.minecraft.util.NonNullList; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftRecipe; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftShapelessRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftShapelessRecipe; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShieldRecipesMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShieldRecipesMixin.java index c55f89d0..14b69670 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShieldRecipesMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShieldRecipesMixin.java @@ -8,7 +8,7 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShieldRecipes; import net.minecraft.item.crafting.SpecialRecipe; import net.minecraft.util.ResourceLocation; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShulkerBoxColoringRecipeMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShulkerBoxColoringRecipeMixin.java index b36a47b5..7fd87d1a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShulkerBoxColoringRecipeMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/ShulkerBoxColoringRecipeMixin.java @@ -8,7 +8,7 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShulkerBoxColoringRecipe; import net.minecraft.item.crafting.SpecialRecipe; import net.minecraft.util.ResourceLocation; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; import io.izzel.arclight.mod.util.ArclightSpecialRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/SmokingRecipeMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/SmokingRecipeMixin.java index 151220a9..ebac5b66 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/SmokingRecipeMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/SmokingRecipeMixin.java @@ -7,10 +7,10 @@ import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.SmokingRecipe; import net.minecraft.util.ResourceLocation; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftRecipe; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftSmokingRecipe; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftSmokingRecipe; +import org.bukkit.craftbukkit.v.util.CraftNamespacedKey; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/StonecuttingRecipeMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/StonecuttingRecipeMixin.java index 7310aaf2..919ab061 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/StonecuttingRecipeMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/StonecuttingRecipeMixin.java @@ -8,10 +8,10 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.SingleItemRecipe; import net.minecraft.item.crafting.StonecuttingRecipe; import net.minecraft.util.ResourceLocation; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftRecipe; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftStonecuttingRecipe; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftStonecuttingRecipe; +import org.bukkit.craftbukkit.v.util.CraftNamespacedKey; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/TippedArrowRecipeMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/TippedArrowRecipeMixin.java index 016a5619..94dc6f8a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/TippedArrowRecipeMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/item/crafting/TippedArrowRecipeMixin.java @@ -7,7 +7,7 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.SpecialRecipe; import net.minecraft.item.crafting.TippedArrowRecipe; import net.minecraft.util.ResourceLocation; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.inventory.Recipe; import org.spongepowered.asm.mixin.Mixin; import io.izzel.arclight.mod.util.ArclightSpecialRecipe; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/login/ServerLoginNetHandler1Mixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/login/ServerLoginNetHandler1Mixin.java index 4d4f5c5d..4bf39f16 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/login/ServerLoginNetHandler1Mixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/login/ServerLoginNetHandler1Mixin.java @@ -19,8 +19,8 @@ import net.minecraftforge.fml.common.thread.SidedThreadGroups; import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.Logger; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.util.Waitable; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.util.Waitable; import org.bukkit.event.player.AsyncPlayerPreLoginEvent; import org.bukkit.event.player.PlayerPreLoginEvent; import org.spongepowered.asm.mixin.Final; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/ServerPlayNetHandlerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/ServerPlayNetHandlerMixin.java index f2e72001..6dedcdf8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/ServerPlayNetHandlerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/network/play/ServerPlayNetHandlerMixin.java @@ -78,16 +78,16 @@ import org.apache.logging.log4j.Logger; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftSign; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftChatMessage; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_14_R1.util.LazyPlayerSet; -import org.bukkit.craftbukkit.v1_14_R1.util.Waitable; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftSign; +import org.bukkit.craftbukkit.v.entity.CraftPlayer; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.util.CraftChatMessage; +import org.bukkit.craftbukkit.v.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v.util.LazyPlayerSet; +import org.bukkit.craftbukkit.v.util.Waitable; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.block.Action; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/potion/EffectMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/potion/EffectMixin.java index 38f96b7b..f0d238dc 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/potion/EffectMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/potion/EffectMixin.java @@ -10,7 +10,7 @@ import net.minecraft.network.play.server.SUpdateHealthPacket; import net.minecraft.potion.Effect; import net.minecraft.util.DamageSource; import net.minecraft.util.FoodStats; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.FoodLevelChangeEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/CustomServerBossInfoMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/CustomServerBossInfoMixin.java index 8d80c962..3b5d50c2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/CustomServerBossInfoMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/CustomServerBossInfoMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mixin.core.server; import io.izzel.arclight.bridge.server.CustomServerBossInfoBridge; import net.minecraft.server.CustomServerBossInfo; import org.bukkit.boss.KeyedBossBar; -import org.bukkit.craftbukkit.v1_14_R1.boss.CraftKeyedBossbar; +import org.bukkit.craftbukkit.v.boss.CraftKeyedBossbar; import org.spongepowered.asm.mixin.Mixin; @Mixin(CustomServerBossInfo.class) diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/MinecraftServerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/MinecraftServerMixin.java index ece189a4..fc03ad2c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/MinecraftServerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/MinecraftServerMixin.java @@ -39,8 +39,8 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.RemoteConsoleCommandSender; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.scoreboard.CraftScoreboardManager; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.scoreboard.CraftScoreboardManager; import org.bukkit.event.server.ServerLoadEvent; import org.bukkit.event.world.WorldInitEvent; import org.bukkit.plugin.PluginLoadOrder; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/dedicated/DedicatedServerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/dedicated/DedicatedServerMixin.java index d609b1f4..d5a17d18 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/dedicated/DedicatedServerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/dedicated/DedicatedServerMixin.java @@ -6,8 +6,8 @@ import net.minecraft.network.rcon.RConConsoleSource; import net.minecraft.server.dedicated.DedicatedServer; import net.minecraft.util.text.ITextComponent; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.command.CraftRemoteConsoleCommandSender; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.command.CraftRemoteConsoleCommandSender; import org.bukkit.plugin.PluginLoadOrder; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerInteractionManagerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerInteractionManagerMixin.java index dd6c8ec0..1ea6af2e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerInteractionManagerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerInteractionManagerMixin.java @@ -27,8 +27,8 @@ import net.minecraft.world.GameType; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.ForgeHooks; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.Event; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockBreakEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerListMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerListMixin.java index fd45e7c8..f2ca8bb2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerListMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/server/management/PlayerListMixin.java @@ -44,11 +44,11 @@ import net.minecraftforge.fml.hooks.BasicEventHooks; import net.minecraftforge.fml.network.NetworkHooks; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_14_R1.command.ColouredConsoleSender; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftChatMessage; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.CraftWorld; +import org.bukkit.craftbukkit.v.command.ColouredConsoleSender; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.util.CraftChatMessage; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.event.player.PlayerJoinEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/stats/StatisticsManagerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/stats/StatisticsManagerMixin.java index 5cc3fca5..14179883 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/stats/StatisticsManagerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/stats/StatisticsManagerMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mixin.core.stats; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.stats.Stat; import net.minecraft.stats.StatisticsManager; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.Cancellable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/AbstractFurnaceTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/AbstractFurnaceTileEntityMixin.java index b3d525cd..c4032451 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/AbstractFurnaceTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/AbstractFurnaceTileEntityMixin.java @@ -11,10 +11,10 @@ import net.minecraft.tileentity.AbstractFurnaceTileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.util.CraftMagicNumbers; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.FurnaceBurnEvent; import org.bukkit.event.inventory.FurnaceExtractEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BarrelTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BarrelTileEntityMixin.java index bdf902d8..27dec8e8 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BarrelTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BarrelTileEntityMixin.java @@ -5,7 +5,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.BarrelTileEntity; import net.minecraft.util.NonNullList; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BeaconTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BeaconTileEntityMixin.java index 83a5ce9e..f67748ec 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BeaconTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BeaconTileEntityMixin.java @@ -4,7 +4,7 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.potion.Effect; import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.BeaconTileEntity; -import org.bukkit.craftbukkit.v1_14_R1.potion.CraftPotionUtil; +import org.bukkit.craftbukkit.v.potion.CraftPotionUtil; import org.bukkit.potion.PotionEffect; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BrewingStandTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BrewingStandTileEntityMixin.java index 4d0f4b82..4bf3c9d2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BrewingStandTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/BrewingStandTileEntityMixin.java @@ -4,9 +4,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.BrewingStandTileEntity; import net.minecraft.util.NonNullList; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.BrewEvent; import org.bukkit.event.inventory.BrewingStandFuelEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CampfireTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CampfireTileEntityMixin.java index 93d7d398..5cc2ceee 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CampfireTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CampfireTileEntityMixin.java @@ -11,8 +11,8 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.event.block.BlockCookEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ChestTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ChestTileEntityMixin.java index 7a8d63b4..bdb16eda 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ChestTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ChestTileEntityMixin.java @@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.ChestTileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CommandBlockTileEntity1Mixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CommandBlockTileEntity1Mixin.java index 5809b79f..f6eb3d0e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CommandBlockTileEntity1Mixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/CommandBlockTileEntity1Mixin.java @@ -4,7 +4,7 @@ import io.izzel.arclight.bridge.command.ICommandSourceBridge; import net.minecraft.command.CommandSource; import net.minecraft.tileentity.CommandBlockTileEntity; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.v1_14_R1.command.CraftBlockCommandSender; +import org.bukkit.craftbukkit.v.command.CraftBlockCommandSender; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ConduitTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ConduitTileEntityMixin.java index 9ca5c0ea..bd5b0167 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ConduitTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ConduitTileEntityMixin.java @@ -4,8 +4,8 @@ import io.izzel.arclight.bridge.entity.player.PlayerEntityBridge; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.ConduitTileEntity; import net.minecraft.util.math.AxisAlignedBB; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityPotionEffectEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/DispenserTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/DispenserTileEntityMixin.java index 85d559be..9de0f840 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/DispenserTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/DispenserTileEntityMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mixin.core.tileentity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.DispenserTileEntity; import net.minecraft.util.NonNullList; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/EndGatewayTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/EndGatewayTileEntityMixin.java index 49c3fa01..6ff4adad 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/EndGatewayTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/EndGatewayTileEntityMixin.java @@ -8,7 +8,7 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.tileentity.EndGatewayTileEntity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v.entity.CraftPlayer; import org.bukkit.event.player.PlayerTeleportEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/HopperTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/HopperTileEntityMixin.java index f8e0cdce..7b117144 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/HopperTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/HopperTileEntityMixin.java @@ -12,9 +12,9 @@ import net.minecraft.tileentity.IHopper; import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventoryDoubleChest; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.inventory.CraftInventoryDoubleChest; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Item; import org.bukkit.event.inventory.InventoryMoveItemEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntity1Mixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntity1Mixin.java index 7e518855..ba72b718 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntity1Mixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntity1Mixin.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.LecternTileEntity; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntityMixin.java index 424b4d17..5b88f9de 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LecternTileEntityMixin.java @@ -19,7 +19,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.server.ServerWorld; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.v1_14_R1.command.CraftBlockCommandSender; +import org.bukkit.craftbukkit.v.command.CraftBlockCommandSender; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LockableTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LockableTileEntityMixin.java index 4d98e09b..73c2e6f7 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LockableTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/LockableTileEntityMixin.java @@ -5,7 +5,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.LockableTileEntity; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.spongepowered.asm.mixin.Mixin; @Mixin(LockableTileEntity.class) diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ShulkerBoxTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ShulkerBoxTileEntityMixin.java index 6fb3cb73..39845053 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ShulkerBoxTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/ShulkerBoxTileEntityMixin.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mixin.core.tileentity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.ShulkerBoxTileEntity; import net.minecraft.util.NonNullList; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SignTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SignTileEntityMixin.java index 7dc705f6..f88d43c2 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SignTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SignTileEntityMixin.java @@ -14,7 +14,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.server.ServerWorld; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.v1_14_R1.command.CraftBlockCommandSender; +import org.bukkit.craftbukkit.v.command.CraftBlockCommandSender; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SkullTileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SkullTileEntityMixin.java index 65a0cf72..8b4d746c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SkullTileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/SkullTileEntityMixin.java @@ -13,7 +13,7 @@ import io.izzel.arclight.bridge.server.MinecraftServerBridge; import io.izzel.arclight.mod.util.ArclightHeadLoader; import net.minecraft.tileentity.SkullTileEntity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; +import org.bukkit.craftbukkit.v.CraftServer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/TileEntityMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/TileEntityMixin.java index 4af7d90b..ac0e3609 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/TileEntityMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/tileentity/TileEntityMixin.java @@ -5,9 +5,9 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.persistence.CraftPersistentDataContainer; -import org.bukkit.craftbukkit.v1_14_R1.persistence.CraftPersistentDataTypeRegistry; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.persistence.CraftPersistentDataContainer; +import org.bukkit.craftbukkit.v.persistence.CraftPersistentDataTypeRegistry; import org.bukkit.inventory.InventoryHolder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/BootstrapMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/BootstrapMixin.java index c51b9dce..5da989cb 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/BootstrapMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/BootstrapMixin.java @@ -1,7 +1,7 @@ package io.izzel.arclight.mixin.core.util; import net.minecraft.util.registry.Bootstrap; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftLegacy; +import org.bukkit.craftbukkit.v.util.CraftLegacy; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -19,7 +19,7 @@ public class BootstrapMixin { private static void arclight$replaceWhitelist(CallbackInfo ci) { // 噢，天哪，看着肮脏的 hack，我i了 // 我简直是 fucking genius - if (new LinkageError().getStackTrace()[2].toString().contains("org.bukkit.craftbukkit.v1_14_R1.util.CraftLegacy")) { + if (new LinkageError().getStackTrace()[2].toString().contains("util.CraftLegacy")) { try { Field field = CraftLegacy.class.getDeclaredField("whitelistedStates"); Object base = Unsafe.staticFieldBase(field); diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/FoodStatsMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/FoodStatsMixin.java index f5305d8d..a8a8dc8c 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/FoodStatsMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/util/FoodStatsMixin.java @@ -10,7 +10,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.SUpdateHealthPacket; import net.minecraft.util.FoodStats; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.FoodLevelChangeEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/ExplosionMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/ExplosionMixin.java index 42ebf59c..ca368274 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/ExplosionMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/ExplosionMixin.java @@ -34,7 +34,7 @@ import net.minecraft.world.storage.loot.LootParameters; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.block.BlockExplodeEvent; import org.bukkit.event.block.BlockIgniteEvent; import org.bukkit.event.entity.EntityExplodeEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/WorldMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/WorldMixin.java index 3b1650fe..59905951 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/WorldMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/WorldMixin.java @@ -17,11 +17,11 @@ import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.server.ServerWorld; import net.minecraft.world.storage.WorldInfo; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.CraftWorld; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.block.data.CraftBlockData; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.block.BlockPhysicsEvent; import org.bukkit.generator.ChunkGenerator; import org.spigotmc.SpigotWorldConfig; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/chunk/ChunkMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/chunk/ChunkMixin.java index b0b82038..710ca615 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/chunk/ChunkMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/chunk/ChunkMixin.java @@ -15,7 +15,7 @@ import net.minecraft.world.chunk.ChunkPrimer; import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.chunk.UpgradeData; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.CraftChunk; +import org.bukkit.craftbukkit.v.CraftChunk; import org.bukkit.event.world.ChunkLoadEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidManagerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidManagerMixin.java index f40cbe9f..ad1ead98 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidManagerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidManagerMixin.java @@ -6,7 +6,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.raid.Raid; import net.minecraft.world.raid.RaidManager; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidMixin.java index d15f6e1e..fccee5b0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/raid/RaidMixin.java @@ -9,7 +9,7 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.raid.Raid; import net.minecraft.world.server.ServerWorld; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.Player; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.raid.RaidStopEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerWorldMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerWorldMixin.java index 7f674067..cfdfb54b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerWorldMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/server/ServerWorldMixin.java @@ -33,8 +33,8 @@ import net.minecraft.world.storage.MapData; import net.minecraft.world.storage.SaveHandler; import net.minecraft.world.storage.WorldInfo; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.LightningStrike; import org.bukkit.event.entity.CreatureSpawnEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapDataMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapDataMixin.java index 63d4c153..f11d3171 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapDataMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapDataMixin.java @@ -5,9 +5,9 @@ import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.dimension.OverworldDimension; import net.minecraft.world.storage.MapData; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_14_R1.map.CraftMapView; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.CraftWorld; +import org.bukkit.craftbukkit.v.map.CraftMapView; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapData_MapInfoMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapData_MapInfoMixin.java index 3d5066dc..feb2b7d0 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapData_MapInfoMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/MapData_MapInfoMixin.java @@ -8,8 +8,8 @@ import net.minecraft.network.IPacket; import net.minecraft.network.play.server.SMapDataPacket; import net.minecraft.world.storage.MapData; import net.minecraft.world.storage.MapDecoration; -import org.bukkit.craftbukkit.v1_14_R1.map.RenderData; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftChatMessage; +import org.bukkit.craftbukkit.v.map.RenderData; +import org.bukkit.craftbukkit.v.util.CraftChatMessage; import org.bukkit.map.MapCursor; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/SaveHandlerMixin.java b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/SaveHandlerMixin.java index efe3d2d1..a7036fc3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/SaveHandlerMixin.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mixin/core/world/storage/SaveHandlerMixin.java @@ -8,7 +8,7 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.world.storage.SaveHandler; import org.apache.logging.log4j.Logger; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v.entity.CraftPlayer; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightMod.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightMod.java index 5b143f07..52fbe86a 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightMod.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/ArclightMod.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.network.FMLNetworkConstants; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.bukkit.craftbukkit.v1_14_R1.CraftCrashReport; +import org.bukkit.craftbukkit.v.CraftCrashReport; @Mod("arclight") public class ArclightMod { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/BukkitRegistry.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/BukkitRegistry.java index 3b5672a9..dc9369e3 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/BukkitRegistry.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/BukkitRegistry.java @@ -10,9 +10,9 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistry; import net.minecraftforge.registries.IForgeRegistry; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_14_R1.enchantments.CraftEnchantment; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v.enchantments.CraftEnchantment; +import org.bukkit.craftbukkit.v.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v.util.CraftNamespacedKey; import org.bukkit.enchantments.Enchantment; import org.bukkit.potion.PotionEffectType; import io.izzel.arclight.bridge.bukkit.MaterialBridge; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ArclightEventFactory.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ArclightEventFactory.java index 76011a9a..231704aa 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ArclightEventFactory.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ArclightEventFactory.java @@ -4,7 +4,7 @@ import io.izzel.arclight.bridge.entity.LivingEntityBridge; import net.minecraft.entity.LivingEntity; import net.minecraft.potion.EffectInstance; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v.entity.CraftLivingEntity; import org.bukkit.entity.Entity; import org.bukkit.event.Event; import org.bukkit.event.entity.EntityDeathEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockBreakEventDispatcher.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockBreakEventDispatcher.java index a3e03060..f9aea27b 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockBreakEventDispatcher.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockBreakEventDispatcher.java @@ -8,8 +8,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.block.CraftBlock; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.Cancellable; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockBreakEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockPlaceEventDispatcher.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockPlaceEventDispatcher.java index cd352cc5..30d7cfcf 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockPlaceEventDispatcher.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/BlockPlaceEventDispatcher.java @@ -9,8 +9,8 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.bukkit.Bukkit; import org.bukkit.block.BlockState; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.block.CraftBlock; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockMultiPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityEventDispatcher.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityEventDispatcher.java index f2f299ea..0165d4bf 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityEventDispatcher.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityEventDispatcher.java @@ -10,8 +10,8 @@ import net.minecraftforge.event.entity.living.AnimalTameEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.inventory.ItemStack; import java.util.ArrayList; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityPotionEffectEventDispatcher.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityPotionEffectEventDispatcher.java index 85591fea..a19a4581 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityPotionEffectEventDispatcher.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityPotionEffectEventDispatcher.java @@ -3,7 +3,7 @@ package io.izzel.arclight.mod.server.event; import io.izzel.arclight.bridge.entity.LivingEntityBridge; import net.minecraftforge.event.entity.living.PotionEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; import org.bukkit.event.entity.EntityPotionEffectEvent; public class EntityPotionEffectEventDispatcher { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityTeleportEventDispatcher.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityTeleportEventDispatcher.java index 88420796..5587c808 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityTeleportEventDispatcher.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/EntityTeleportEventDispatcher.java @@ -8,8 +8,8 @@ import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v.entity.CraftEntity; +import org.bukkit.craftbukkit.v.entity.CraftPlayer; import org.bukkit.event.entity.EntityTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ItemEntityEventDispatcher.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ItemEntityEventDispatcher.java index 792093dd..cef3b618 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ItemEntityEventDispatcher.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/server/event/ItemEntityEventDispatcher.java @@ -2,7 +2,7 @@ package io.izzel.arclight.mod.server.event; import net.minecraftforge.event.entity.item.ItemExpireEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v.event.CraftEventFactory; public class ItemEntityEventDispatcher { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockPopulator.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockPopulator.java index 10473fad..fcd9095e 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockPopulator.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockPopulator.java @@ -54,7 +54,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityDispatcher; import net.minecraftforge.common.capabilities.CapabilityProvider; import net.minecraftforge.common.util.LazyOptional; -import org.bukkit.craftbukkit.v1_14_R1.util.BlockStateListPopulator; +import org.bukkit.craftbukkit.v.util.BlockStateListPopulator; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockSnapshot.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockSnapshot.java index 65eb02fc..65d78493 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockSnapshot.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightBlockSnapshot.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.BlockSnapshot; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_14_R1.block.*; +import org.bukkit.craftbukkit.v.block.*; public class ArclightBlockSnapshot extends CraftBlock { diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightHeadLoader.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightHeadLoader.java index 35f92f33..3f9b61a9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightHeadLoader.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightHeadLoader.java @@ -9,7 +9,7 @@ import com.mojang.authlib.properties.Property; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.SkullTileEntity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; +import org.bukkit.craftbukkit.v.CraftServer; import java.util.UUID; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightSpecialRecipe.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightSpecialRecipe.java index c245d3ce..58c854d9 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightSpecialRecipe.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/ArclightSpecialRecipe.java @@ -5,11 +5,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.SpecialRecipe; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftRecipe; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftShapedRecipe; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftShapelessRecipe; -import org.bukkit.craftbukkit.v1_14_R1.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v.CraftServer; +import org.bukkit.craftbukkit.v.inventory.CraftRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftShapedRecipe; +import org.bukkit.craftbukkit.v.inventory.CraftShapelessRecipe; +import org.bukkit.craftbukkit.v.util.CraftNamespacedKey; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.RecipeChoice; diff --git a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/ArclightPotionEffect.java b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/ArclightPotionEffect.java index 7a1e7095..614fa1ea 100644 --- a/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/ArclightPotionEffect.java +++ b/arclight-coremod/src/main/java/io/izzel/arclight/mod/util/potion/ArclightPotionEffect.java @@ -1,7 +1,7 @@ package io.izzel.arclight.mod.util.potion; import net.minecraft.potion.Effect; -import org.bukkit.craftbukkit.v1_14_R1.potion.CraftPotionEffectType; +import org.bukkit.craftbukkit.v.potion.CraftPotionEffectType; public class ArclightPotionEffect extends CraftPotionEffectType {