Remove all cb package version.

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'

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;

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 {
 

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;
 

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 {
 

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 {

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 {

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;
 

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 {

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 {
 

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 {
 

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;
 

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.v.CraftServer;
-import org.bukkit.craftbukkit.v1_14_R1.CraftWorld;
+import org.bukkit.craftbukkit.v.CraftWorld;
 import org.bukkit.generator.ChunkGenerator;
 
 public interface WorldBridge extends IWorldWriterBridge {

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 {
 

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;

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;
 

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;
 

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;

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.v.command.CraftConsoleCommandSender;
-import org.bukkit.craftbukkit.v1_14_R1.conversations.ConversationTracker;
+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;

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.v.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+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;

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)

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.v.CraftServer;
-import org.bukkit.craftbukkit.v1_14_R1.command.BukkitCommandWrapper;
+import org.bukkit.craftbukkit.v.command.BukkitCommandWrapper;
-import org.bukkit.craftbukkit.v1_14_R1.command.CraftCommandMap;
+import org.bukkit.craftbukkit.v.command.CraftCommandMap;
-import org.bukkit.craftbukkit.v1_14_R1.help.SimpleHelpMap;
+import org.bukkit.craftbukkit.v.help.SimpleHelpMap;
-import org.bukkit.craftbukkit.v1_14_R1.util.permissions.CraftDefaultPermissions;
+import org.bukkit.craftbukkit.v.util.permissions.CraftDefaultPermissions;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginLoadOrder;
 import org.bukkit.plugin.SimplePluginManager;

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;
 

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;

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;

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;

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;

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;

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.v.block.CraftBlock;
-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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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)

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;

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;

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.v.block.CraftBlockState;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.v.inventory.CraftInventoryDoubleChest;
-import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v.inventory.CraftItemStack;
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
 import org.bukkit.inventory.Inventory;
 import org.spongepowered.asm.mixin.Final;

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;

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.v.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlockState;
+import org.bukkit.craftbukkit.v.block.CraftBlockState;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+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;

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;

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;

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;

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;

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;

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;

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;

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.v.block.CraftBlock;
-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;

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;

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.v.CraftWorld;
-import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock;
+import org.bukkit.craftbukkit.v.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlockState;
+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;

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;

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;

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;

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;

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;

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.v.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v.event.CraftEventFactory;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityInteractEvent;

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;

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;

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.v.block.CraftBlock;
-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.entity.EntityInteractEvent;
 import org.bukkit.event.player.PlayerInteractEvent;

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;

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;

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.v.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_14_R1.util.BlockStateListPopulator;
+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;

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;

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;

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.v.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlockState;
+import org.bukkit.craftbukkit.v.block.CraftBlockState;
-import org.bukkit.craftbukkit.v1_14_R1.util.BlockStateListPopulator;
+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;

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;

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;

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;

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.v.block.CraftBlock;
-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;

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;

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;

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.v.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v.event.CraftEventFactory;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityInteractEvent;

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;

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.v.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v.event.CraftEventFactory;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityInteractEvent;

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;

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.v.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v.event.CraftEventFactory;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityInteractEvent;

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;

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.v.CraftServer;
-import org.bukkit.craftbukkit.v1_14_R1.command.VanillaCommandWrapper;
+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;

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;

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;
 

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.v.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+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;

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.v.CraftServer;
-import org.bukkit.craftbukkit.v1_14_R1.CraftWorld;
+import org.bukkit.craftbukkit.v.CraftWorld;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v.event.CraftEventFactory;
 import org.bukkit.entity.Hanging;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.event.entity.EntityAirChangeEvent;

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.v.attribute.CraftAttributeMap;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityPotionEffectEvent;

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.v.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+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;

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.v.entity.CraftVillager;
-import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
+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;