From cc62a7b625d87d50db1a7bc330a72085c25e3d7b Mon Sep 17 00:00:00 2001 From: Hexeption Date: Sun, 25 Aug 2019 00:31:50 +0100 Subject: [PATCH] Refactored CraftBukkit to Support NMS --- .../advancements/Advancement.java.patch | 20 ++- .../advancements/FunctionManager.java.patch | 20 ++- .../net/minecraft/block/BlockBush.java.patch | 16 +- .../minecraft/block/BlockCactus.java.patch | 16 +- .../net/minecraft/block/BlockCake.java.patch | 12 +- .../block/BlockChorusFlower.java.patch | 2 +- .../net/minecraft/block/BlockCocoa.java.patch | 2 +- .../block/BlockConcretePowder.java.patch | 16 +- .../net/minecraft/block/BlockCrops.java.patch | 2 +- .../block/BlockDaylightDetector.java.patch | 12 +- .../block/BlockDoublePlant.java.patch | 4 +- .../minecraft/block/BlockDropper.java.patch | 11 +- .../block/BlockDynamicLiquid.java.patch | 14 +- .../minecraft/block/BlockFarmland.java.patch | 16 +- .../net/minecraft/block/BlockFire.java.patch | 2 +- .../net/minecraft/block/BlockGrass.java.patch | 4 +- .../net/minecraft/block/BlockIce.java.patch | 12 +- .../minecraft/block/BlockLilyPad.java.patch | 12 +- .../minecraft/block/BlockLiquid.java.patch | 14 +- .../net/minecraft/block/BlockMagma.java.patch | 14 +- .../minecraft/block/BlockMushroom.java.patch | 11 +- .../minecraft/block/BlockMycelium.java.patch | 2 +- .../block/BlockNetherWart.java.patch | 12 +- .../minecraft/block/BlockObserver.java.patch | 2 +- .../block/BlockPistonBase.java.patch | 2 +- .../block/BlockPressurePlate.java.patch | 7 +- .../BlockPressurePlateWeighted.java.patch | 7 +- .../minecraft/block/BlockPumpkin.java.patch | 2 +- .../block/BlockRailPowered.java.patch | 32 ++-- .../block/BlockRedstoneDiode.java.patch | 2 +- .../block/BlockRedstoneLight.java.patch | 2 +- .../block/BlockRedstoneOre.java.patch | 4 +- .../net/minecraft/block/BlockReed.java.patch | 12 +- .../minecraft/block/BlockSapling.java.patch | 19 +-- .../net/minecraft/block/BlockSkull.java.patch | 2 +- .../net/minecraft/block/BlockSnow.java.patch | 18 ++- .../minecraft/block/BlockSnowBlock.java.patch | 12 +- .../block/BlockStaticLiquid.java.patch | 2 +- .../net/minecraft/block/BlockStem.java.patch | 11 +- .../net/minecraft/block/BlockTNT.java.patch | 12 +- .../minecraft/block/BlockTripWire.java.patch | 7 +- .../net/minecraft/block/BlockVine.java.patch | 2 +- .../command/CommandExecuteAt.java.patch | 2 +- .../command/CommandHandler.java.patch | 4 +- .../BehaviorDefaultDispenseItem.java.patch | 2 +- .../BehaviorProjectileDispense.java.patch | 9 +- .../EnchantmentFrostWalker.java.patch | 12 +- .../net/minecraft/entity/Entity.java.patch | 12 +- .../entity/EntityAreaEffectCloud.java.patch | 19 +-- .../entity/EntityLeashKnot.java.patch | 2 +- .../minecraft/entity/EntityLiving.java.patch | 4 +- .../entity/EntityLivingBase.java.patch | 105 ++++++------- .../entity/ai/EntityAIBreakDoor.java.patch | 12 +- .../entity/ai/EntityAIEatGrass.java.patch | 2 +- .../entity/ai/EntityAIFollowOwner.java.patch | 2 +- .../ai/EntityAIHarvestFarmland.java.patch | 16 +- .../entity/ai/EntityAIMate.java.patch | 13 +- .../ai/EntityAIRunAroundLikeCrazy.java.patch | 13 +- .../entity/ai/EntityAITempt.java.patch | 4 +- .../entity/ai/EntityAIVillagerMate.java.patch | 14 +- .../entity/boss/EntityDragon.java.patch | 20 +-- .../entity/boss/EntityWither.java.patch | 26 ++-- .../boss/dragon/phase/PhaseManager.java.patch | 2 +- .../effect/EntityLightningBolt.java.patch | 2 +- .../entity/item/EntityArmorStand.java.patch | 51 +++---- .../entity/item/EntityEnderCrystal.java.patch | 2 +- .../entity/item/EntityEnderPearl.java.patch | 6 +- .../entity/item/EntityExpBottle.java.patch | 7 +- .../entity/item/EntityFallingBlock.java.patch | 22 ++- .../item/EntityFireworkRocket.java.patch | 4 +- .../entity/item/EntityItem.java.patch | 29 ++-- .../entity/item/EntityItemFrame.java.patch | 9 +- .../item/EntityMinecartContainer.java.patch | 2 +- .../entity/item/EntityTNTPrimed.java.patch | 16 +- .../entity/item/EntityXPOrb.java.patch | 28 ++-- .../monster/AbstractSkeleton.java.patch | 9 +- .../entity/monster/EntityCreeper.java.patch | 2 +- .../entity/monster/EntityEnderman.java.patch | 27 ++-- .../monster/EntitySilverfish.java.patch | 16 +- .../entity/monster/EntitySnowman.java.patch | 4 +- .../entity/passive/AbstractHorse.java.patch | 29 ++-- .../entity/passive/EntityCow.java.patch | 4 +- .../entity/passive/EntityOcelot.java.patch | 19 ++- .../entity/passive/EntityParrot.java.patch | 14 +- .../entity/passive/EntityPig.java.patch | 2 +- .../entity/passive/EntityRabbit.java.patch | 16 +- .../entity/passive/EntityVillager.java.patch | 6 +- .../entity/passive/EntityWolf.java.patch | 2 +- .../entity/player/EntityPlayer.java.patch | 112 ++++++++------ .../entity/player/EntityPlayerMP.java.patch | 95 ++++++------ .../entity/player/InventoryPlayer.java.patch | 2 +- .../entity/projectile/EntityArrow.java.patch | 22 +-- .../projectile/EntityEvokerFangs.java.patch | 14 +- .../projectile/EntityFireball.java.patch | 2 +- .../projectile/EntityFishHook.java.patch | 22 ++- .../projectile/EntityLargeFireball.java.patch | 12 +- .../projectile/EntityLlamaSpit.java.patch | 10 +- .../entity/projectile/EntityPotion.java.patch | 15 +- .../projectile/EntityShulkerBullet.java.patch | 14 +- .../projectile/EntitySmallFireball.java.patch | 11 +- .../projectile/EntityThrowable.java.patch | 18 ++- .../net/minecraft/init/Bootstrap.java.patch | 53 ++++--- .../minecraft/inventory/Container.java.patch | 35 +++-- .../inventory/ContainerBeacon.java.patch | 12 +- .../inventory/ContainerEnchantment.java.patch | 6 +- .../ContainerHorseInventory.java.patch | 4 +- .../inventory/ContainerMerchant.java.patch | 13 +- .../inventory/ContainerPlayer.java.patch | 4 +- .../inventory/ContainerRepair.java.patch | 29 ++-- .../inventory/ContainerWorkbench.java.patch | 4 +- .../minecraft/inventory/IInventory.java.patch | 2 +- .../inventory/InventoryBasic.java.patch | 2 +- .../inventory/InventoryCraftResult.java.patch | 2 +- .../inventory/InventoryCrafting.java.patch | 2 +- .../inventory/InventoryLargeChest.java.patch | 2 +- .../inventory/InventoryMerchant.java.patch | 4 +- .../inventory/SlotFurnaceOutput.java.patch | 7 +- .../net/minecraft/item/ItemArmor.java.patch | 2 +- .../net/minecraft/item/ItemBoat.java.patch | 14 +- patches/net/minecraft/item/ItemBow.java.patch | 9 +- .../net/minecraft/item/ItemBucket.java.patch | 4 +- .../minecraft/item/ItemFireball.java.patch | 12 +- .../item/ItemFlintAndSteel.java.patch | 18 ++- .../item/ItemHangingEntity.java.patch | 7 +- .../net/minecraft/item/ItemLead.java.patch | 7 +- .../net/minecraft/item/ItemLilyPad.java.patch | 17 ++- patches/net/minecraft/item/ItemMap.java.patch | 17 ++- .../minecraft/item/ItemMinecart.java.patch | 2 +- .../net/minecraft/item/ItemStack.java.patch | 53 ++----- .../item/crafting/RecipeRepairItem.java.patch | 7 +- .../item/crafting/ShapedRecipes.java.patch | 13 +- .../item/crafting/ShapelessRecipes.java.patch | 13 +- .../network/NetHandlerPlayServer.java.patch | 141 +++++++++--------- .../minecraft/network/PacketBuffer.java.patch | 2 +- .../net/minecraft/potion/Potion.java.patch | 2 +- .../server/MinecraftServer.java.patch | 61 ++++---- .../dedicated/DedicatedServer.java.patch | 51 ++++--- .../PlayerInteractionManager.java.patch | 40 ++--- .../server/management/PlayerList.java.patch | 93 ++++++------ .../network/NetHandlerLoginServer.java.patch | 25 ++-- .../network/NetHandlerStatusServer.java.patch | 9 +- .../stats/StatisticsManager.java.patch | 12 +- .../CommandBlockBaseLogic.java.patch | 2 +- .../tileentity/MobSpawnerBaseLogic.java.patch | 13 +- .../tileentity/TileEntityBeacon.java.patch | 6 +- .../TileEntityBrewingStand.java.patch | 4 +- .../tileentity/TileEntityChest.java.patch | 17 ++- .../TileEntityCommandBlock.java.patch | 14 +- .../tileentity/TileEntityDispenser.java.patch | 2 +- .../TileEntityEndGateway.java.patch | 17 +-- .../tileentity/TileEntityFurnace.java.patch | 4 +- .../tileentity/TileEntityHopper.java.patch | 27 ++-- .../tileentity/TileEntityNote.java.patch | 14 +- .../TileEntityShulkerBox.java.patch | 2 +- .../tileentity/TileEntitySign.java.patch | 28 ++-- .../net/minecraft/util/FoodStats.java.patch | 4 +- .../village/MerchantRecipe.java.patch | 2 +- .../net/minecraft/world/Explosion.java.patch | 4 +- patches/net/minecraft/world/World.java.patch | 84 ++++++----- .../minecraft/world/WorldServer.java.patch | 95 ++++++------ .../minecraft/world/biome/Biome.java.patch | 11 +- .../minecraft/world/chunk/Chunk.java.patch | 46 +++--- .../world/storage/MapData.java.patch | 28 ++-- .../world/storage/SaveHandler.java.patch | 2 +- .../common/ForgeHooks.java.patch | 26 ++-- .../common/ForgeVersion.java.patch | 10 +- .../event/world/BlockEvent.java.patch | 13 +- .../event/world/ExplosionEvent.java.patch | 17 ++- .../internal/FMLNetworkHandler.java.patch | 6 +- .../java/com/destroystokyo/paper/MCUtil.java | 4 +- .../ServerSchedulerReportingWrapper.java | 2 +- .../paper/profile/CraftPlayerProfile.java | 2 +- .../bukkit/block/CraftCustomContainer.java | 6 +- .../org/bukkit/command/CommandWrapper.java | 6 +- .../craftbukkit/{ => v1_12_R1}/CraftArt.java | 2 +- .../{ => v1_12_R1}/CraftChunk.java | 4 +- .../{ => v1_12_R1}/CraftChunkSnapshot.java | 4 +- .../{ => v1_12_R1}/CraftCrashReport.java | 2 +- .../{ => v1_12_R1}/CraftEffect.java | 2 +- .../{ => v1_12_R1}/CraftEquipmentSlot.java | 2 +- .../{ => v1_12_R1}/CraftIpBanEntry.java | 2 +- .../{ => v1_12_R1}/CraftIpBanList.java | 2 +- .../{ => v1_12_R1}/CraftOfflinePlayer.java | 2 +- .../{ => v1_12_R1}/CraftParticle.java | 2 +- .../{ => v1_12_R1}/CraftProfileBanEntry.java | 2 +- .../{ => v1_12_R1}/CraftProfileBanList.java | 2 +- .../{ => v1_12_R1}/CraftServer.java | 71 ++++----- .../{ => v1_12_R1}/CraftSound.java | 2 +- .../{ => v1_12_R1}/CraftStatistic.java | 4 +- .../{ => v1_12_R1}/CraftTravelAgent.java | 2 +- .../{ => v1_12_R1}/CraftWorld.java | 22 ++- .../{ => v1_12_R1}/CraftWorldBorder.java | 2 +- .../{ => v1_12_R1}/LoggerOutputStream.java | 2 +- .../craftbukkit/{ => v1_12_R1}/Main.java | 5 +- .../{ => v1_12_R1}/Overridden.java | 2 +- .../craftbukkit/{ => v1_12_R1}/TrigMath.java | 2 +- .../advancement/CraftAdvancement.java | 4 +- .../advancement/CraftAdvancementProgress.java | 2 +- .../attribute/CraftAttributeInstance.java | 2 +- .../attribute/CraftAttributeMap.java | 2 +- .../{ => v1_12_R1}/block/CraftBanner.java | 2 +- .../{ => v1_12_R1}/block/CraftBeacon.java | 4 +- .../{ => v1_12_R1}/block/CraftBed.java | 2 +- .../{ => v1_12_R1}/block/CraftBlock.java | 10 +- .../block/CraftBlockEntityState.java | 4 +- .../{ => v1_12_R1}/block/CraftBlockState.java | 10 +- .../block/CraftBrewingStand.java | 4 +- .../{ => v1_12_R1}/block/CraftChest.java | 8 +- .../block/CraftCommandBlock.java | 2 +- .../{ => v1_12_R1}/block/CraftComparator.java | 2 +- .../{ => v1_12_R1}/block/CraftContainer.java | 2 +- .../block/CraftCreatureSpawner.java | 2 +- .../block/CraftDaylightDetector.java | 2 +- .../{ => v1_12_R1}/block/CraftDispenser.java | 8 +- .../{ => v1_12_R1}/block/CraftDropper.java | 6 +- .../block/CraftEnchantingTable.java | 2 +- .../{ => v1_12_R1}/block/CraftEndGateway.java | 2 +- .../{ => v1_12_R1}/block/CraftEnderChest.java | 2 +- .../{ => v1_12_R1}/block/CraftFlowerPot.java | 4 +- .../{ => v1_12_R1}/block/CraftFurnace.java | 4 +- .../{ => v1_12_R1}/block/CraftHopper.java | 4 +- .../{ => v1_12_R1}/block/CraftJukebox.java | 6 +- .../{ => v1_12_R1}/block/CraftLootable.java | 2 +- .../{ => v1_12_R1}/block/CraftNoteBlock.java | 6 +- .../{ => v1_12_R1}/block/CraftShulkerBox.java | 6 +- .../{ => v1_12_R1}/block/CraftSign.java | 4 +- .../{ => v1_12_R1}/block/CraftSkull.java | 2 +- .../block/CraftStructureBlock.java | 4 +- .../{ => v1_12_R1}/boss/CraftBossBar.java | 6 +- .../chunkio/ChunkIOExecutor.java | 4 +- .../chunkio/ChunkIOProvider.java | 4 +- .../{ => v1_12_R1}/chunkio/QueuedChunk.java | 2 +- .../command/ColouredConsoleSender.java | 3 +- .../command/ConsoleCommandCompleter.java | 6 +- .../command/CraftBlockCommandSender.java | 4 +- .../command/CraftConsoleCommandSender.java | 4 +- .../command/CraftFunctionCommandSender.java | 4 +- .../CraftRemoteConsoleCommandSender.java | 2 +- .../command/CraftSimpleCommandMap.java | 4 +- .../command/ModCustomCommand.java | 2 +- .../command/ProxiedNativeCommandSender.java | 2 +- .../command/ServerCommandSender.java | 2 +- .../command/UnknownCommandEvent.java | 2 +- .../command/VanillaCommandWrapper.java | 9 +- .../conversations/ConversationTracker.java | 2 +- .../enchantments/CraftEnchantment.java | 4 +- .../entity/AbstractProjectile.java | 4 +- .../entity/CraftAbstractHorse.java | 6 +- .../{ => v1_12_R1}/entity/CraftAgeable.java | 4 +- .../{ => v1_12_R1}/entity/CraftAmbient.java | 4 +- .../{ => v1_12_R1}/entity/CraftAnimals.java | 4 +- .../entity/CraftAreaEffectCloud.java | 8 +- .../entity/CraftArmorStand.java | 4 +- .../{ => v1_12_R1}/entity/CraftArrow.java | 4 +- .../{ => v1_12_R1}/entity/CraftBat.java | 4 +- .../{ => v1_12_R1}/entity/CraftBlaze.java | 4 +- .../{ => v1_12_R1}/entity/CraftBoat.java | 4 +- .../entity/CraftCaveSpider.java | 4 +- .../entity/CraftChestedHorse.java | 4 +- .../{ => v1_12_R1}/entity/CraftChicken.java | 4 +- .../entity/CraftComplexLivingEntity.java | 4 +- .../entity/CraftComplexPart.java | 4 +- .../{ => v1_12_R1}/entity/CraftCow.java | 4 +- .../{ => v1_12_R1}/entity/CraftCreature.java | 4 +- .../{ => v1_12_R1}/entity/CraftCreeper.java | 4 +- .../entity/CraftCustomEntity.java | 4 +- .../entity/CraftCustomProjectile.java | 4 +- .../{ => v1_12_R1}/entity/CraftDonkey.java | 4 +- .../entity/CraftDragonFireball.java | 4 +- .../{ => v1_12_R1}/entity/CraftEgg.java | 4 +- .../entity/CraftElderGuardian.java | 4 +- .../entity/CraftEnderCrystal.java | 4 +- .../entity/CraftEnderDragon.java | 4 +- .../entity/CraftEnderDragonPart.java | 4 +- .../entity/CraftEnderPearl.java | 4 +- .../entity/CraftEnderSignal.java | 4 +- .../{ => v1_12_R1}/entity/CraftEnderman.java | 6 +- .../{ => v1_12_R1}/entity/CraftEndermite.java | 4 +- .../{ => v1_12_R1}/entity/CraftEntity.java | 6 +- .../{ => v1_12_R1}/entity/CraftEvoker.java | 4 +- .../entity/CraftEvokerFangs.java | 4 +- .../entity/CraftExperienceOrb.java | 4 +- .../entity/CraftFallingBlock.java | 6 +- .../{ => v1_12_R1}/entity/CraftFireball.java | 4 +- .../{ => v1_12_R1}/entity/CraftFirework.java | 6 +- .../{ => v1_12_R1}/entity/CraftFish.java | 4 +- .../{ => v1_12_R1}/entity/CraftFlying.java | 4 +- .../{ => v1_12_R1}/entity/CraftGhast.java | 4 +- .../{ => v1_12_R1}/entity/CraftGiant.java | 4 +- .../{ => v1_12_R1}/entity/CraftGolem.java | 4 +- .../{ => v1_12_R1}/entity/CraftGuardian.java | 4 +- .../{ => v1_12_R1}/entity/CraftHanging.java | 4 +- .../{ => v1_12_R1}/entity/CraftHorse.java | 6 +- .../entity/CraftHumanEntity.java | 23 +-- .../{ => v1_12_R1}/entity/CraftHusk.java | 4 +- .../{ => v1_12_R1}/entity/CraftIllager.java | 4 +- .../entity/CraftIllusioner.java | 4 +- .../{ => v1_12_R1}/entity/CraftIronGolem.java | 4 +- .../{ => v1_12_R1}/entity/CraftItem.java | 6 +- .../{ => v1_12_R1}/entity/CraftItemFrame.java | 8 +- .../entity/CraftLargeFireball.java | 4 +- .../{ => v1_12_R1}/entity/CraftLeash.java | 4 +- .../entity/CraftLightningStrike.java | 4 +- .../entity/CraftLingeringPotion.java | 6 +- .../entity/CraftLivingEntity.java | 12 +- .../{ => v1_12_R1}/entity/CraftLlama.java | 6 +- .../{ => v1_12_R1}/entity/CraftLlamaSpit.java | 4 +- .../{ => v1_12_R1}/entity/CraftMagmaCube.java | 4 +- .../{ => v1_12_R1}/entity/CraftMinecart.java | 6 +- .../entity/CraftMinecartChest.java | 6 +- .../entity/CraftMinecartCommand.java | 4 +- .../entity/CraftMinecartFurnace.java | 4 +- .../entity/CraftMinecartHopper.java | 6 +- .../entity/CraftMinecartMobSpawner.java | 4 +- .../entity/CraftMinecartRideable.java | 4 +- .../entity/CraftMinecartTNT.java | 4 +- .../{ => v1_12_R1}/entity/CraftMonster.java | 4 +- .../{ => v1_12_R1}/entity/CraftMule.java | 4 +- .../entity/CraftMushroomCow.java | 4 +- .../{ => v1_12_R1}/entity/CraftOcelot.java | 4 +- .../{ => v1_12_R1}/entity/CraftPainting.java | 8 +- .../{ => v1_12_R1}/entity/CraftParrot.java | 4 +- .../{ => v1_12_R1}/entity/CraftPig.java | 4 +- .../{ => v1_12_R1}/entity/CraftPigZombie.java | 4 +- .../{ => v1_12_R1}/entity/CraftPlayer.java | 38 ++--- .../{ => v1_12_R1}/entity/CraftPolarBear.java | 4 +- .../entity/CraftProjectile.java | 4 +- .../{ => v1_12_R1}/entity/CraftRabbit.java | 6 +- .../{ => v1_12_R1}/entity/CraftSheep.java | 4 +- .../{ => v1_12_R1}/entity/CraftShulker.java | 4 +- .../entity/CraftShulkerBullet.java | 4 +- .../entity/CraftSilverfish.java | 4 +- .../{ => v1_12_R1}/entity/CraftSkeleton.java | 4 +- .../entity/CraftSkeletonHorse.java | 4 +- .../{ => v1_12_R1}/entity/CraftSlime.java | 4 +- .../entity/CraftSmallFireball.java | 4 +- .../{ => v1_12_R1}/entity/CraftSnowball.java | 4 +- .../{ => v1_12_R1}/entity/CraftSnowman.java | 4 +- .../entity/CraftSpectralArrow.java | 4 +- .../entity/CraftSpellcaster.java | 4 +- .../{ => v1_12_R1}/entity/CraftSpider.java | 4 +- .../entity/CraftSplashPotion.java | 6 +- .../{ => v1_12_R1}/entity/CraftSquid.java | 4 +- .../{ => v1_12_R1}/entity/CraftStray.java | 4 +- .../{ => v1_12_R1}/entity/CraftTNTPrimed.java | 4 +- .../entity/CraftTameableAnimal.java | 4 +- .../entity/CraftThrownExpBottle.java | 4 +- .../entity/CraftThrownPotion.java | 8 +- .../entity/CraftTippedArrow.java | 6 +- .../{ => v1_12_R1}/entity/CraftVehicle.java | 4 +- .../{ => v1_12_R1}/entity/CraftVex.java | 4 +- .../{ => v1_12_R1}/entity/CraftVillager.java | 8 +- .../entity/CraftVillagerZombie.java | 4 +- .../entity/CraftVindicator.java | 4 +- .../{ => v1_12_R1}/entity/CraftWaterMob.java | 4 +- .../{ => v1_12_R1}/entity/CraftWeather.java | 4 +- .../{ => v1_12_R1}/entity/CraftWitch.java | 4 +- .../{ => v1_12_R1}/entity/CraftWither.java | 4 +- .../entity/CraftWitherSkeleton.java | 4 +- .../entity/CraftWitherSkull.java | 4 +- .../{ => v1_12_R1}/entity/CraftWolf.java | 4 +- .../{ => v1_12_R1}/entity/CraftZombie.java | 4 +- .../entity/CraftZombieHorse.java | 4 +- .../event/CraftEventFactory.java | 33 ++-- .../generator/CraftChunkData.java | 2 +- .../generator/CustomChunkGenerator.java | 4 +- .../generator/InternalChunkGenerator.java | 2 +- .../generator/NetherChunkGenerator.java | 2 +- .../generator/NormalChunkGenerator.java | 4 +- .../generator/SkyLandsChunkGenerator.java | 2 +- .../help/CommandAliasHelpTopic.java | 2 +- .../{ => v1_12_R1}/help/CustomHelpTopic.java | 2 +- .../help/CustomIndexHelpTopic.java | 2 +- .../help/HelpTopicAmendment.java | 2 +- .../{ => v1_12_R1}/help/HelpYamlReader.java | 2 +- .../help/MultipleCommandAliasHelpTopic.java | 2 +- .../MultipleCommandAliasHelpTopicFactory.java | 2 +- .../{ => v1_12_R1}/help/SimpleHelpMap.java | 6 +- .../inventory/CraftContainer.java | 4 +- .../inventory/CraftCustomModRecipe.java | 2 +- .../inventory/CraftEntityEquipment.java | 4 +- .../inventory/CraftFurnaceRecipe.java | 2 +- .../inventory/CraftInventory.java | 2 +- .../CraftInventoryAbstractHorse.java | 2 +- .../inventory/CraftInventoryAnvil.java | 2 +- .../inventory/CraftInventoryBeacon.java | 2 +- .../inventory/CraftInventoryBrewer.java | 2 +- .../inventory/CraftInventoryCrafting.java | 2 +- .../inventory/CraftInventoryCustom.java | 4 +- .../inventory/CraftInventoryDoubleChest.java | 2 +- .../inventory/CraftInventoryEnchanting.java | 2 +- .../inventory/CraftInventoryFurnace.java | 2 +- .../inventory/CraftInventoryHorse.java | 2 +- .../inventory/CraftInventoryLlama.java | 2 +- .../inventory/CraftInventoryMerchant.java | 2 +- .../inventory/CraftInventoryPlayer.java | 4 +- .../inventory/CraftInventoryView.java | 4 +- .../inventory/CraftItemFactory.java | 2 +- .../inventory/CraftItemStack.java | 12 +- .../inventory/CraftMerchant.java | 2 +- .../inventory/CraftMerchantCustom.java | 2 +- .../inventory/CraftMerchantRecipe.java | 2 +- .../inventory/CraftMetaBanner.java | 4 +- .../inventory/CraftMetaBlockState.java | 50 +++---- .../inventory/CraftMetaBook.java | 9 +- .../inventory/CraftMetaBookSigned.java | 6 +- .../inventory/CraftMetaCharge.java | 4 +- .../inventory/CraftMetaEnchantedBook.java | 5 +- .../inventory/CraftMetaFirework.java | 21 ++- .../inventory/CraftMetaItem.java | 8 +- .../inventory/CraftMetaKnowledgeBook.java | 7 +- .../inventory/CraftMetaLeatherArmor.java | 13 +- .../inventory/CraftMetaMap.java | 5 +- .../inventory/CraftMetaPotion.java | 9 +- .../inventory/CraftMetaSkull.java | 7 +- .../inventory/CraftMetaSpawnEgg.java | 2 +- .../{ => v1_12_R1}/inventory/CraftRecipe.java | 2 +- .../inventory/CraftShapedRecipe.java | 4 +- .../inventory/CraftShapelessRecipe.java | 4 +- .../inventory/InventoryIterator.java | 2 +- .../inventory/InventoryWrapper.java | 6 +- .../inventory/RecipeIterator.java | 2 +- .../{ => v1_12_R1}/map/CraftMapCanvas.java | 2 +- .../{ => v1_12_R1}/map/CraftMapRenderer.java | 2 +- .../{ => v1_12_R1}/map/CraftMapView.java | 6 +- .../{ => v1_12_R1}/map/RenderData.java | 2 +- .../metadata/BlockMetadataStore.java | 2 +- .../metadata/EntityMetadataStore.java | 2 +- .../metadata/PlayerMetadataStore.java | 2 +- .../metadata/WorldMetadataStore.java | 2 +- .../potion/CraftPotionBrewer.java | 2 +- .../potion/CraftPotionEffectType.java | 2 +- .../potion/CraftPotionUtil.java | 2 +- .../CraftBlockProjectileSource.java | 6 +- .../scheduler/CraftAsyncDebugger.java | 2 +- .../scheduler/CraftAsyncScheduler.java | 2 +- .../scheduler/CraftAsyncTask.java | 6 +- .../{ => v1_12_R1}/scheduler/CraftFuture.java | 30 ++-- .../scheduler/CraftScheduler.java | 2 +- .../{ => v1_12_R1}/scheduler/CraftTask.java | 2 +- .../scoreboard/CraftCriteria.java | 2 +- .../scoreboard/CraftObjective.java | 2 +- .../{ => v1_12_R1}/scoreboard/CraftScore.java | 2 +- .../scoreboard/CraftScoreboard.java | 2 +- .../scoreboard/CraftScoreboardComponent.java | 2 +- .../scoreboard/CraftScoreboardManager.java | 6 +- .../CraftScoreboardTranslations.java | 2 +- .../{ => v1_12_R1}/scoreboard/CraftTeam.java | 4 +- .../util/AsynchronousExecutor.java | 2 +- .../util/BlockStateListPopulator.java | 2 +- .../{ => v1_12_R1}/util/CraftChatMessage.java | 2 +- .../util/CraftDamageSource.java | 2 +- .../{ => v1_12_R1}/util/CraftIconCache.java | 2 +- .../util/CraftMagicNumbers.java | 6 +- .../util/CraftNamespacedKey.java | 2 +- .../{ => v1_12_R1}/util/DatFileFilter.java | 2 +- .../util/ForwardLogHandler.java | 2 +- .../{ => v1_12_R1}/util/HashTreeSet.java | 2 +- .../{ => v1_12_R1}/util/LazyHashSet.java | 2 +- .../{ => v1_12_R1}/util/LazyPlayerSet.java | 2 +- .../{ => v1_12_R1}/util/LongHash.java | 2 +- .../{ => v1_12_R1}/util/LongHashSet.java | 2 +- .../util/LongObjectHashMap.java | 2 +- .../{ => v1_12_R1}/util/MojangNameLookup.java | 2 +- .../util/ServerShutdownThread.java | 2 +- .../util/ShortConsoleLogFormatter.java | 2 +- .../util/StructureGrowDelegate.java | 4 +- .../util/TerminalConsoleWriterThread.java | 6 +- .../{ => v1_12_R1}/util/UnsafeList.java | 2 +- .../{ => v1_12_R1}/util/Versioning.java | 4 +- .../{ => v1_12_R1}/util/Waitable.java | 2 +- .../{ => v1_12_R1}/util/WeakCollection.java | 2 +- .../util/permissions/CommandPermissions.java | 2 +- .../permissions/CraftDefaultPermissions.java | 2 +- .../java/org/bukkit/entity/EntityType.java | 2 +- .../bukkit/plugin/java/PluginClassLoader.java | 3 +- .../magmafoundation/magma/api/PlayerAPI.java | 2 +- .../magmafoundation/magma/api/ServerAPI.java | 2 +- 478 files changed, 2262 insertions(+), 1834 deletions(-) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftArt.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftChunk.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftChunkSnapshot.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftCrashReport.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftEffect.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftEquipmentSlot.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftIpBanEntry.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftIpBanList.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftOfflinePlayer.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftParticle.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftProfileBanEntry.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftProfileBanList.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftServer.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftSound.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftStatistic.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftTravelAgent.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftWorld.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/CraftWorldBorder.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/LoggerOutputStream.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/Main.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/Overridden.java (89%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/TrigMath.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/advancement/CraftAdvancement.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/advancement/CraftAdvancementProgress.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/attribute/CraftAttributeInstance.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/attribute/CraftAttributeMap.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftBanner.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftBeacon.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftBed.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftBlock.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftBlockEntityState.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftBlockState.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftBrewingStand.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftChest.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftCommandBlock.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftComparator.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftContainer.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftCreatureSpawner.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftDaylightDetector.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftDispenser.java (87%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftDropper.java (88%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftEnchantingTable.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftEndGateway.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftEnderChest.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftFlowerPot.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftFurnace.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftHopper.java (87%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftJukebox.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftLootable.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftNoteBlock.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftShulkerBox.java (86%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftSign.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftSkull.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/block/CraftStructureBlock.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/boss/CraftBossBar.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/chunkio/ChunkIOExecutor.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/chunkio/ChunkIOProvider.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/chunkio/QueuedChunk.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/ColouredConsoleSender.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/ConsoleCommandCompleter.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/CraftBlockCommandSender.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/CraftConsoleCommandSender.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/CraftFunctionCommandSender.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/CraftRemoteConsoleCommandSender.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/CraftSimpleCommandMap.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/ModCustomCommand.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/ProxiedNativeCommandSender.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/ServerCommandSender.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/UnknownCommandEvent.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/command/VanillaCommandWrapper.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/conversations/ConversationTracker.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/enchantments/CraftEnchantment.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/AbstractProjectile.java (82%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftAbstractHorse.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftAgeable.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftAmbient.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftAnimals.java (81%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftAreaEffectCloud.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftArmorStand.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftArrow.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftBat.java (87%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftBlaze.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftBoat.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftCaveSpider.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftChestedHorse.java (87%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftChicken.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftComplexLivingEntity.java (83%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftComplexPart.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftCow.java (83%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftCreature.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftCreeper.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftCustomEntity.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftCustomProjectile.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftDonkey.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftDragonFireball.java (81%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftEgg.java (83%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftElderGuardian.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftEnderCrystal.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftEnderDragon.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftEnderDragonPart.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftEnderPearl.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftEnderSignal.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftEnderman.java (87%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftEndermite.java (83%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftEntity.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftEvoker.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftEvokerFangs.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftExperienceOrb.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftFallingBlock.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftFireball.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftFirework.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftFish.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftFlying.java (81%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftGhast.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftGiant.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftGolem.java (81%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftGuardian.java (87%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftHanging.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftHorse.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftHumanEntity.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftHusk.java (81%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftIllager.java (82%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftIllusioner.java (86%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftIronGolem.java (88%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftItem.java (86%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftItemFrame.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftLargeFireball.java (88%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftLeash.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftLightningStrike.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftLingeringPotion.java (87%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftLivingEntity.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftLlama.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftLlamaSpit.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMagmaCube.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMinecart.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMinecartChest.java (82%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMinecartCommand.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMinecartFurnace.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMinecartHopper.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMinecartMobSpawner.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMinecartRideable.java (83%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMinecartTNT.java (83%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMonster.java (81%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMule.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftMushroomCow.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftOcelot.java (89%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftPainting.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftParrot.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftPig.java (87%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftPigZombie.java (89%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftPlayer.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftPolarBear.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftProjectile.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftRabbit.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSheep.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftShulker.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftShulkerBullet.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSilverfish.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSkeleton.java (89%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSkeletonHorse.java (86%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSlime.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSmallFireball.java (86%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSnowball.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSnowman.java (88%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSpectralArrow.java (89%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSpellcaster.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSpider.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSplashPotion.java (87%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftSquid.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftStray.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftTNTPrimed.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftTameableAnimal.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftThrownExpBottle.java (86%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftThrownPotion.java (82%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftTippedArrow.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftVehicle.java (77%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftVex.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftVillager.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftVillagerZombie.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftVindicator.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftWaterMob.java (82%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftWeather.java (85%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftWitch.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftWither.java (84%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftWitherSkeleton.java (86%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftWitherSkull.java (89%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftWolf.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftZombie.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/entity/CraftZombieHorse.java (86%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/event/CraftEventFactory.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/generator/CraftChunkData.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/generator/CustomChunkGenerator.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/generator/InternalChunkGenerator.java (83%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/generator/NetherChunkGenerator.java (82%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/generator/NormalChunkGenerator.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/generator/SkyLandsChunkGenerator.java (82%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/help/CommandAliasHelpTopic.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/help/CustomHelpTopic.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/help/CustomIndexHelpTopic.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/help/HelpTopicAmendment.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/help/HelpYamlReader.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/help/MultipleCommandAliasHelpTopic.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/help/MultipleCommandAliasHelpTopicFactory.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/help/SimpleHelpMap.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftContainer.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftCustomModRecipe.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftEntityEquipment.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftFurnaceRecipe.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventory.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryAbstractHorse.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryAnvil.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryBeacon.java (89%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryBrewer.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryCrafting.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryCustom.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryDoubleChest.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryEnchanting.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryFurnace.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryHorse.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryLlama.java (90%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryMerchant.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryPlayer.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftInventoryView.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftItemFactory.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftItemStack.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMerchant.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMerchantCustom.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMerchantRecipe.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaBanner.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaBlockState.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaBook.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaBookSigned.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaCharge.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaEnchantedBook.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaFirework.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaItem.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaKnowledgeBook.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaLeatherArmor.java (88%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaMap.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaPotion.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaSkull.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftMetaSpawnEgg.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftRecipe.java (70%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftShapedRecipe.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/CraftShapelessRecipe.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/InventoryIterator.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/InventoryWrapper.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/inventory/RecipeIterator.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/map/CraftMapCanvas.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/map/CraftMapRenderer.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/map/CraftMapView.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/map/RenderData.java (86%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/metadata/BlockMetadataStore.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/metadata/EntityMetadataStore.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/metadata/PlayerMetadataStore.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/metadata/WorldMetadataStore.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/potion/CraftPotionBrewer.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/potion/CraftPotionEffectType.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/potion/CraftPotionUtil.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/projectiles/CraftBlockProjectileSource.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scheduler/CraftAsyncDebugger.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scheduler/CraftAsyncScheduler.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scheduler/CraftAsyncTask.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scheduler/CraftFuture.java (72%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scheduler/CraftScheduler.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scheduler/CraftTask.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scoreboard/CraftCriteria.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scoreboard/CraftObjective.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scoreboard/CraftScore.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scoreboard/CraftScoreboard.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scoreboard/CraftScoreboardComponent.java (88%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scoreboard/CraftScoreboardManager.java (96%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scoreboard/CraftScoreboardTranslations.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/scoreboard/CraftTeam.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/AsynchronousExecutor.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/BlockStateListPopulator.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/CraftChatMessage.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/CraftDamageSource.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/CraftIconCache.java (86%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/CraftMagicNumbers.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/CraftNamespacedKey.java (93%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/DatFileFilter.java (81%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/ForwardLogHandler.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/HashTreeSet.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/LazyHashSet.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/LazyPlayerSet.java (94%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/LongHash.java (87%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/LongHashSet.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/LongObjectHashMap.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/MojangNameLookup.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/ServerShutdownThread.java (92%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/ShortConsoleLogFormatter.java (97%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/StructureGrowDelegate.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/TerminalConsoleWriterThread.java (91%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/UnsafeList.java (99%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/Versioning.java (50%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/Waitable.java (95%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/WeakCollection.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/permissions/CommandPermissions.java (98%) rename src/main/java/org/bukkit/craftbukkit/{ => v1_12_R1}/util/permissions/CraftDefaultPermissions.java (92%) diff --git a/patches/net/minecraft/advancements/Advancement.java.patch b/patches/net/minecraft/advancements/Advancement.java.patch index 41b11fca..846c6b2c 100644 --- a/patches/net/minecraft/advancements/Advancement.java.patch +++ b/patches/net/minecraft/advancements/Advancement.java.patch @@ -1,14 +1,22 @@ --- ../src-base/minecraft/net/minecraft/advancements/Advancement.java +++ ../src-work/minecraft/net/minecraft/advancements/Advancement.java -@@ -32,6 +32,7 @@ +@@ -21,6 +21,7 @@ + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; + import org.apache.commons.lang3.ArrayUtils; ++import org.bukkit.craftbukkit.v1_12_R1.advancement.CraftAdvancement; + + public class Advancement + { +@@ -32,6 +33,7 @@ private final String[][] requirements; private final Set children = Sets.newLinkedHashSet(); private final ITextComponent displayText; -+ public final org.bukkit.advancement.Advancement bukkit = new org.bukkit.craftbukkit.advancement.CraftAdvancement(this); // CraftBukkit ++ public final org.bukkit.advancement.Advancement bukkit = new CraftAdvancement(this); // CraftBukkit public Advancement(ResourceLocation id, @Nullable Advancement parentIn, @Nullable DisplayInfo displayIn, AdvancementRewards rewardsIn, Map criteriaIn, String[][] requirementsIn) { -@@ -68,9 +69,9 @@ +@@ -68,9 +70,9 @@ } } @@ -20,7 +28,7 @@ } @Nullable -@@ -230,7 +231,7 @@ +@@ -230,7 +232,7 @@ return "Task Advancement{parentId=" + this.parentId + ", display=" + this.display + ", rewards=" + this.rewards + ", criteria=" + this.criteria + ", requirements=" + Arrays.deepToString(this.requirements) + '}'; } @@ -29,7 +37,7 @@ { ResourceLocation resourcelocation = json.has("parent") ? new ResourceLocation(JsonUtils.getString(json, "parent")) : null; DisplayInfo displayinfo = json.has("display") ? DisplayInfo.deserialize(JsonUtils.getJsonObject(json, "display"), context) : null; -@@ -303,11 +304,11 @@ +@@ -303,11 +305,11 @@ } } @@ -43,7 +51,7 @@ { ResourceLocation resourcelocation = buf.readBoolean() ? buf.readResourceLocation() : null; DisplayInfo displayinfo = buf.readBoolean() ? DisplayInfo.read(buf) : null; -@@ -324,7 +325,7 @@ +@@ -324,7 +326,7 @@ } } diff --git a/patches/net/minecraft/advancements/FunctionManager.java.patch b/patches/net/minecraft/advancements/FunctionManager.java.patch index b4333443..db0dc07b 100644 --- a/patches/net/minecraft/advancements/FunctionManager.java.patch +++ b/patches/net/minecraft/advancements/FunctionManager.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/advancements/FunctionManager.java +++ ../src-work/minecraft/net/minecraft/advancements/FunctionManager.java -@@ -27,10 +27,13 @@ +@@ -18,6 +18,7 @@ + import org.apache.commons.io.FilenameUtils; + import org.apache.logging.log4j.LogManager; + import org.apache.logging.log4j.Logger; ++import org.bukkit.craftbukkit.v1_12_R1.command.CraftFunctionCommandSender; + + public class FunctionManager implements ITickable + { +@@ -27,10 +28,13 @@ private final Map functions = Maps.newHashMap(); private String currentGameLoopFunctionId = "-"; private FunctionObject gameLoopFunction; @@ -13,11 +21,11 @@ + + public class CustomFunctionListener implements ICommandSender { + -+ public org.bukkit.command.CommandSender sender = new org.bukkit.craftbukkit.command.CraftFunctionCommandSender(this); ++ public org.bukkit.command.CommandSender sender = new CraftFunctionCommandSender(this); public String getName() { return FunctionManager.this.currentGameLoopFunctionId; -@@ -39,6 +42,11 @@ +@@ -39,6 +43,11 @@ { return permLevel <= 2; } @@ -29,7 +37,7 @@ public World getEntityWorld() { return FunctionManager.this.server.worlds[0]; -@@ -101,7 +109,7 @@ +@@ -101,7 +110,7 @@ { if (this.commandQueue.size() < i) { @@ -38,7 +46,7 @@ } return 0; -@@ -118,7 +126,7 @@ +@@ -118,7 +127,7 @@ for (int k = afunctionobject$entry.length - 1; k >= 0; --k) { @@ -47,7 +55,7 @@ } while (true) -@@ -192,26 +200,26 @@ +@@ -192,26 +201,26 @@ } public static class QueuedCommand diff --git a/patches/net/minecraft/block/BlockBush.java.patch b/patches/net/minecraft/block/BlockBush.java.patch index a6bb3822..e1c594e6 100644 --- a/patches/net/minecraft/block/BlockBush.java.patch +++ b/patches/net/minecraft/block/BlockBush.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/block/BlockBush.java +++ ../src-work/minecraft/net/minecraft/block/BlockBush.java -@@ -41,7 +41,7 @@ +@@ -16,6 +16,7 @@ + import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockBush extends Block implements net.minecraftforge.common.IPlantable + { +@@ -41,7 +42,7 @@ public boolean canPlaceBlockAt(World worldIn, BlockPos pos) { IBlockState soil = worldIn.getBlockState(pos.down()); @@ -9,17 +17,17 @@ } protected boolean canSustainBush(IBlockState state) -@@ -64,6 +64,9 @@ +@@ -64,6 +65,9 @@ { if (!this.canBlockStay(worldIn, pos, state)) { -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(worldIn, pos).isCancelled()) { ++ if (CraftEventFactory.callBlockPhysicsEvent(worldIn, pos).isCancelled()) { + return; + } this.dropBlockAsItem(worldIn, pos, state, 0); worldIn.setBlockState(pos, Blocks.AIR.getDefaultState(), 3); } -@@ -74,7 +77,7 @@ +@@ -74,7 +78,7 @@ if (state.getBlock() == this) //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check. { IBlockState soil = worldIn.getBlockState(pos.down()); diff --git a/patches/net/minecraft/block/BlockCactus.java.patch b/patches/net/minecraft/block/BlockCactus.java.patch index fb9070b9..e86df54c 100644 --- a/patches/net/minecraft/block/BlockCactus.java.patch +++ b/patches/net/minecraft/block/BlockCactus.java.patch @@ -1,14 +1,22 @@ --- ../src-base/minecraft/net/minecraft/block/BlockCactus.java +++ ../src-work/minecraft/net/minecraft/block/BlockCactus.java -@@ -19,6 +19,7 @@ +@@ -9,7 +9,6 @@ + import net.minecraft.block.state.IBlockState; + import net.minecraft.creativetab.CreativeTabs; + import net.minecraft.entity.Entity; +-import net.minecraft.init.Blocks; + import net.minecraft.util.BlockRenderLayer; + import net.minecraft.util.DamageSource; + import net.minecraft.util.EnumFacing; +@@ -19,6 +18,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockCactus extends Block implements net.minecraftforge.common.IPlantable { -@@ -54,10 +55,11 @@ +@@ -54,10 +54,11 @@ if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(worldIn, blockpos, state, true)) { @@ -22,7 +30,7 @@ worldIn.setBlockState(pos, iblockstate, 4); iblockstate.neighborChanged(worldIn, blockpos, this, pos); } -@@ -123,7 +125,9 @@ +@@ -123,7 +124,9 @@ public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) { diff --git a/patches/net/minecraft/block/BlockCake.java.patch b/patches/net/minecraft/block/BlockCake.java.patch index 71bf68cf..d8f1e6bc 100644 --- a/patches/net/minecraft/block/BlockCake.java.patch +++ b/patches/net/minecraft/block/BlockCake.java.patch @@ -8,7 +8,15 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -@@ -71,7 +72,17 @@ +@@ -21,6 +22,7 @@ + import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockCake extends Block + { +@@ -71,7 +73,17 @@ else { player.addStat(StatList.CAKE_SLICES_EATEN); @@ -16,7 +24,7 @@ player.getFoodStats().addStats(2, 0.1F); + int oldFoodLevel = player.getFoodStats().foodLevel; + -+ org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, 2 + oldFoodLevel); ++ org.bukkit.event.entity.FoodLevelChangeEvent event = CraftEventFactory.callFoodLevelChangeEvent(player, 2 + oldFoodLevel); + + if (!event.isCancelled()) { + player.getFoodStats().addStats(event.getFoodLevel() - oldFoodLevel, 0.1F); diff --git a/patches/net/minecraft/block/BlockChorusFlower.java.patch b/patches/net/minecraft/block/BlockChorusFlower.java.patch index b610b1c4..64c6b2a1 100644 --- a/patches/net/minecraft/block/BlockChorusFlower.java.patch +++ b/patches/net/minecraft/block/BlockChorusFlower.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockChorusFlower extends Block { diff --git a/patches/net/minecraft/block/BlockCocoa.java.patch b/patches/net/minecraft/block/BlockCocoa.java.patch index 360cec67..c4985654 100644 --- a/patches/net/minecraft/block/BlockCocoa.java.patch +++ b/patches/net/minecraft/block/BlockCocoa.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockCocoa extends BlockHorizontal implements IGrowable { diff --git a/patches/net/minecraft/block/BlockConcretePowder.java.patch b/patches/net/minecraft/block/BlockConcretePowder.java.patch index bdd3d9c3..e08fdf5e 100644 --- a/patches/net/minecraft/block/BlockConcretePowder.java.patch +++ b/patches/net/minecraft/block/BlockConcretePowder.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/block/BlockConcretePowder.java +++ ../src-work/minecraft/net/minecraft/block/BlockConcretePowder.java -@@ -29,9 +29,8 @@ +@@ -15,6 +15,7 @@ + import net.minecraft.util.math.BlockPos; + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockConcretePowder extends BlockFalling + { +@@ -29,9 +30,8 @@ public void onEndFalling(World worldIn, BlockPos pos, IBlockState p_176502_3_, IBlockState p_176502_4_) { @@ -8,16 +16,16 @@ - { - worldIn.setBlockState(pos, Blocks.CONCRETE.getDefaultState().withProperty(BlockColored.COLOR, p_176502_3_.getValue(COLOR)), 3); + if (p_176502_4_.getMaterial().isLiquid() && worldIn.getBlockState(pos).getBlock() != Blocks.CONCRETE) { // CraftBukkit - don't double concrete -+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(worldIn, pos, Blocks.CONCRETE.getDefaultState().withProperty(BlockColored.COLOR, p_176502_3_.getValue(BlockConcretePowder.COLOR)), null); // CraftBukkit ++ CraftEventFactory.handleBlockFormEvent(worldIn, pos, Blocks.CONCRETE.getDefaultState().withProperty(BlockColored.COLOR, p_176502_3_.getValue(BlockConcretePowder.COLOR)), null); // CraftBukkit } } -@@ -55,7 +54,7 @@ +@@ -55,7 +55,7 @@ if (flag) { - worldIn.setBlockState(pos, Blocks.CONCRETE.getDefaultState().withProperty(BlockColored.COLOR, state.getValue(COLOR)), 3); -+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(worldIn, pos, Blocks.CONCRETE.getDefaultState().withProperty(BlockColored.COLOR, state.getValue(BlockConcretePowder.COLOR)), null); ++ CraftEventFactory.handleBlockFormEvent(worldIn, pos, Blocks.CONCRETE.getDefaultState().withProperty(BlockColored.COLOR, state.getValue(BlockConcretePowder.COLOR)), null); } return flag; diff --git a/patches/net/minecraft/block/BlockCrops.java.patch b/patches/net/minecraft/block/BlockCrops.java.patch index a6cfdd52..47e07476 100644 --- a/patches/net/minecraft/block/BlockCrops.java.patch +++ b/patches/net/minecraft/block/BlockCrops.java.patch @@ -4,7 +4,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockCrops extends BlockBush implements IGrowable { diff --git a/patches/net/minecraft/block/BlockDaylightDetector.java.patch b/patches/net/minecraft/block/BlockDaylightDetector.java.patch index 28facfca..c2cded10 100644 --- a/patches/net/minecraft/block/BlockDaylightDetector.java.patch +++ b/patches/net/minecraft/block/BlockDaylightDetector.java.patch @@ -1,10 +1,18 @@ --- ../src-base/minecraft/net/minecraft/block/BlockDaylightDetector.java +++ ../src-work/minecraft/net/minecraft/block/BlockDaylightDetector.java -@@ -76,6 +76,7 @@ +@@ -24,6 +24,7 @@ + import net.minecraft.world.EnumSkyBlock; + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockDaylightDetector extends BlockContainer + { +@@ -76,6 +77,7 @@ if (((Integer)iblockstate.getValue(POWER)).intValue() != i) { -+ i = org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(worldIn, pos.getX(), pos.getY(), pos.getZ(), iblockstate.getValue(POWER), i).getNewCurrent(); ++ i = CraftEventFactory.callRedstoneChange(worldIn, pos.getX(), pos.getY(), pos.getZ(), iblockstate.getValue(POWER), i).getNewCurrent(); worldIn.setBlockState(pos, iblockstate.withProperty(POWER, Integer.valueOf(i)), 3); } } diff --git a/patches/net/minecraft/block/BlockDoublePlant.java.patch b/patches/net/minecraft/block/BlockDoublePlant.java.patch index 0748a837..0d1a4669 100644 --- a/patches/net/minecraft/block/BlockDoublePlant.java.patch +++ b/patches/net/minecraft/block/BlockDoublePlant.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -+import net.minecraft.block.Block.EnumOffsetType; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + public class BlockDoublePlant extends BlockBush implements IGrowable, net.minecraftforge.common.IShearable { @@ -58,7 +58,7 @@ if (!this.canBlockStay(worldIn, pos, state)) { - boolean flag = state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER; -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(worldIn, pos).isCancelled()) { ++ if (CraftEventFactory.callBlockPhysicsEvent(worldIn, pos).isCancelled()) { + return; + } + boolean flag = state.getValue(HALF) == EnumBlockHalf.UPPER; diff --git a/patches/net/minecraft/block/BlockDropper.java.patch b/patches/net/minecraft/block/BlockDropper.java.patch index 217ad4ad..510e195c 100644 --- a/patches/net/minecraft/block/BlockDropper.java.patch +++ b/patches/net/minecraft/block/BlockDropper.java.patch @@ -8,16 +8,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityDispenser; -@@ -11,6 +12,8 @@ +@@ -11,6 +12,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryDoubleChest; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.event.inventory.InventoryMoveItemEvent; public class BlockDropper extends BlockDispenser { -@@ -26,7 +29,7 @@ +@@ -26,7 +30,7 @@ return new TileEntityDropper(); } @@ -26,7 +27,7 @@ { BlockSourceImpl blocksourceimpl = new BlockSourceImpl(worldIn, pos); TileEntityDispenser tileentitydispenser = (TileEntityDispenser)blocksourceimpl.getBlockTileEntity(); -@@ -56,9 +59,22 @@ +@@ -56,9 +60,22 @@ } else { @@ -35,7 +36,7 @@ + org.bukkit.inventory.Inventory destinationInventory; + // Have to special case large chests as they work oddly + if (iinventory instanceof InventoryLargeChest) { -+ destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) iinventory); ++ destinationInventory = new CraftInventoryDoubleChest((InventoryLargeChest) iinventory); + } else { + destinationInventory = iinventory.getOwner().getInventory(); + } diff --git a/patches/net/minecraft/block/BlockDynamicLiquid.java.patch b/patches/net/minecraft/block/BlockDynamicLiquid.java.patch index 0e966c15..ef2e5f5e 100644 --- a/patches/net/minecraft/block/BlockDynamicLiquid.java.patch +++ b/patches/net/minecraft/block/BlockDynamicLiquid.java.patch @@ -1,15 +1,17 @@ --- ../src-base/minecraft/net/minecraft/block/BlockDynamicLiquid.java +++ ../src-work/minecraft/net/minecraft/block/BlockDynamicLiquid.java -@@ -9,6 +9,8 @@ +@@ -9,6 +9,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import org.bukkit.block.BlockFace; +import org.bukkit.event.block.BlockFromToEvent; ++import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlock; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockDynamicLiquid extends BlockLiquid { -@@ -82,7 +84,7 @@ +@@ -82,7 +86,7 @@ } } @@ -18,7 +20,7 @@ { k *= 4; } -@@ -113,14 +115,22 @@ +@@ -113,14 +117,22 @@ this.placeStaticBlock(worldIn, pos, state); } @@ -37,19 +39,19 @@ { - worldIn.setBlockState(pos.down(), net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(worldIn, pos.down(), pos, Blocks.STONE.getDefaultState())); - this.triggerMixEffects(worldIn, pos.down()); -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(worldIn, pos.down(), net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(worldIn, pos.down(), pos, Blocks.STONE.getDefaultState()), null)) { ++ if (CraftEventFactory.handleBlockFormEvent(worldIn, pos.down(), net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(worldIn, pos.down(), pos, Blocks.STONE.getDefaultState()), null)) { + this.triggerMixEffects(worldIn, pos.down()); + } return; } -@@ -150,14 +160,20 @@ +@@ -150,14 +162,20 @@ for (EnumFacing enumfacing1 : set) { - this.tryFlowInto(worldIn, pos.offset(enumfacing1), worldIn.getBlockState(pos.offset(enumfacing1)), k1); + // CraftBukkit start -+ BlockFromToEvent event = new BlockFromToEvent(source, org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(enumfacing1)); ++ BlockFromToEvent event = new BlockFromToEvent(source, CraftBlock.notchToBlockFace(enumfacing1)); + worldIn.getServer().getPluginManager().callEvent(event); + + if (!event.isCancelled()) { diff --git a/patches/net/minecraft/block/BlockFarmland.java.patch b/patches/net/minecraft/block/BlockFarmland.java.patch index 33ac0e60..93ea2f97 100644 --- a/patches/net/minecraft/block/BlockFarmland.java.patch +++ b/patches/net/minecraft/block/BlockFarmland.java.patch @@ -1,15 +1,23 @@ --- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java +++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java -@@ -19,6 +19,8 @@ +@@ -8,7 +8,6 @@ + import net.minecraft.block.state.BlockStateContainer; + import net.minecraft.block.state.IBlockState; + import net.minecraft.entity.Entity; +-import net.minecraft.entity.EntityLivingBase; + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.init.Blocks; + import net.minecraft.item.Item; +@@ -19,6 +18,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.entity.EntityInteractEvent; public class BlockFarmland extends Block { -@@ -72,16 +74,36 @@ +@@ -72,16 +73,36 @@ public void onFallenUpon(World worldIn, BlockPos pos, Entity entityIn, float fallDistance) { @@ -47,7 +55,7 @@ p_190970_0_.setBlockState(worldIn, Blocks.DIRT.getDefaultState()); AxisAlignedBB axisalignedbb = field_194405_c.offset(worldIn); -@@ -95,7 +117,7 @@ +@@ -95,7 +116,7 @@ private boolean hasCrops(World worldIn, BlockPos pos) { Block block = worldIn.getBlockState(pos.up()).getBlock(); diff --git a/patches/net/minecraft/block/BlockFire.java.patch b/patches/net/minecraft/block/BlockFire.java.patch index 96963068..b4ce852f 100644 --- a/patches/net/minecraft/block/BlockFire.java.patch +++ b/patches/net/minecraft/block/BlockFire.java.patch @@ -7,7 +7,7 @@ -import net.minecraft.world.WorldProviderEnd; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.block.BlockBurnEvent; +import org.bukkit.event.block.BlockSpreadEvent; diff --git a/patches/net/minecraft/block/BlockGrass.java.patch b/patches/net/minecraft/block/BlockGrass.java.patch index 8001a5b1..7ad24405 100644 --- a/patches/net/minecraft/block/BlockGrass.java.patch +++ b/patches/net/minecraft/block/BlockGrass.java.patch @@ -5,8 +5,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.block.BlockState; -+import org.bukkit.craftbukkit.event.CraftEventFactory; -+import org.bukkit.craftbukkit.util.CraftMagicNumbers; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.event.block.BlockFadeEvent; +import org.bukkit.event.block.BlockSpreadEvent; diff --git a/patches/net/minecraft/block/BlockIce.java.patch b/patches/net/minecraft/block/BlockIce.java.patch index 83339cdb..f74d987a 100644 --- a/patches/net/minecraft/block/BlockIce.java.patch +++ b/patches/net/minecraft/block/BlockIce.java.patch @@ -1,10 +1,18 @@ --- ../src-base/minecraft/net/minecraft/block/BlockIce.java +++ ../src-work/minecraft/net/minecraft/block/BlockIce.java -@@ -86,6 +86,9 @@ +@@ -19,6 +19,7 @@ + import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockIce extends BlockBreakable + { +@@ -86,6 +87,9 @@ protected void turnIntoWater(World worldIn, BlockPos pos) { -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(worldIn.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), worldIn.provider.doesWaterVaporize() ? Blocks.AIR : Blocks.WATER).isCancelled()) { ++ if (CraftEventFactory.callBlockFadeEvent(worldIn.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), worldIn.provider.doesWaterVaporize() ? Blocks.AIR : Blocks.WATER).isCancelled()) { + return; + } if (worldIn.provider.doesWaterVaporize()) diff --git a/patches/net/minecraft/block/BlockLilyPad.java.patch b/patches/net/minecraft/block/BlockLilyPad.java.patch index a69a237c..7943aaf3 100644 --- a/patches/net/minecraft/block/BlockLilyPad.java.patch +++ b/patches/net/minecraft/block/BlockLilyPad.java.patch @@ -1,11 +1,19 @@ --- ../src-base/minecraft/net/minecraft/block/BlockLilyPad.java +++ ../src-work/minecraft/net/minecraft/block/BlockLilyPad.java -@@ -34,7 +34,7 @@ +@@ -12,6 +12,7 @@ + import net.minecraft.util.math.BlockPos; + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockLilyPad extends BlockBush + { +@@ -34,7 +35,7 @@ { super.onEntityCollidedWithBlock(worldIn, pos, state, entityIn); - if (entityIn instanceof EntityBoat) -+ if (entityIn instanceof EntityBoat && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityIn, pos, Blocks.AIR, 0).isCancelled()) ++ if (entityIn instanceof EntityBoat && !CraftEventFactory.callEntityChangeBlockEvent(entityIn, pos, Blocks.AIR, 0).isCancelled()) { worldIn.destroyBlock(new BlockPos(pos), true); } diff --git a/patches/net/minecraft/block/BlockLiquid.java.patch b/patches/net/minecraft/block/BlockLiquid.java.patch index 51b1bfbc..86f76551 100644 --- a/patches/net/minecraft/block/BlockLiquid.java.patch +++ b/patches/net/minecraft/block/BlockLiquid.java.patch @@ -1,11 +1,19 @@ --- ../src-base/minecraft/net/minecraft/block/BlockLiquid.java +++ ../src-work/minecraft/net/minecraft/block/BlockLiquid.java -@@ -285,14 +285,18 @@ +@@ -27,6 +27,7 @@ + import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public abstract class BlockLiquid extends Block + { +@@ -285,14 +286,18 @@ if (integer.intValue() == 0) { worldIn.setBlockState(pos, net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(worldIn, pos, pos, Blocks.OBSIDIAN.getDefaultState())); - this.triggerMixEffects(worldIn, pos); -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(worldIn, pos, Blocks.OBSIDIAN.getDefaultState(), null)) { ++ if (CraftEventFactory.handleBlockFormEvent(worldIn, pos, Blocks.OBSIDIAN.getDefaultState(), null)) { + this.triggerMixEffects(worldIn, pos); + } return true; @@ -15,7 +23,7 @@ { worldIn.setBlockState(pos, net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(worldIn, pos, pos, Blocks.COBBLESTONE.getDefaultState())); - this.triggerMixEffects(worldIn, pos); -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(worldIn, pos, Blocks.COBBLESTONE.getDefaultState(), null)) { ++ if (CraftEventFactory.handleBlockFormEvent(worldIn, pos, Blocks.COBBLESTONE.getDefaultState(), null)) { + this.triggerMixEffects(worldIn, pos); + } return true; diff --git a/patches/net/minecraft/block/BlockMagma.java.patch b/patches/net/minecraft/block/BlockMagma.java.patch index 19cffe8d..4d3cd93c 100644 --- a/patches/net/minecraft/block/BlockMagma.java.patch +++ b/patches/net/minecraft/block/BlockMagma.java.patch @@ -1,12 +1,20 @@ --- ../src-base/minecraft/net/minecraft/block/BlockMagma.java +++ ../src-work/minecraft/net/minecraft/block/BlockMagma.java -@@ -40,7 +40,9 @@ +@@ -20,6 +20,7 @@ + import net.minecraft.world.WorldServer; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockMagma extends Block + { +@@ -40,7 +41,9 @@ { if (!entityIn.isImmuneToFire() && entityIn instanceof EntityLivingBase && !EnchantmentHelper.hasFrostWalkerEnchantment((EntityLivingBase)entityIn)) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = worldIn.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()); ++ CraftEventFactory.blockDamage = worldIn.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()); entityIn.attackEntityFrom(DamageSource.HOT_FLOOR, 1.0F); -+ org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; ++ CraftEventFactory.blockDamage = null; } super.onEntityWalk(worldIn, pos, entityIn); diff --git a/patches/net/minecraft/block/BlockMushroom.java.patch b/patches/net/minecraft/block/BlockMushroom.java.patch index b4e8c32d..6e466d64 100644 --- a/patches/net/minecraft/block/BlockMushroom.java.patch +++ b/patches/net/minecraft/block/BlockMushroom.java.patch @@ -1,16 +1,17 @@ --- ../src-base/minecraft/net/minecraft/block/BlockMushroom.java +++ ../src-work/minecraft/net/minecraft/block/BlockMushroom.java -@@ -9,6 +9,9 @@ +@@ -9,6 +9,10 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenBigMushroom; import net.minecraft.world.gen.feature.WorldGenerator; +import org.bukkit.TreeType; +import org.bukkit.block.BlockState; +import org.bukkit.event.block.BlockSpreadEvent; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; public class BlockMushroom extends BlockBush implements IGrowable { -@@ -26,7 +29,8 @@ +@@ -26,7 +30,8 @@ public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { @@ -20,7 +21,7 @@ { int i = 5; int j = 4; -@@ -58,7 +62,17 @@ +@@ -58,7 +63,17 @@ if (worldIn.isAirBlock(blockpos1) && this.canBlockStay(worldIn, blockpos1, this.getDefaultState())) { @@ -28,7 +29,7 @@ +// worldIn.setBlockState(blockpos1, this.getDefaultState(), 2); + org.bukkit.World bworld = worldIn.getWorld(); + BlockState blockState = bworld.getBlockAt(blockpos1.getX(), blockpos1.getY(), blockpos1.getZ()).getState(); -+ blockState.setType(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(this)); // nms: this.id, 0, 2 ++ blockState.setType(CraftMagicNumbers.getMaterial(this)); // nms: this.id, 0, 2 + + BlockSpreadEvent event = new BlockSpreadEvent(blockState.getBlock(), bworld.getBlockAt(sourceX, sourceY, sourceZ), blockState); + worldIn.getServer().getPluginManager().callEvent(event); @@ -39,7 +40,7 @@ } } } -@@ -105,10 +119,12 @@ +@@ -105,10 +120,12 @@ if (this == Blocks.BROWN_MUSHROOM) { diff --git a/patches/net/minecraft/block/BlockMycelium.java.patch b/patches/net/minecraft/block/BlockMycelium.java.patch index a4dbc573..4436674f 100644 --- a/patches/net/minecraft/block/BlockMycelium.java.patch +++ b/patches/net/minecraft/block/BlockMycelium.java.patch @@ -5,7 +5,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.block.BlockState; -+import org.bukkit.craftbukkit.util.CraftMagicNumbers; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.event.block.BlockFadeEvent; +import org.bukkit.event.block.BlockSpreadEvent; diff --git a/patches/net/minecraft/block/BlockNetherWart.java.patch b/patches/net/minecraft/block/BlockNetherWart.java.patch index 2b41af38..5312c1db 100644 --- a/patches/net/minecraft/block/BlockNetherWart.java.patch +++ b/patches/net/minecraft/block/BlockNetherWart.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java +++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java -@@ -49,10 +49,11 @@ +@@ -16,6 +16,7 @@ + import net.minecraft.util.math.BlockPos; + import net.minecraft.world.IBlockAccess; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockNetherWart extends BlockBush + { +@@ -49,10 +50,11 @@ { int i = ((Integer)state.getValue(AGE)).intValue(); @@ -10,7 +18,7 @@ IBlockState newState = state.withProperty(AGE, Integer.valueOf(i + 1)); - worldIn.setBlockState(pos, newState, 2); +// worldIn.setBlockState(pos, newState, 2); -+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(worldIn, pos.getX(), pos.getY(), pos.getZ(), this, getMetaFromState(newState)); ++ CraftEventFactory.handleBlockGrowEvent(worldIn, pos.getX(), pos.getY(), pos.getZ(), this, getMetaFromState(newState)); net.minecraftforge.common.ForgeHooks.onCropsGrowPost(worldIn, pos, state, newState); } diff --git a/patches/net/minecraft/block/BlockObserver.java.patch b/patches/net/minecraft/block/BlockObserver.java.patch index 0c196a4b..f97c595a 100644 --- a/patches/net/minecraft/block/BlockObserver.java.patch +++ b/patches/net/minecraft/block/BlockObserver.java.patch @@ -4,7 +4,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockObserver extends BlockDirectional { diff --git a/patches/net/minecraft/block/BlockPistonBase.java.patch b/patches/net/minecraft/block/BlockPistonBase.java.patch index 9e7b618c..19acbed8 100644 --- a/patches/net/minecraft/block/BlockPistonBase.java.patch +++ b/patches/net/minecraft/block/BlockPistonBase.java.patch @@ -14,7 +14,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.block.CraftBlock; ++import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlock; +import org.bukkit.event.block.BlockPistonExtendEvent; +import org.bukkit.event.block.BlockPistonRetractEvent; diff --git a/patches/net/minecraft/block/BlockPressurePlate.java.patch b/patches/net/minecraft/block/BlockPressurePlate.java.patch index 4da9c700..eecaefca 100644 --- a/patches/net/minecraft/block/BlockPressurePlate.java.patch +++ b/patches/net/minecraft/block/BlockPressurePlate.java.patch @@ -1,10 +1,11 @@ --- ../src-base/minecraft/net/minecraft/block/BlockPressurePlate.java +++ ../src-work/minecraft/net/minecraft/block/BlockPressurePlate.java -@@ -14,13 +14,14 @@ +@@ -14,13 +14,15 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import org.bukkit.event.entity.EntityInteractEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockPressurePlate extends BlockBasePressurePlate { @@ -17,7 +18,7 @@ { super(materialIn); this.setDefaultState(this.blockState.getBaseState().withProperty(POWERED, Boolean.valueOf(false))); -@@ -82,6 +83,24 @@ +@@ -82,6 +84,24 @@ { for (Entity entity : list) { @@ -27,7 +28,7 @@ + org.bukkit.event.Cancellable cancellable; + + if (entity instanceof EntityPlayer) { -+ cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent((EntityPlayer) entity, org.bukkit.event.block.Action.PHYSICAL, pos, null, null, null); ++ cancellable = CraftEventFactory.callPlayerInteractEvent((EntityPlayer) entity, org.bukkit.event.block.Action.PHYSICAL, pos, null, null, null); + } else { + cancellable = new EntityInteractEvent(entity.getBukkitEntity(), bworld.getBlockAt(pos.getX(), pos.getY(), pos.getZ())); + manager.callEvent((EntityInteractEvent) cancellable); diff --git a/patches/net/minecraft/block/BlockPressurePlateWeighted.java.patch b/patches/net/minecraft/block/BlockPressurePlateWeighted.java.patch index 33677720..073b6145 100644 --- a/patches/net/minecraft/block/BlockPressurePlateWeighted.java.patch +++ b/patches/net/minecraft/block/BlockPressurePlateWeighted.java.patch @@ -1,14 +1,15 @@ --- ../src-base/minecraft/net/minecraft/block/BlockPressurePlateWeighted.java +++ ../src-work/minecraft/net/minecraft/block/BlockPressurePlateWeighted.java -@@ -13,6 +13,7 @@ +@@ -13,6 +13,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import org.bukkit.event.entity.EntityInteractEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockPressurePlateWeighted extends BlockBasePressurePlate { -@@ -33,8 +34,30 @@ +@@ -33,8 +35,30 @@ protected int computeRedstoneStrength(World worldIn, BlockPos pos) { @@ -23,7 +24,7 @@ + org.bukkit.event.Cancellable cancellable; + + if (entity instanceof EntityPlayer) { -+ cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent((EntityPlayer) entity, org.bukkit.event.block.Action.PHYSICAL, pos, null, null, null); ++ cancellable = CraftEventFactory.callPlayerInteractEvent((EntityPlayer) entity, org.bukkit.event.block.Action.PHYSICAL, pos, null, null, null); + } else { + cancellable = new EntityInteractEvent(entity.getBukkitEntity(), worldIn.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ())); + worldIn.getServer().getPluginManager().callEvent((EntityInteractEvent) cancellable); diff --git a/patches/net/minecraft/block/BlockPumpkin.java.patch b/patches/net/minecraft/block/BlockPumpkin.java.patch index 0b4c49c8..138fdf2d 100644 --- a/patches/net/minecraft/block/BlockPumpkin.java.patch +++ b/patches/net/minecraft/block/BlockPumpkin.java.patch @@ -4,7 +4,7 @@ import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.util.BlockStateListPopulator; ++import org.bukkit.craftbukkit.v1_12_R1.util.BlockStateListPopulator; +import org.bukkit.event.entity.CreatureSpawnEvent; public class BlockPumpkin extends BlockHorizontal diff --git a/patches/net/minecraft/block/BlockRailPowered.java.patch b/patches/net/minecraft/block/BlockRailPowered.java.patch index 23179db4..b1ec7a76 100644 --- a/patches/net/minecraft/block/BlockRailPowered.java.patch +++ b/patches/net/minecraft/block/BlockRailPowered.java.patch @@ -1,13 +1,11 @@ --- ../src-base/minecraft/net/minecraft/block/BlockRailPowered.java +++ ../src-work/minecraft/net/minecraft/block/BlockRailPowered.java -@@ -11,14 +11,17 @@ +@@ -11,14 +11,15 @@ import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; -+import net.minecraft.block.BlockRailBase.EnumRailDirection; -+ public class BlockRailPowered extends BlockRailBase { - public static final PropertyEnum SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class, new Predicate() @@ -21,7 +19,7 @@ } }); public static final PropertyBool POWERED = PropertyBool.create("powered"); -@@ -34,7 +37,7 @@ +@@ -34,7 +35,7 @@ { super(true); this.isActivator = isActivator; @@ -30,7 +28,7 @@ } @SuppressWarnings("incomplete-switch") -@@ -50,7 +53,7 @@ +@@ -50,7 +51,7 @@ int j = pos.getY(); int k = pos.getZ(); boolean flag = true; @@ -39,7 +37,7 @@ switch (blockrailbase$enumraildirection) { -@@ -91,7 +94,7 @@ +@@ -91,7 +92,7 @@ flag = false; } @@ -48,7 +46,7 @@ break; case ASCENDING_WEST: -@@ -106,7 +109,7 @@ +@@ -106,7 +107,7 @@ ++i; } @@ -57,7 +55,7 @@ break; case ASCENDING_NORTH: -@@ -121,7 +124,7 @@ +@@ -121,7 +122,7 @@ flag = false; } @@ -66,7 +64,7 @@ break; case ASCENDING_SOUTH: -@@ -136,7 +139,7 @@ +@@ -136,7 +137,7 @@ --k; } @@ -75,7 +73,7 @@ } if (this.isSameRailWithPower(worldIn, new BlockPos(i, j, k), p_176566_4_, p_176566_5_, blockrailbase$enumraildirection)) -@@ -150,7 +153,7 @@ +@@ -150,7 +151,7 @@ } } @@ -84,7 +82,7 @@ { IBlockState iblockstate = worldIn.getBlockState(pos); -@@ -160,11 +163,11 @@ +@@ -160,11 +161,11 @@ } else { @@ -99,7 +97,7 @@ { if (((Boolean)iblockstate.getValue(POWERED)).booleanValue()) { -@@ -194,30 +197,35 @@ +@@ -194,30 +195,35 @@ if (flag1 != flag) { @@ -139,7 +137,7 @@ if (((Boolean)state.getValue(POWERED)).booleanValue()) { -@@ -234,76 +242,76 @@ +@@ -234,76 +240,76 @@ { case CLOCKWISE_180: @@ -247,7 +245,7 @@ } default: -@@ -314,7 +322,7 @@ +@@ -314,7 +320,7 @@ @SuppressWarnings("incomplete-switch") public IBlockState withMirror(IBlockState state, Mirror mirrorIn) { @@ -256,7 +254,7 @@ switch (mirrorIn) { -@@ -323,17 +331,17 @@ +@@ -323,17 +329,17 @@ switch (blockrailbase$enumraildirection) { case ASCENDING_NORTH: @@ -280,7 +278,7 @@ default: return super.withMirror(state, mirrorIn); } -@@ -343,21 +351,21 @@ +@@ -343,21 +349,21 @@ switch (blockrailbase$enumraildirection) { case ASCENDING_EAST: diff --git a/patches/net/minecraft/block/BlockRedstoneDiode.java.patch b/patches/net/minecraft/block/BlockRedstoneDiode.java.patch index 52b01c27..97dabb5b 100644 --- a/patches/net/minecraft/block/BlockRedstoneDiode.java.patch +++ b/patches/net/minecraft/block/BlockRedstoneDiode.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public abstract class BlockRedstoneDiode extends BlockHorizontal { diff --git a/patches/net/minecraft/block/BlockRedstoneLight.java.patch b/patches/net/minecraft/block/BlockRedstoneLight.java.patch index 1b9241c1..ec95d883 100644 --- a/patches/net/minecraft/block/BlockRedstoneLight.java.patch +++ b/patches/net/minecraft/block/BlockRedstoneLight.java.patch @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockRedstoneLight extends Block { diff --git a/patches/net/minecraft/block/BlockRedstoneOre.java.patch b/patches/net/minecraft/block/BlockRedstoneOre.java.patch index 014618b4..8a56a76f 100644 --- a/patches/net/minecraft/block/BlockRedstoneOre.java.patch +++ b/patches/net/minecraft/block/BlockRedstoneOre.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.entity.EntityInteractEvent; public class BlockRedstoneOre extends Block @@ -25,7 +25,7 @@ +// this.activate(worldIn, pos); +// super.onEntityWalk(worldIn, pos, entityIn); + if (entityIn instanceof EntityPlayer) { -+ org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent((EntityPlayer) entityIn, org.bukkit.event.block.Action.PHYSICAL, pos, null, null, null); ++ org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent((EntityPlayer) entityIn, org.bukkit.event.block.Action.PHYSICAL, pos, null, null, null); + if (!event.isCancelled()) { + this.activate(worldIn, pos, entityIn); // add entity + super.onEntityWalk(worldIn, pos, entityIn); diff --git a/patches/net/minecraft/block/BlockReed.java.patch b/patches/net/minecraft/block/BlockReed.java.patch index 6bd01c9e..a61a4b39 100644 --- a/patches/net/minecraft/block/BlockReed.java.patch +++ b/patches/net/minecraft/block/BlockReed.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/block/BlockReed.java +++ ../src-work/minecraft/net/minecraft/block/BlockReed.java -@@ -57,9 +57,11 @@ +@@ -20,6 +20,7 @@ + import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockReed extends Block implements net.minecraftforge.common.IPlantable + { +@@ -57,9 +58,11 @@ if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(worldIn, pos, state, true)) { @@ -10,7 +18,7 @@ - worldIn.setBlockState(pos.up(), this.getDefaultState()); +// worldIn.setBlockState(pos.up(), this.getDefaultState()); + BlockPos upPos = pos.up(); -+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(worldIn, upPos.getX(), upPos.getY(), upPos.getZ(), this, 0); ++ CraftEventFactory.handleBlockGrowEvent(worldIn, upPos.getX(), upPos.getY(), upPos.getZ(), this, 0); worldIn.setBlockState(pos, state.withProperty(AGE, Integer.valueOf(0)), 4); } else diff --git a/patches/net/minecraft/block/BlockSapling.java.patch b/patches/net/minecraft/block/BlockSapling.java.patch index 87ee9ca7..7edc9e11 100644 --- a/patches/net/minecraft/block/BlockSapling.java.patch +++ b/patches/net/minecraft/block/BlockSapling.java.patch @@ -7,7 +7,7 @@ import java.util.Random; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -@@ -24,12 +25,17 @@ +@@ -24,12 +25,18 @@ import net.minecraft.world.gen.feature.WorldGenTaiga2; import net.minecraft.world.gen.feature.WorldGenTrees; import net.minecraft.world.gen.feature.WorldGenerator; @@ -15,6 +15,7 @@ +import org.bukkit.TreeType; +import org.bukkit.block.BlockState; +import org.bukkit.event.world.StructureGrowEvent; ++import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlockState; public class BlockSapling extends BlockBush implements IGrowable { @@ -25,7 +26,7 @@ protected BlockSapling() { -@@ -54,9 +60,31 @@ +@@ -54,9 +61,31 @@ super.updateTick(worldIn, pos, state, rand); if (!worldIn.isAreaLoaded(pos, 1)) return; // Forge: prevent loading unloaded chunks when checking neighbor's light @@ -42,7 +43,7 @@ + List blocks = (List) worldIn.capturedBlockSnapshots.clone(); + List blockstates = new java.util.ArrayList(); + for (net.minecraftforge.common.util.BlockSnapshot snapshot : blocks) { -+ blockstates.add(new org.bukkit.craftbukkit.block.CraftBlockState(snapshot)); ++ blockstates.add(new CraftBlockState(snapshot)); + } + worldIn.capturedBlockSnapshots.clear(); + StructureGrowEvent event = null; @@ -59,7 +60,7 @@ } } } -@@ -76,7 +104,17 @@ +@@ -76,7 +105,17 @@ public void generateTree(World worldIn, BlockPos pos, IBlockState state, Random rand) { if (!net.minecraftforge.event.terraingen.TerrainGen.saplingGrowTree(worldIn, rand, pos)) return; @@ -78,7 +79,7 @@ int i = 0; int j = 0; boolean flag = false; -@@ -92,6 +130,7 @@ +@@ -92,6 +131,7 @@ { if (this.isTwoByTwoOfType(worldIn, pos, i, j, BlockPlanks.EnumType.SPRUCE)) { @@ -86,7 +87,7 @@ worldgenerator = new WorldGenMegaPineTree(false, rand.nextBoolean()); flag = true; break label68; -@@ -103,11 +142,13 @@ +@@ -103,11 +143,13 @@ { i = 0; j = 0; @@ -100,7 +101,7 @@ worldgenerator = new WorldGenBirchTree(true, false); break; case JUNGLE: -@@ -121,6 +162,7 @@ +@@ -121,6 +163,7 @@ { if (this.isTwoByTwoOfType(worldIn, pos, i, j, BlockPlanks.EnumType.JUNGLE)) { @@ -108,7 +109,7 @@ worldgenerator = new WorldGenMegaJungle(true, 10, 20, iblockstate, iblockstate1); flag = true; break label82; -@@ -132,11 +174,13 @@ +@@ -132,11 +175,13 @@ { i = 0; j = 0; @@ -122,7 +123,7 @@ worldgenerator = new WorldGenSavannaTree(true); break; case DARK_OAK: -@@ -148,6 +192,7 @@ +@@ -148,6 +193,7 @@ { if (this.isTwoByTwoOfType(worldIn, pos, i, j, BlockPlanks.EnumType.DARK_OAK)) { diff --git a/patches/net/minecraft/block/BlockSkull.java.patch b/patches/net/minecraft/block/BlockSkull.java.patch index 76cac7f1..4af9fdae 100644 --- a/patches/net/minecraft/block/BlockSkull.java.patch +++ b/patches/net/minecraft/block/BlockSkull.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.util.BlockStateListPopulator; ++import org.bukkit.craftbukkit.v1_12_R1.util.BlockStateListPopulator; +import org.bukkit.event.entity.CreatureSpawnEvent; public class BlockSkull extends BlockContainer diff --git a/patches/net/minecraft/block/BlockSnow.java.patch b/patches/net/minecraft/block/BlockSnow.java.patch index 8854bc69..2737b5b8 100644 --- a/patches/net/minecraft/block/BlockSnow.java.patch +++ b/patches/net/minecraft/block/BlockSnow.java.patch @@ -1,10 +1,26 @@ --- ../src-base/minecraft/net/minecraft/block/BlockSnow.java +++ ../src-work/minecraft/net/minecraft/block/BlockSnow.java +@@ -14,7 +14,6 @@ + import net.minecraft.init.Items; + import net.minecraft.item.Item; + import net.minecraft.item.ItemStack; +-import net.minecraft.stats.StatList; + import net.minecraft.tileentity.TileEntity; + import net.minecraft.util.EnumFacing; + import net.minecraft.util.math.AxisAlignedBB; +@@ -24,6 +23,7 @@ + import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockSnow extends Block + { @@ -131,6 +131,9 @@ { if (worldIn.getLightFor(EnumSkyBlock.BLOCK, pos) > 11) { -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(worldIn.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), Blocks.AIR).isCancelled()) { ++ if (CraftEventFactory.callBlockFadeEvent(worldIn.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), Blocks.AIR).isCancelled()) { + return; + } worldIn.setBlockToAir(pos); diff --git a/patches/net/minecraft/block/BlockSnowBlock.java.patch b/patches/net/minecraft/block/BlockSnowBlock.java.patch index 58be1bbb..75db02a0 100644 --- a/patches/net/minecraft/block/BlockSnowBlock.java.patch +++ b/patches/net/minecraft/block/BlockSnowBlock.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/block/BlockSnowBlock.java +++ ../src-work/minecraft/net/minecraft/block/BlockSnowBlock.java -@@ -4,6 +4,7 @@ +@@ -4,11 +4,13 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -8,11 +8,17 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.util.math.BlockPos; -@@ -33,6 +34,9 @@ + import net.minecraft.world.EnumSkyBlock; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockSnowBlock extends Block + { +@@ -33,6 +35,9 @@ { if (worldIn.getLightFor(EnumSkyBlock.BLOCK, pos) > 11) { -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(worldIn.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), Blocks.AIR).isCancelled()) { ++ if (CraftEventFactory.callBlockFadeEvent(worldIn.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), Blocks.AIR).isCancelled()) { + return; + } this.dropBlockAsItem(worldIn, pos, worldIn.getBlockState(pos), 0); diff --git a/patches/net/minecraft/block/BlockStaticLiquid.java.patch b/patches/net/minecraft/block/BlockStaticLiquid.java.patch index 0176c84b..6560fec1 100644 --- a/patches/net/minecraft/block/BlockStaticLiquid.java.patch +++ b/patches/net/minecraft/block/BlockStaticLiquid.java.patch @@ -4,7 +4,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockStaticLiquid extends BlockLiquid { diff --git a/patches/net/minecraft/block/BlockStem.java.patch b/patches/net/minecraft/block/BlockStem.java.patch index 9ceef8b8..92b5ab17 100644 --- a/patches/net/minecraft/block/BlockStem.java.patch +++ b/patches/net/minecraft/block/BlockStem.java.patch @@ -1,10 +1,19 @@ --- ../src-base/minecraft/net/minecraft/block/BlockStem.java +++ ../src-work/minecraft/net/minecraft/block/BlockStem.java +@@ -2,7 +2,7 @@ + + import java.util.Random; + import javax.annotation.Nullable; +-import net.minecraft.block.material.Material; ++ + import net.minecraft.block.properties.IProperty; + import net.minecraft.block.properties.PropertyDirection; + import net.minecraft.block.properties.PropertyInteger; @@ -19,6 +19,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockStem extends BlockBush implements IGrowable { diff --git a/patches/net/minecraft/block/BlockTNT.java.patch b/patches/net/minecraft/block/BlockTNT.java.patch index 78a0b751..735990a5 100644 --- a/patches/net/minecraft/block/BlockTNT.java.patch +++ b/patches/net/minecraft/block/BlockTNT.java.patch @@ -1,10 +1,18 @@ --- ../src-base/minecraft/net/minecraft/block/BlockTNT.java +++ ../src-work/minecraft/net/minecraft/block/BlockTNT.java -@@ -115,6 +115,9 @@ +@@ -21,6 +21,7 @@ + import net.minecraft.util.math.BlockPos; + import net.minecraft.world.Explosion; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class BlockTNT extends Block + { +@@ -115,6 +116,9 @@ if (entityarrow.isBurning()) { -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityarrow, pos, Blocks.AIR, 0).isCancelled()) { ++ if (CraftEventFactory.callEntityChangeBlockEvent(entityarrow, pos, Blocks.AIR, 0).isCancelled()) { + return; + } this.explode(worldIn, pos, worldIn.getBlockState(pos).withProperty(EXPLODE, Boolean.valueOf(true)), entityarrow.shootingEntity instanceof EntityLivingBase ? (EntityLivingBase)entityarrow.shootingEntity : null); diff --git a/patches/net/minecraft/block/BlockTripWire.java.patch b/patches/net/minecraft/block/BlockTripWire.java.patch index aea16c54..7f129568 100644 --- a/patches/net/minecraft/block/BlockTripWire.java.patch +++ b/patches/net/minecraft/block/BlockTripWire.java.patch @@ -1,14 +1,15 @@ --- ../src-base/minecraft/net/minecraft/block/BlockTripWire.java +++ ../src-work/minecraft/net/minecraft/block/BlockTripWire.java -@@ -25,6 +25,7 @@ +@@ -25,6 +25,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.event.entity.EntityInteractEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockTripWire extends Block { -@@ -181,6 +182,40 @@ +@@ -181,6 +183,40 @@ } } @@ -25,7 +26,7 @@ + org.bukkit.event.Cancellable cancellable; + + if (object instanceof EntityPlayer) { -+ cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent((EntityPlayer) object, org.bukkit.event.block.Action.PHYSICAL, pos, null, null, null); ++ cancellable = CraftEventFactory.callPlayerInteractEvent((EntityPlayer) object, org.bukkit.event.block.Action.PHYSICAL, pos, null, null, null); + } else if (object instanceof Entity) { + cancellable = new EntityInteractEvent(((Entity) object).getBukkitEntity(), block); + manager.callEvent((EntityInteractEvent) cancellable); diff --git a/patches/net/minecraft/block/BlockVine.java.patch b/patches/net/minecraft/block/BlockVine.java.patch index 9bee4334..d46a4c95 100644 --- a/patches/net/minecraft/block/BlockVine.java.patch +++ b/patches/net/minecraft/block/BlockVine.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class BlockVine extends Block implements net.minecraftforge.common.IShearable { diff --git a/patches/net/minecraft/command/CommandExecuteAt.java.patch b/patches/net/minecraft/command/CommandExecuteAt.java.patch index e1ac958c..03e72e9e 100644 --- a/patches/net/minecraft/command/CommandExecuteAt.java.patch +++ b/patches/net/minecraft/command/CommandExecuteAt.java.patch @@ -8,7 +8,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.command.ProxiedNativeCommandSender; ++import org.bukkit.craftbukkit.v1_12_R1.command.ProxiedNativeCommandSender; public class CommandExecuteAt extends CommandBase { diff --git a/patches/net/minecraft/command/CommandHandler.java.patch b/patches/net/minecraft/command/CommandHandler.java.patch index 172333f7..70b0c9f6 100644 --- a/patches/net/minecraft/command/CommandHandler.java.patch +++ b/patches/net/minecraft/command/CommandHandler.java.patch @@ -18,8 +18,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.command.CommandWrapper; -+import org.bukkit.craftbukkit.command.CraftSimpleCommandMap; -+import org.bukkit.craftbukkit.command.ModCustomCommand; ++import org.bukkit.craftbukkit.v1_12_R1.command.CraftSimpleCommandMap; ++import org.bukkit.craftbukkit.v1_12_R1.command.ModCustomCommand; +import javax.annotation.Nullable; +import java.util.Collections; diff --git a/patches/net/minecraft/dispenser/BehaviorDefaultDispenseItem.java.patch b/patches/net/minecraft/dispenser/BehaviorDefaultDispenseItem.java.patch index 1c45a202..20e0713d 100644 --- a/patches/net/minecraft/dispenser/BehaviorDefaultDispenseItem.java.patch +++ b/patches/net/minecraft/dispenser/BehaviorDefaultDispenseItem.java.patch @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.event.block.BlockDispenseEvent; public class BehaviorDefaultDispenseItem implements IBehaviorDispenseItem diff --git a/patches/net/minecraft/dispenser/BehaviorProjectileDispense.java.patch b/patches/net/minecraft/dispenser/BehaviorProjectileDispense.java.patch index 3b598c33..2a36592a 100644 --- a/patches/net/minecraft/dispenser/BehaviorProjectileDispense.java.patch +++ b/patches/net/minecraft/dispenser/BehaviorProjectileDispense.java.patch @@ -1,15 +1,16 @@ --- ../src-base/minecraft/net/minecraft/dispenser/BehaviorProjectileDispense.java +++ ../src-work/minecraft/net/minecraft/dispenser/BehaviorProjectileDispense.java -@@ -6,6 +6,8 @@ +@@ -6,6 +6,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.event.block.BlockDispenseEvent; ++import org.bukkit.craftbukkit.v1_12_R1.projectiles.CraftBlockProjectileSource; public abstract class BehaviorProjectileDispense extends BehaviorDefaultDispenseItem { -@@ -15,9 +17,36 @@ +@@ -15,9 +18,36 @@ IPosition iposition = BlockDispenser.getDispensePosition(source); EnumFacing enumfacing = (EnumFacing)source.getBlockState().getValue(BlockDispenser.FACING); IProjectile iprojectile = this.getProjectileEntity(world, iposition, stack); @@ -40,7 +41,7 @@ + } + + iprojectile.shoot(event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.getProjectileVelocity(), this.getProjectileInaccuracy()); -+ ((Entity) iprojectile).projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource(source.getBlockTileEntity()); ++ ((Entity) iprojectile).projectileSource = new CraftBlockProjectileSource(source.getBlockTileEntity()); + // CraftBukkit end world.spawnEntity((Entity)iprojectile); - stack.shrink(1); diff --git a/patches/net/minecraft/enchantment/EnchantmentFrostWalker.java.patch b/patches/net/minecraft/enchantment/EnchantmentFrostWalker.java.patch index 908964c9..082106d9 100644 --- a/patches/net/minecraft/enchantment/EnchantmentFrostWalker.java.patch +++ b/patches/net/minecraft/enchantment/EnchantmentFrostWalker.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/enchantment/EnchantmentFrostWalker.java +++ ../src-work/minecraft/net/minecraft/enchantment/EnchantmentFrostWalker.java -@@ -59,10 +59,15 @@ +@@ -12,6 +12,7 @@ + import net.minecraft.util.math.BlockPos; + import net.minecraft.util.math.MathHelper; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class EnchantmentFrostWalker extends Enchantment + { +@@ -59,10 +60,15 @@ { IBlockState iblockstate1 = worldIn.getBlockState(blockpos$mutableblockpos1); @@ -10,7 +18,7 @@ - worldIn.setBlockState(blockpos$mutableblockpos1, Blocks.FROSTED_ICE.getDefaultState()); - worldIn.scheduleUpdate(blockpos$mutableblockpos1.toImmutable(), Blocks.FROSTED_ICE, MathHelper.getInt(living.getRNG(), 60, 120)); + // CraftBukkit Start - Call EntityBlockFormEvent for Frost Walker -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(worldIn, blockpos$mutableblockpos1, Blocks.FROSTED_ICE.getDefaultState(), living)) { ++ if (CraftEventFactory.handleBlockFormEvent(worldIn, blockpos$mutableblockpos1, Blocks.FROSTED_ICE.getDefaultState(), living)) { + worldIn.scheduleUpdate(blockpos$mutableblockpos1.toImmutable(), Blocks.FROSTED_ICE, MathHelper.getInt(living.getRNG(), 60, 120)); + } + // CraftBukkit End diff --git a/patches/net/minecraft/entity/Entity.java.patch b/patches/net/minecraft/entity/Entity.java.patch index 9f32492e..1e3b98ed 100644 --- a/patches/net/minecraft/entity/Entity.java.patch +++ b/patches/net/minecraft/entity/Entity.java.patch @@ -32,14 +32,14 @@ +import org.bukkit.Server; +import org.bukkit.TravelAgent; +import org.bukkit.block.BlockFace; -+import org.bukkit.craftbukkit.CraftWorld; -+import org.bukkit.craftbukkit.entity.CraftEntity; -+import org.bukkit.craftbukkit.entity.CraftPlayer; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.CraftTravelAgent; ++import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.entity.Hanging; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Vehicle; -+import org.spigotmc.CustomTimingsHandler; // Spigot +import org.bukkit.event.entity.EntityAirChangeEvent; +import org.bukkit.event.entity.EntityCombustByEntityEvent; +import org.bukkit.event.entity.EntityCombustEvent; @@ -840,7 +840,7 @@ - this.isDead = false; - this.world.profiler.startSection("reposition"); - BlockPos blockpos; -+ TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().getDefaultTeleporter() : org.bukkit.craftbukkit.CraftTravelAgent.DEFAULT; // return arbitrary TA to compensate for implementation dependent plugins ++ TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().getDefaultTeleporter() : CraftTravelAgent.DEFAULT; // return arbitrary TA to compensate for implementation dependent plugins + boolean oldCanCreate = agent.getCanCreatePortal(); + agent.setCanCreatePortal(false); // General entities cannot create portals diff --git a/patches/net/minecraft/entity/EntityAreaEffectCloud.java.patch b/patches/net/minecraft/entity/EntityAreaEffectCloud.java.patch index bf28ad98..991d8f07 100644 --- a/patches/net/minecraft/entity/EntityAreaEffectCloud.java.patch +++ b/patches/net/minecraft/entity/EntityAreaEffectCloud.java.patch @@ -12,16 +12,17 @@ import java.util.Map.Entry; import javax.annotation.Nullable; import net.minecraft.block.material.EnumPushReaction; -@@ -23,6 +20,8 @@ +@@ -23,6 +20,9 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -+import org.bukkit.craftbukkit.entity.CraftLivingEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftLivingEntity; +import org.bukkit.entity.LivingEntity; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityAreaEffectCloud extends Entity { -@@ -33,15 +32,15 @@ +@@ -33,15 +33,15 @@ private static final DataParameter PARTICLE_PARAM_1 = EntityDataManager.createKey(EntityAreaEffectCloud.class, DataSerializers.VARINT); private static final DataParameter PARTICLE_PARAM_2 = EntityDataManager.createKey(EntityAreaEffectCloud.class, DataSerializers.VARINT); private PotionType potion; @@ -43,7 +44,7 @@ private EntityLivingBase owner; private UUID ownerUniqueId; -@@ -126,6 +125,23 @@ +@@ -126,6 +126,23 @@ } } @@ -67,7 +68,7 @@ public int getColor() { return ((Integer)this.getDataManager().get(COLOR)).intValue(); -@@ -192,7 +208,12 @@ +@@ -192,7 +209,12 @@ super.onUpdate(); boolean flag = this.shouldIgnoreRadius(); float f = this.getRadius(); @@ -81,7 +82,7 @@ if (this.world.isRemote) { EnumParticleTypes enumparticletypes = this.getParticle(); -@@ -284,11 +305,13 @@ +@@ -284,11 +306,13 @@ { f += this.radiusPerTick; @@ -100,7 +101,7 @@ this.setRadius(f); } -@@ -326,6 +349,7 @@ +@@ -326,6 +350,7 @@ if (!list.isEmpty()) { @@ -108,7 +109,7 @@ for (EntityLivingBase entitylivingbase : list) { if (!this.reapplicationDelayMap.containsKey(entitylivingbase) && entitylivingbase.canBeHitWithPotion()) -@@ -336,6 +360,15 @@ +@@ -336,6 +361,15 @@ if (d2 <= (double)(f * f)) { @@ -116,7 +117,7 @@ + } + } + } -+ org.bukkit.event.entity.AreaEffectCloudApplyEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callAreaEffectCloudApplyEvent(this, entities); ++ org.bukkit.event.entity.AreaEffectCloudApplyEvent event = CraftEventFactory.callAreaEffectCloudApplyEvent(this, entities); + if (true) { // Preserve NMS spacing and bracket count for smallest diff + for (LivingEntity entity : event.getAffectedEntities()) { + if (entity instanceof CraftLivingEntity) { diff --git a/patches/net/minecraft/entity/EntityLeashKnot.java.patch b/patches/net/minecraft/entity/EntityLeashKnot.java.patch index 077b9ffc..5f96d95c 100644 --- a/patches/net/minecraft/entity/EntityLeashKnot.java.patch +++ b/patches/net/minecraft/entity/EntityLeashKnot.java.patch @@ -15,7 +15,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityLeashKnot extends EntityHanging { diff --git a/patches/net/minecraft/entity/EntityLiving.java.patch b/patches/net/minecraft/entity/EntityLiving.java.patch index c0c69587..4405699e 100644 --- a/patches/net/minecraft/entity/EntityLiving.java.patch +++ b/patches/net/minecraft/entity/EntityLiving.java.patch @@ -48,8 +48,8 @@ import net.minecraft.world.storage.loot.LootTable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.entity.CraftLivingEntity; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftLivingEntity; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.entity.LivingEntity; +import org.bukkit.event.entity.EntityPickupItemEvent; +import org.bukkit.event.entity.EntityTargetEvent; diff --git a/patches/net/minecraft/entity/EntityLivingBase.java.patch b/patches/net/minecraft/entity/EntityLivingBase.java.patch index b9dba2de..14037922 100644 --- a/patches/net/minecraft/entity/EntityLivingBase.java.patch +++ b/patches/net/minecraft/entity/EntityLivingBase.java.patch @@ -58,7 +58,7 @@ import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; -@@ -55,42 +38,49 @@ +@@ -55,42 +38,50 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionUtils; import net.minecraft.stats.StatList; @@ -87,9 +87,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.attribute.CraftAttributeMap; -+import org.bukkit.craftbukkit.event.CraftEventFactory; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.attribute.CraftAttributeMap; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.entity.ExperienceOrb; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; @@ -123,7 +124,7 @@ private final NonNullList handInventory = NonNullList.withSize(2, ItemStack.EMPTY); private final NonNullList armorArray = NonNullList.withSize(4, ItemStack.EMPTY); public boolean isSwingInProgress; -@@ -117,7 +107,7 @@ +@@ -117,7 +108,7 @@ public float rotationYawHead; public float prevRotationYawHead; public float jumpMovementFactor = 0.02F; @@ -132,7 +133,7 @@ protected int recentlyHit; protected boolean dead; protected int idleTime; -@@ -127,7 +117,7 @@ +@@ -127,7 +118,7 @@ protected float prevMovedDistance; protected float unused180; protected int scoreValue; @@ -141,7 +142,7 @@ protected boolean isJumping; public float moveStrafing; public float moveVertical; -@@ -139,9 +129,9 @@ +@@ -139,9 +130,9 @@ protected double interpTargetZ; protected double interpTargetYaw; protected double interpTargetPitch; @@ -154,7 +155,7 @@ private EntityLivingBase lastAttackedEntity; private int lastAttackedEntityTime; private float landMovementFactor; -@@ -154,6 +144,25 @@ +@@ -154,6 +145,25 @@ private DamageSource lastDamageSource; private long lastDamageStamp; @@ -162,7 +163,7 @@ + public int expToDrop; + public int maxAirTicks = 300; + public ArrayList drops = new ArrayList<>(); -+ public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes; ++ public CraftAttributeMap craftAttributes; + public boolean collides = true; + public boolean canPickUpLoot; + // CraftBukkit end @@ -180,7 +181,7 @@ public void onKillCommand() { this.attackEntityFrom(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE); -@@ -163,7 +172,9 @@ +@@ -163,7 +173,9 @@ { super(worldIn); this.applyEntityAttributes(); @@ -191,7 +192,7 @@ this.preventEntitySpawning = true; this.randomUnused1 = (float)((Math.random() + 1.0D) * 0.009999999776482582D); this.setPosition(this.posX, this.posY, this.posZ); -@@ -207,8 +218,17 @@ +@@ -207,8 +219,17 @@ { double d0 = Math.min((double)(0.2F + f / 15.0F), 2.5D); int i = (int)(150.0D * d0); @@ -211,7 +212,7 @@ } } -@@ -258,9 +278,13 @@ +@@ -258,9 +279,13 @@ if (this.isEntityAlive()) { @@ -228,7 +229,7 @@ } else { -@@ -359,6 +383,18 @@ +@@ -359,6 +384,18 @@ this.world.profiler.endSection(); } @@ -247,7 +248,7 @@ protected void frostWalk(BlockPos pos) { int i = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.FROST_WALKER, this); -@@ -378,19 +414,19 @@ +@@ -378,19 +415,19 @@ { ++this.deathTime; @@ -273,7 +274,7 @@ this.setDead(); -@@ -445,6 +481,7 @@ +@@ -445,6 +482,7 @@ { this.revengeTarget = livingBase; this.revengeTimer = this.ticksExisted; @@ -281,7 +282,7 @@ } public EntityLivingBase getLastAttackedEntity() -@@ -566,6 +603,17 @@ +@@ -566,6 +604,17 @@ } } @@ -299,7 +300,7 @@ if (compound.hasKey("Health", 99)) { this.setHealth(compound.getFloat("Health")); -@@ -592,9 +640,15 @@ +@@ -592,9 +641,15 @@ } } @@ -315,7 +316,7 @@ try { -@@ -622,6 +676,18 @@ +@@ -622,6 +677,18 @@ ; } @@ -334,7 +335,7 @@ if (this.potionsNeedUpdate) { if (!this.world.isRemote) -@@ -712,6 +778,7 @@ +@@ -712,6 +779,7 @@ if(net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.living.PotionEvent.PotionRemoveEvent(this, effect))) continue; this.onFinishedPotionEffect(effect); @@ -342,7 +343,7 @@ iterator.remove(); } } -@@ -740,6 +807,12 @@ +@@ -740,6 +808,12 @@ public void addPotionEffect(PotionEffect potioneffectIn) { @@ -355,7 +356,7 @@ if (this.isPotionApplicable(potioneffectIn)) { PotionEffect potioneffect = this.activePotionsMap.get(potioneffectIn.getPotion()); -@@ -784,6 +857,12 @@ +@@ -784,6 +858,12 @@ @Nullable public PotionEffect removeActivePotionEffect(@Nullable Potion potioneffectin) { @@ -368,7 +369,7 @@ return this.activePotionsMap.remove(potioneffectin); } -@@ -830,25 +909,57 @@ +@@ -830,25 +910,57 @@ } } @@ -410,7 +411,7 @@ { + // CraftBukkit start - Handle scaled health + if (this instanceof EntityPlayerMP && ((EntityPlayerMP)this).getGameProfile() != null) { -+ org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayerMP) this).getBukkitEntity(); ++ CraftPlayer player = ((EntityPlayerMP) this).getBukkitEntity(); + // Squeeze + if (health < 0.0F) { + player.setRealHealth(0.0D); @@ -427,7 +428,7 @@ this.dataManager.set(HEALTH, Float.valueOf(MathHelper.clamp(health, 0.0F, this.getMaxHealth()))); } -@@ -879,15 +990,17 @@ +@@ -879,15 +991,17 @@ { float f = amount; @@ -448,7 +449,7 @@ { this.damageShield(amount); amount = 0.0F; -@@ -912,22 +1025,42 @@ +@@ -912,22 +1026,42 @@ { if (amount <= this.lastDamage) { @@ -493,7 +494,7 @@ this.attackedAtYaw = 0.0F; Entity entity1 = source.getTrueSource(); -@@ -943,9 +1076,9 @@ +@@ -943,9 +1077,9 @@ this.recentlyHit = 100; this.attackingPlayer = (EntityPlayer)entity1; } @@ -505,7 +506,7 @@ if (entitywolf.isTamed()) { -@@ -1013,14 +1146,10 @@ +@@ -1013,14 +1147,10 @@ { if (!this.checkTotemDeathProtection(source)) { @@ -522,7 +523,7 @@ } } else if (flag1) -@@ -1065,22 +1194,30 @@ +@@ -1065,22 +1195,30 @@ else { ItemStack itemstack = null; @@ -558,7 +559,7 @@ { EntityPlayerMP entityplayermp = (EntityPlayerMP)this; entityplayermp.addStat(StatList.getObjectUseStats(Items.TOTEM_OF_UNDYING)); -@@ -1094,7 +1231,8 @@ +@@ -1094,7 +1232,8 @@ this.world.setEntityState(this, (byte)35); } @@ -568,7 +569,7 @@ } } -@@ -1171,19 +1309,8 @@ +@@ -1171,19 +1310,8 @@ Entity entity = cause.getTrueSource(); EntityLivingBase entitylivingbase = this.getAttackingEntity(); @@ -589,7 +590,7 @@ if (!this.world.isRemote) { int i = net.minecraftforge.common.ForgeHooks.getLootingLevel(this, entity, cause); -@@ -1196,11 +1323,27 @@ +@@ -1196,11 +1324,27 @@ boolean flag = this.recentlyHit > 0; this.dropLoot(flag, i, cause); } @@ -618,7 +619,7 @@ for (EntityItem item : capturedDrops) { world.spawnEntity(item); -@@ -1208,7 +1351,25 @@ +@@ -1208,7 +1352,25 @@ } } @@ -644,7 +645,7 @@ } } -@@ -1231,6 +1392,13 @@ +@@ -1231,6 +1393,13 @@ { this.isAirBorne = true; float f = MathHelper.sqrt(xRatio * xRatio + zRatio * zRatio); @@ -658,7 +659,7 @@ this.motionX /= 2.0D; this.motionZ /= 2.0D; this.motionX -= xRatio / (double)f * (double)strength; -@@ -1246,6 +1414,19 @@ +@@ -1246,6 +1415,19 @@ this.motionY = 0.4000000059604645D; } } @@ -678,7 +679,7 @@ } } -@@ -1255,6 +1436,7 @@ +@@ -1255,6 +1437,7 @@ return SoundEvents.ENTITY_GENERIC_HURT; } @@ -686,7 +687,7 @@ @Nullable protected SoundEvent getDeathSound() { -@@ -1321,8 +1503,13 @@ +@@ -1321,8 +1504,13 @@ if (i > 0) { @@ -701,7 +702,7 @@ int j = MathHelper.floor(this.posX); int k = MathHelper.floor(this.posY - 0.20000000298023224D); int l = MathHelper.floor(this.posZ); -@@ -1362,7 +1549,7 @@ +@@ -1362,7 +1550,7 @@ { if (!source.isUnblockable()) { @@ -710,7 +711,7 @@ damage = CombatRules.getDamageAfterAbsorb(damage, (float)this.getTotalArmorValue(), (float)this.getEntityAttribute(SharedMonsterAttributes.ARMOR_TOUGHNESS).getAttributeValue()); } -@@ -1377,7 +1564,8 @@ +@@ -1377,7 +1565,8 @@ } else { @@ -720,7 +721,7 @@ { int i = (this.getActivePotionEffect(MobEffects.RESISTANCE).getAmplifier() + 1) * 5; int j = 25 - i; -@@ -1405,25 +1593,151 @@ +@@ -1405,25 +1594,151 @@ protected void damageEntity(DamageSource damageSrc, float damageAmount) { @@ -888,7 +889,7 @@ } public CombatTracker getCombatTracker() -@@ -1605,6 +1919,7 @@ +@@ -1605,6 +1920,7 @@ if (this.attributeMap == null) { this.attributeMap = new AttributeMap(); @@ -896,7 +897,7 @@ } return this.attributeMap; -@@ -1685,11 +2000,13 @@ +@@ -1685,11 +2001,13 @@ } } @@ -910,7 +911,7 @@ protected float getSoundPitch() { return this.isChild() ? (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.5F : (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F; -@@ -1900,7 +2217,8 @@ +@@ -1900,7 +2218,8 @@ if (this.onGround && !this.world.isRemote) { @@ -920,7 +921,7 @@ } } else -@@ -2345,7 +2663,6 @@ +@@ -2345,7 +2664,6 @@ } this.world.profiler.startSection("ai"); @@ -928,7 +929,7 @@ if (this.isMovementBlocked()) { this.isJumping = false; -@@ -2426,6 +2743,7 @@ +@@ -2426,6 +2744,7 @@ if (!this.world.isRemote) { @@ -936,7 +937,7 @@ this.setFlag(7, flag); } } -@@ -2560,12 +2878,12 @@ +@@ -2560,12 +2879,12 @@ public boolean canBeCollidedWith() { @@ -951,7 +952,7 @@ } protected void markVelocityChanged() -@@ -2629,7 +2947,7 @@ +@@ -2629,7 +2948,7 @@ { PotionEffect effect = iterator.next(); @@ -960,7 +961,7 @@ { onFinishedPotionEffect(effect); iterator.remove(); -@@ -2667,7 +2985,8 @@ +@@ -2667,7 +2986,8 @@ if (this.isHandActive()) { ItemStack itemstack = this.getHeldItem(this.getActiveHand()); @@ -970,7 +971,7 @@ if (itemstack == this.activeItemStack) { -@@ -2785,8 +3104,25 @@ +@@ -2785,8 +3105,25 @@ if (!this.activeItemStack.isEmpty() && this.isHandActive()) { this.updateItemUse(this.activeItemStack, 16); @@ -998,7 +999,7 @@ itemstack = net.minecraftforge.event.ForgeEventFactory.onItemUseFinish(this, activeItemStackCopy, getItemInUseCount(), itemstack); this.setHeldItem(this.getActiveHand(), itemstack); this.resetActiveHand(); -@@ -2897,12 +3233,17 @@ +@@ -2897,12 +3234,17 @@ if (flag1) { @@ -1021,7 +1022,7 @@ } } -@@ -2936,6 +3277,11 @@ +@@ -2936,6 +3278,11 @@ } } @@ -1033,7 +1034,7 @@ public boolean canBeHitWithPotion() { return true; -@@ -2949,7 +3295,7 @@ +@@ -2949,7 +3296,7 @@ @SuppressWarnings("unchecked") @Override @Nullable @@ -1042,7 +1043,7 @@ { if (capability == net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { -@@ -2961,7 +3307,7 @@ +@@ -2961,7 +3308,7 @@ } @Override diff --git a/patches/net/minecraft/entity/ai/EntityAIBreakDoor.java.patch b/patches/net/minecraft/entity/ai/EntityAIBreakDoor.java.patch index f1addcc3..5a272c4b 100644 --- a/patches/net/minecraft/entity/ai/EntityAIBreakDoor.java.patch +++ b/patches/net/minecraft/entity/ai/EntityAIBreakDoor.java.patch @@ -1,10 +1,18 @@ --- ../src-base/minecraft/net/minecraft/entity/ai/EntityAIBreakDoor.java +++ ../src-work/minecraft/net/minecraft/entity/ai/EntityAIBreakDoor.java -@@ -84,6 +84,10 @@ +@@ -4,6 +4,7 @@ + import net.minecraft.block.BlockDoor; + import net.minecraft.entity.EntityLiving; + import net.minecraft.world.EnumDifficulty; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class EntityAIBreakDoor extends EntityAIDoorInteract + { +@@ -84,6 +85,10 @@ if (this.breakingTime == 240 && this.entity.world.getDifficulty() == EnumDifficulty.HARD) { -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreakDoorEvent(this.entity, this.doorPosition.getX(), this.doorPosition.getY(), this.doorPosition.getZ()).isCancelled()) { ++ if (CraftEventFactory.callEntityBreakDoorEvent(this.entity, this.doorPosition.getX(), this.doorPosition.getY(), this.doorPosition.getZ()).isCancelled()) { + this.startExecuting(); + return; + } diff --git a/patches/net/minecraft/entity/ai/EntityAIEatGrass.java.patch b/patches/net/minecraft/entity/ai/EntityAIEatGrass.java.patch index 38e50194..e9626a49 100644 --- a/patches/net/minecraft/entity/ai/EntityAIEatGrass.java.patch +++ b/patches/net/minecraft/entity/ai/EntityAIEatGrass.java.patch @@ -5,7 +5,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import org.bukkit.Material; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityAIEatGrass extends EntityAIBase { diff --git a/patches/net/minecraft/entity/ai/EntityAIFollowOwner.java.patch b/patches/net/minecraft/entity/ai/EntityAIFollowOwner.java.patch index b7313df3..79a0b572 100644 --- a/patches/net/minecraft/entity/ai/EntityAIFollowOwner.java.patch +++ b/patches/net/minecraft/entity/ai/EntityAIFollowOwner.java.patch @@ -5,7 +5,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.entity.CraftEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; +import org.bukkit.event.entity.EntityTeleportEvent; public class EntityAIFollowOwner extends EntityAIBase diff --git a/patches/net/minecraft/entity/ai/EntityAIHarvestFarmland.java.patch b/patches/net/minecraft/entity/ai/EntityAIHarvestFarmland.java.patch index b4d902b2..c3988c97 100644 --- a/patches/net/minecraft/entity/ai/EntityAIHarvestFarmland.java.patch +++ b/patches/net/minecraft/entity/ai/EntityAIHarvestFarmland.java.patch @@ -1,17 +1,25 @@ --- ../src-base/minecraft/net/minecraft/entity/ai/EntityAIHarvestFarmland.java +++ ../src-work/minecraft/net/minecraft/entity/ai/EntityAIHarvestFarmland.java -@@ -61,7 +61,9 @@ +@@ -11,6 +11,7 @@ + import net.minecraft.item.ItemStack; + import net.minecraft.util.math.BlockPos; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class EntityAIHarvestFarmland extends EntityAIMoveToBlock + { +@@ -61,7 +62,9 @@ if (this.currentTask == 0 && block instanceof BlockCrops && ((BlockCrops)block).isMaxAge(iblockstate)) { - world.destroyBlock(blockpos, true); -+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.villager, blockpos, Blocks.AIR, 0).isCancelled()) { ++ if (!CraftEventFactory.callEntityChangeBlockEvent(this.villager, blockpos, Blocks.AIR, 0).isCancelled()) { + world.destroyBlock(blockpos, true); + } } else if (this.currentTask == 1 && iblockstate.getMaterial() == Material.AIR) { -@@ -74,32 +76,42 @@ +@@ -74,32 +77,42 @@ if (!itemstack.isEmpty()) { @@ -54,7 +62,7 @@ flag = true; } } -+ if (planted != null && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.villager, blockpos, planted, 0).isCancelled()) { ++ if (planted != null && !CraftEventFactory.callEntityChangeBlockEvent(this.villager, blockpos, planted, 0).isCancelled()) { + world.setBlockState(blockpos, planted.getDefaultState(), 3); + } else { + flag = false; diff --git a/patches/net/minecraft/entity/ai/EntityAIMate.java.patch b/patches/net/minecraft/entity/ai/EntityAIMate.java.patch index 78cd2685..39f225d2 100644 --- a/patches/net/minecraft/entity/ai/EntityAIMate.java.patch +++ b/patches/net/minecraft/entity/ai/EntityAIMate.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/ai/EntityAIMate.java +++ ../src-work/minecraft/net/minecraft/entity/ai/EntityAIMate.java -@@ -6,10 +6,12 @@ +@@ -6,10 +6,13 @@ import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.passive.EntityAnimal; @@ -10,10 +10,11 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; +import org.bukkit.entity.ExperienceOrb; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityAIMate extends EntityAIBase { -@@ -106,6 +108,9 @@ +@@ -106,6 +109,9 @@ if (entityageable != null) { @@ -23,12 +24,12 @@ EntityPlayerMP entityplayermp = this.animal.getLoveCause(); if (entityplayermp == null && this.targetMate.getLoveCause() != null) -@@ -113,6 +118,13 @@ +@@ -113,6 +119,13 @@ entityplayermp = this.targetMate.getLoveCause(); } + int experience = this.animal.getRNG().nextInt(7) + 1; -+ org.bukkit.event.entity.EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, animal, targetMate, entityplayermp, this.animal.breedItem, experience); ++ org.bukkit.event.entity.EntityBreedEvent entityBreedEvent = CraftEventFactory.callEntityBreedEvent(entityageable, animal, targetMate, entityplayermp, this.animal.breedItem, experience); + if (entityBreedEvent.isCancelled()) { + return; + } @@ -37,7 +38,7 @@ if (entityplayermp != null) { entityplayermp.addStat(StatList.ANIMALS_BRED); -@@ -125,7 +137,7 @@ +@@ -125,7 +138,7 @@ this.targetMate.resetInLove(); entityageable.setGrowingAge(-24000); entityageable.setLocationAndAngles(this.animal.posX, this.animal.posY, this.animal.posZ, 0.0F, 0.0F); @@ -46,7 +47,7 @@ Random random = this.animal.getRNG(); for (int i = 0; i < 7; ++i) -@@ -141,7 +153,8 @@ +@@ -141,7 +154,8 @@ if (this.world.getGameRules().getBoolean("doMobLoot")) { diff --git a/patches/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java.patch b/patches/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java.patch index d61daadb..75b35163 100644 --- a/patches/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java.patch +++ b/patches/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java.patch @@ -1,11 +1,20 @@ --- ../src-base/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java +++ ../src-work/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java -@@ -70,7 +70,7 @@ +@@ -4,6 +4,8 @@ + import net.minecraft.entity.passive.AbstractHorse; + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.util.math.Vec3d; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class EntityAIRunAroundLikeCrazy extends EntityAIBase + { +@@ -70,7 +72,7 @@ int i = this.horseHost.getTemper(); int j = this.horseHost.getMaxTemper(); - if (j > 0 && this.horseHost.getRNG().nextInt(j) < i && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(horseHost, (EntityPlayer)entity)) -+ if (j > 0 && this.horseHost.getRNG().nextInt(j) < i && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(horseHost, (EntityPlayer)entity) && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.horseHost, ((org.bukkit.craftbukkit.entity.CraftHumanEntity) this.horseHost.getBukkitEntity().getPassenger()).getHandle()).isCancelled()) ++ if (j > 0 && this.horseHost.getRNG().nextInt(j) < i && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(horseHost, (EntityPlayer)entity) && !CraftEventFactory.callEntityTameEvent(this.horseHost, ((CraftHumanEntity) this.horseHost.getBukkitEntity().getPassenger()).getHandle()).isCancelled()) { this.horseHost.setTamedBy((EntityPlayer)entity); return; diff --git a/patches/net/minecraft/entity/ai/EntityAITempt.java.patch b/patches/net/minecraft/entity/ai/EntityAITempt.java.patch index 29d51c7c..6ad534af 100644 --- a/patches/net/minecraft/entity/ai/EntityAITempt.java.patch +++ b/patches/net/minecraft/entity/ai/EntityAITempt.java.patch @@ -9,8 +9,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.pathfinding.PathNavigateGround; -+import org.bukkit.craftbukkit.entity.CraftLivingEntity; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftLivingEntity; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.entity.EntityTargetEvent; +import org.bukkit.event.entity.EntityTargetLivingEntityEvent; diff --git a/patches/net/minecraft/entity/ai/EntityAIVillagerMate.java.patch b/patches/net/minecraft/entity/ai/EntityAIVillagerMate.java.patch index d988b248..fb613837 100644 --- a/patches/net/minecraft/entity/ai/EntityAIVillagerMate.java.patch +++ b/patches/net/minecraft/entity/ai/EntityAIVillagerMate.java.patch @@ -1,16 +1,24 @@ --- ../src-base/minecraft/net/minecraft/entity/ai/EntityAIVillagerMate.java +++ ../src-work/minecraft/net/minecraft/entity/ai/EntityAIVillagerMate.java -@@ -114,6 +114,9 @@ +@@ -5,6 +5,7 @@ + import net.minecraft.util.math.BlockPos; + import net.minecraft.village.Village; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class EntityAIVillagerMate extends EntityAIBase + { +@@ -114,6 +115,9 @@ private void giveBirth() { net.minecraft.entity.EntityAgeable entityvillager = this.villager.createChild(this.mate); -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityvillager, this.villager, this.mate, null, null, 0).isCancelled()) { ++ if (CraftEventFactory.callEntityBreedEvent(entityvillager, this.villager, this.mate, null, null, 0).isCancelled()) { + return; + } this.mate.setGrowingAge(6000); this.villager.setGrowingAge(6000); this.mate.setIsWillingToMate(false); -@@ -124,7 +127,7 @@ +@@ -124,7 +128,7 @@ entityvillager = event.getChild(); entityvillager.setGrowingAge(-24000); entityvillager.setLocationAndAngles(this.villager.posX, this.villager.posY, this.villager.posZ, 0.0F, 0.0F); diff --git a/patches/net/minecraft/entity/boss/EntityDragon.java.patch b/patches/net/minecraft/entity/boss/EntityDragon.java.patch index 97d5b0bb..f471e145 100644 --- a/patches/net/minecraft/entity/boss/EntityDragon.java.patch +++ b/patches/net/minecraft/entity/boss/EntityDragon.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/boss/EntityDragon.java +++ ../src-work/minecraft/net/minecraft/entity/boss/EntityDragon.java -@@ -19,16 +19,19 @@ +@@ -19,12 +19,14 @@ import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; @@ -15,28 +15,22 @@ import net.minecraft.pathfinding.Path; import net.minecraft.pathfinding.PathHeap; import net.minecraft.pathfinding.PathPoint; - import net.minecraft.potion.PotionEffect; -+import net.minecraft.server.MinecraftServer; - import net.minecraft.util.DamageSource; - import net.minecraft.util.EntityDamageSource; - import net.minecraft.util.EnumParticleTypes; -@@ -40,8 +43,10 @@ +@@ -40,6 +42,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; +import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraft.world.WorldProviderEnd; -+import net.minecraft.world.WorldServer; import net.minecraft.world.end.DragonFightManager; - import net.minecraft.world.gen.feature.WorldGenEndPodium; - import net.minecraft.world.storage.loot.LootTableList; -@@ -49,6 +54,8 @@ +@@ -49,6 +52,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.event.entity.EntityExplodeEvent; +import org.bukkit.event.entity.EntityRegainHealthEvent; ++import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; public class EntityDragon extends EntityLiving implements IEntityMultiPart, IMob { @@ -81,7 +75,7 @@ + // CraftBukkit start - Create a list to hold all the destroyed blocks + List destroyedBlocks = new java.util.ArrayList(); -+ org.bukkit.craftbukkit.CraftWorld craftWorld = this.world.getWorld(); ++ CraftWorld craftWorld = this.world.getWorld(); + // CraftBukkit end + for (int k1 = i; k1 <= l; ++k1) @@ -128,7 +122,7 @@ + int blockY = block.getY(); + int blockZ = block.getZ(); + -+ Block nmsBlock = org.bukkit.craftbukkit.util.CraftMagicNumbers.getBlock(blockId); ++ Block nmsBlock = CraftMagicNumbers.getBlock(blockId); + if (nmsBlock.canDropFromExplosion(explosionSource)) { + nmsBlock.dropBlockAsItemWithChance(this.world, new BlockPos(blockX, blockY, blockZ), nmsBlock.getStateFromMeta(block.getData()), event.getYield(), 0); + } diff --git a/patches/net/minecraft/entity/boss/EntityWither.java.patch b/patches/net/minecraft/entity/boss/EntityWither.java.patch index 26ec27d1..c1d06ac6 100644 --- a/patches/net/minecraft/entity/boss/EntityWither.java.patch +++ b/patches/net/minecraft/entity/boss/EntityWither.java.patch @@ -1,30 +1,32 @@ --- ../src-base/minecraft/net/minecraft/entity/boss/EntityWither.java +++ ../src-work/minecraft/net/minecraft/entity/boss/EntityWither.java -@@ -34,8 +34,10 @@ +@@ -5,7 +5,6 @@ + import java.util.List; + import javax.annotation.Nullable; + import net.minecraft.block.Block; +-import net.minecraft.block.material.Material; + import net.minecraft.block.state.IBlockState; + import net.minecraft.entity.Entity; + import net.minecraft.entity.EntityLiving; +@@ -34,6 +33,7 @@ import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.network.play.server.SPacketEffect; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.PotionEffect; -+import net.minecraft.server.MinecraftServer; import net.minecraft.util.DamageSource; - import net.minecraft.util.EntitySelectors; - import net.minecraft.util.EnumParticleTypes; -@@ -47,8 +49,12 @@ - import net.minecraft.world.BossInfoServer; - import net.minecraft.world.EnumDifficulty; +@@ -49,6 +49,9 @@ import net.minecraft.world.World; -+import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.entity.EntityRegainHealthEvent; +import org.bukkit.event.entity.ExplosionPrimeEvent; public class EntityWither extends EntityMob implements IRangedAttackMob { -@@ -255,15 +261,41 @@ +@@ -255,15 +258,41 @@ if (j1 <= 0) { @@ -69,7 +71,7 @@ } } else -@@ -384,6 +416,9 @@ +@@ -384,6 +413,9 @@ if (!block.isAir(iblockstate, this.world, blockpos) && block.canEntityDestroy(iblockstate, world, blockpos, this) && net.minecraftforge.event.ForgeEventFactory.onEntityDestroyBlock(this, blockpos, iblockstate)) { @@ -79,7 +81,7 @@ flag = this.world.destroyBlock(blockpos, true) || flag; } } -@@ -399,7 +434,7 @@ +@@ -399,7 +431,7 @@ if (this.ticksExisted % 20 == 0) { diff --git a/patches/net/minecraft/entity/boss/dragon/phase/PhaseManager.java.patch b/patches/net/minecraft/entity/boss/dragon/phase/PhaseManager.java.patch index a1b3643e..7144d737 100644 --- a/patches/net/minecraft/entity/boss/dragon/phase/PhaseManager.java.patch +++ b/patches/net/minecraft/entity/boss/dragon/phase/PhaseManager.java.patch @@ -4,7 +4,7 @@ import net.minecraft.entity.boss.EntityDragon; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -+import org.bukkit.craftbukkit.entity.CraftEnderDragon; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEnderDragon; +import org.bukkit.event.entity.EnderDragonChangePhaseEvent; public class PhaseManager diff --git a/patches/net/minecraft/entity/effect/EntityLightningBolt.java.patch b/patches/net/minecraft/entity/effect/EntityLightningBolt.java.patch index d89f90f9..ed709c8c 100644 --- a/patches/net/minecraft/entity/effect/EntityLightningBolt.java.patch +++ b/patches/net/minecraft/entity/effect/EntityLightningBolt.java.patch @@ -15,7 +15,7 @@ import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityLightningBolt extends EntityWeatherEffect { diff --git a/patches/net/minecraft/entity/item/EntityArmorStand.java.patch b/patches/net/minecraft/entity/item/EntityArmorStand.java.patch index c475fb1b..f6bb1895 100644 --- a/patches/net/minecraft/entity/item/EntityArmorStand.java.patch +++ b/patches/net/minecraft/entity/item/EntityArmorStand.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityArmorStand.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityArmorStand.java -@@ -31,13 +31,18 @@ +@@ -31,13 +31,19 @@ import net.minecraft.util.datafix.DataFixer; import net.minecraft.util.datafix.FixTypes; import net.minecraft.util.datafix.walkers.ItemStackDataLists; @@ -11,8 +11,9 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.CraftEquipmentSlot; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.CraftEquipmentSlot; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.entity.ArmorStand; +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerArmorStandManipulateEvent; @@ -20,7 +21,7 @@ public class EntityArmorStand extends EntityLivingBase { -@@ -67,12 +72,12 @@ +@@ -67,12 +73,12 @@ public long punchCooldown; private int disabledSlots; private boolean wasMarker; @@ -39,7 +40,7 @@ public EntityArmorStand(World worldIn) { -@@ -95,6 +100,13 @@ +@@ -95,6 +101,13 @@ this.setPosition(posX, posY, posZ); } @@ -53,7 +54,7 @@ protected final void setSize(float width, float height) { double d0 = this.posX; -@@ -457,6 +469,22 @@ +@@ -457,6 +470,22 @@ { if (!itemstack.isEmpty() || (this.disabledSlots & 1 << p_184795_2_.getSlotIndex() + 16) == 0) { @@ -76,12 +77,12 @@ if (player.capabilities.isCreativeMode && itemstack.isEmpty() && !p_184795_3_.isEmpty()) { ItemStack itemstack2 = p_184795_3_.copy(); -@@ -484,11 +512,16 @@ +@@ -484,11 +513,16 @@ public boolean attackEntityFrom(DamageSource source, float amount) { + // CraftBukkit start -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, source, amount)) { ++ if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, source, amount)) { + return false; + } + // CraftBukkit end @@ -94,7 +95,7 @@ return false; } else if (!this.isEntityInvulnerable(source) && !this.canInteract && !this.hasMarker()) -@@ -496,7 +529,7 @@ +@@ -496,7 +530,7 @@ if (source.isExplosion()) { this.dropContents(); @@ -103,7 +104,7 @@ return false; } else if (DamageSource.IN_FIRE.equals(source)) -@@ -541,7 +574,7 @@ +@@ -541,7 +575,7 @@ { this.playBrokenSound(); this.playParticles(); @@ -112,7 +113,7 @@ return false; } else -@@ -557,7 +590,7 @@ +@@ -557,7 +591,7 @@ { this.dropBlock(); this.playParticles(); @@ -121,7 +122,7 @@ } return false; -@@ -623,7 +656,7 @@ +@@ -623,7 +657,7 @@ if (f <= 0.5F) { this.dropContents(); @@ -130,46 +131,46 @@ } else { -@@ -633,7 +666,8 @@ +@@ -633,7 +667,8 @@ private void dropBlock() { - Block.spawnAsEntity(this.world, new BlockPos(this), new ItemStack(Items.ARMOR_STAND)); +// Block.spawnAsEntity(this.world, new BlockPos(this), new ItemStack(Items.ARMOR_STAND)); -+ drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(new ItemStack(Items.ARMOR_STAND))); // CraftBukkit - add to drops ++ drops.add(CraftItemStack.asBukkitCopy(new ItemStack(Items.ARMOR_STAND))); // CraftBukkit - add to drops this.dropContents(); } -@@ -647,7 +681,8 @@ +@@ -647,7 +682,8 @@ if (!itemstack.isEmpty()) { - Block.spawnAsEntity(this.world, (new BlockPos(this)).up(), itemstack); +// Block.spawnAsEntity(this.world, (new BlockPos(this)).up(), itemstack); -+ drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemstack)); // CraftBukkit - add to drops ++ drops.add(CraftItemStack.asBukkitCopy(itemstack)); // CraftBukkit - add to drops this.handItems.set(i, ItemStack.EMPTY); } } -@@ -658,7 +693,8 @@ +@@ -658,7 +694,8 @@ if (!itemstack1.isEmpty()) { - Block.spawnAsEntity(this.world, (new BlockPos(this)).up(), itemstack1); +// Block.spawnAsEntity(this.world, (new BlockPos(this)).up(), itemstack1); -+ drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemstack1)); // CraftBukkit - add to drops ++ drops.add(CraftItemStack.asBukkitCopy(itemstack1)); // CraftBukkit - add to drops this.armorItems.set(j, ItemStack.EMPTY); } } -@@ -791,6 +827,8 @@ +@@ -791,6 +828,8 @@ public void onKillCommand() { -+ org.bukkit.event.entity.EntityDeathEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, drops); // CraftBukkit - call event // Paper - make cancellable ++ org.bukkit.event.entity.EntityDeathEvent event = CraftEventFactory.callEntityDeathEvent(this, drops); // CraftBukkit - call event // Paper - make cancellable + if (event.isCancelled()) return; // Paper - make cancellable this.setDead(); } -@@ -804,7 +842,7 @@ +@@ -804,7 +843,7 @@ return this.hasMarker() ? EnumPushReaction.IGNORE : super.getPushReaction(); } @@ -178,7 +179,7 @@ { this.dataManager.set(STATUS, Byte.valueOf(this.setBit(((Byte)this.dataManager.get(STATUS)).byteValue(), 1, small))); this.setSize(0.5F, 1.975F); -@@ -815,7 +853,7 @@ +@@ -815,7 +854,7 @@ return (((Byte)this.dataManager.get(STATUS)).byteValue() & 1) != 0; } @@ -187,7 +188,7 @@ { this.dataManager.set(STATUS, Byte.valueOf(this.setBit(((Byte)this.dataManager.get(STATUS)).byteValue(), 4, showArms))); } -@@ -825,7 +863,7 @@ +@@ -825,7 +864,7 @@ return (((Byte)this.dataManager.get(STATUS)).byteValue() & 4) != 0; } @@ -196,7 +197,7 @@ { this.dataManager.set(STATUS, Byte.valueOf(this.setBit(((Byte)this.dataManager.get(STATUS)).byteValue(), 8, noBasePlate))); } -@@ -835,7 +873,7 @@ +@@ -835,7 +874,7 @@ return (((Byte)this.dataManager.get(STATUS)).byteValue() & 8) != 0; } @@ -205,7 +206,7 @@ { this.dataManager.set(STATUS, Byte.valueOf(this.setBit(((Byte)this.dataManager.get(STATUS)).byteValue(), 16, marker))); this.setSize(0.5F, 1.975F); -@@ -957,7 +995,7 @@ +@@ -957,7 +996,7 @@ return SoundEvents.ENTITY_ARMORSTAND_BREAK; } diff --git a/patches/net/minecraft/entity/item/EntityEnderCrystal.java.patch b/patches/net/minecraft/entity/item/EntityEnderCrystal.java.patch index d31c98a2..62fadfd3 100644 --- a/patches/net/minecraft/entity/item/EntityEnderCrystal.java.patch +++ b/patches/net/minecraft/entity/item/EntityEnderCrystal.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.end.DragonFightManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.entity.ExplosionPrimeEvent; public class EntityEnderCrystal extends Entity diff --git a/patches/net/minecraft/entity/item/EntityEnderPearl.java.patch b/patches/net/minecraft/entity/item/EntityEnderPearl.java.patch index 74cd205d..1de422db 100644 --- a/patches/net/minecraft/entity/item/EntityEnderPearl.java.patch +++ b/patches/net/minecraft/entity/item/EntityEnderPearl.java.patch @@ -5,8 +5,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.Bukkit; -+import org.bukkit.craftbukkit.entity.CraftPlayer; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.event.player.PlayerTeleportEvent; @@ -31,7 +31,7 @@ - } + if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) { // Don't indent to lower patch size + // CraftBukkit start - Fire PlayerTeleportEvent -+ org.bukkit.craftbukkit.entity.CraftPlayer player = (CraftPlayer) entityplayermp.getBukkitEntity(); ++ CraftPlayer player = (CraftPlayer) entityplayermp.getBukkitEntity(); + org.bukkit.Location location = getBukkitEntity().getLocation(); + location.setPitch(player.getLocation().getPitch()); + location.setYaw(player.getLocation().getYaw()); diff --git a/patches/net/minecraft/entity/item/EntityExpBottle.java.patch b/patches/net/minecraft/entity/item/EntityExpBottle.java.patch index 4d64faba..6e603870 100644 --- a/patches/net/minecraft/entity/item/EntityExpBottle.java.patch +++ b/patches/net/minecraft/entity/item/EntityExpBottle.java.patch @@ -1,14 +1,15 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityExpBottle.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityExpBottle.java -@@ -8,6 +8,7 @@ +@@ -8,6 +8,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import org.bukkit.entity.ExperienceOrb; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityExpBottle extends EntityThrowable { -@@ -40,14 +41,21 @@ +@@ -40,14 +42,21 @@ { if (!this.world.isRemote) { @@ -17,7 +18,7 @@ +// this.world.playEvent(2002, new BlockPos(this), PotionUtils.getPotionColor(PotionTypes.WATER)); int i = 3 + this.world.rand.nextInt(5) + this.world.rand.nextInt(5); -+ org.bukkit.event.entity.ExpBottleEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExpBottleEvent(this, i); ++ org.bukkit.event.entity.ExpBottleEvent event = CraftEventFactory.callExpBottleEvent(this, i); + i = event.getExperience(); + if (event.getShowEffect()) { + this.world.playEvent(2002, new BlockPos(this), PotionUtils.getPotionColor(PotionTypes.WATER)); diff --git a/patches/net/minecraft/entity/item/EntityFallingBlock.java.patch b/patches/net/minecraft/entity/item/EntityFallingBlock.java.patch index 4601450e..ccce115e 100644 --- a/patches/net/minecraft/entity/item/EntityFallingBlock.java.patch +++ b/patches/net/minecraft/entity/item/EntityFallingBlock.java.patch @@ -1,14 +1,22 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityFallingBlock.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityFallingBlock.java -@@ -31,6 +31,7 @@ +@@ -6,7 +6,6 @@ + import net.minecraft.block.Block; + import net.minecraft.block.BlockAnvil; + import net.minecraft.block.BlockFalling; +-import net.minecraft.block.ITileEntityProvider; + import net.minecraft.block.material.Material; + import net.minecraft.block.state.IBlockState; + import net.minecraft.crash.CrashReportCategory; +@@ -31,6 +30,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityFallingBlock extends Entity { -@@ -38,7 +39,7 @@ +@@ -38,7 +38,7 @@ public int fallTime; public boolean shouldDropItem = true; private boolean dontSetBlock; @@ -17,7 +25,7 @@ private int fallHurtMax = 40; private float fallHurtAmount = 2.0F; public NBTTagCompound tileEntityData; -@@ -114,7 +115,7 @@ +@@ -114,7 +114,7 @@ { BlockPos blockpos = new BlockPos(this); @@ -26,7 +34,7 @@ { this.world.setBlockToAir(blockpos); } -@@ -170,7 +171,7 @@ +@@ -170,7 +170,7 @@ if (!flag1 && BlockFalling.canFallThrough(this.world.getBlockState(new BlockPos(this.posX, this.posY - 0.009999999776482582D, this.posZ)))) { this.onGround = false; @@ -35,7 +43,7 @@ } this.motionX *= 0.699999988079071D; -@@ -185,10 +186,20 @@ +@@ -185,10 +185,20 @@ { if (this.world.mayPlace(block, blockpos1, true, EnumFacing.UP, this) && (flag1 || !BlockFalling.canFallThrough(this.world.getBlockState(blockpos1.down()))) && this.world.setBlockState(blockpos1, this.fallTile, 3)) { @@ -56,7 +64,7 @@ if (this.tileEntityData != null && block.hasTileEntity(this.fallTile)) { -@@ -248,7 +259,9 @@ +@@ -248,7 +258,9 @@ for (Entity entity : list) { diff --git a/patches/net/minecraft/entity/item/EntityFireworkRocket.java.patch b/patches/net/minecraft/entity/item/EntityFireworkRocket.java.patch index 7a750bef..d8ba3ea4 100644 --- a/patches/net/minecraft/entity/item/EntityFireworkRocket.java.patch +++ b/patches/net/minecraft/entity/item/EntityFireworkRocket.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityFireworkRocket extends Entity { @@ -38,7 +38,7 @@ { - this.world.setEntityState(this, (byte)17); - this.dealExplosionDamage(); -+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) { ++ if (!CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) { + this.world.setEntityState(this, (byte) 17); + this.dealExplosionDamage(); + } diff --git a/patches/net/minecraft/entity/item/EntityItem.java.patch b/patches/net/minecraft/entity/item/EntityItem.java.patch index 57b79b0d..09118990 100644 --- a/patches/net/minecraft/entity/item/EntityItem.java.patch +++ b/patches/net/minecraft/entity/item/EntityItem.java.patch @@ -8,12 +8,13 @@ import net.minecraft.stats.StatList; import net.minecraft.util.DamageSource; import net.minecraft.util.datafix.DataFixer; -@@ -26,13 +27,15 @@ +@@ -26,13 +27,16 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.event.entity.EntityPickupItemEvent; +import org.bukkit.event.player.PlayerPickupItemEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityItem extends Entity { @@ -25,7 +26,7 @@ private int health; private String thrower; private String owner; -@@ -43,6 +46,8 @@ +@@ -43,6 +47,8 @@ */ public int lifespan = 6000; @@ -34,7 +35,7 @@ public EntityItem(World worldIn, double x, double y, double z) { super(worldIn); -@@ -60,7 +65,7 @@ +@@ -60,7 +66,7 @@ { this(worldIn, x, y, z); this.setItem(stack); @@ -43,7 +44,7 @@ } protected boolean canTriggerWalking() -@@ -93,10 +98,12 @@ +@@ -93,10 +99,12 @@ { super.onUpdate(); @@ -60,7 +61,7 @@ this.prevPosX = this.posX; this.prevPosY = this.posY; -@@ -156,10 +163,12 @@ +@@ -156,10 +164,12 @@ this.motionY *= -0.5D; } @@ -73,12 +74,12 @@ this.handleWaterMovement(); -@@ -180,6 +189,12 @@ +@@ -180,6 +190,12 @@ if (!this.world.isRemote && this.age >= lifespan) { + // CraftBukkit start - fire ItemDespawnEvent -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) { ++ if (CraftEventFactory.callItemDespawnEvent(this).isCancelled()) { + this.age = 0; + return; + } @@ -86,7 +87,7 @@ int hook = net.minecraftforge.event.ForgeEventFactory.onItemExpire(this, item); if (hook < 0) this.setDead(); else this.lifespan += hook; -@@ -191,9 +206,34 @@ +@@ -191,9 +207,34 @@ } } @@ -102,7 +103,7 @@ + + if (!this.world.isRemote && this.age >= world.spigotConfig.itemDespawnRate) { // Spigot + // CraftBukkit start - fire ItemDespawnEvent -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) { ++ if (CraftEventFactory.callItemDespawnEvent(this).isCancelled()) { + this.age = 0; + return; + } @@ -122,7 +123,7 @@ { this.combineItems(entityitem); } -@@ -248,11 +288,14 @@ +@@ -248,11 +289,14 @@ } else { @@ -132,7 +133,7 @@ - other.setItem(itemstack1); - this.setDead(); + // Spigot start -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemMergeEvent(other, this).isCancelled()) return false; ++ if (CraftEventFactory.callItemMergeEvent(other, this).isCancelled()) return false; + itemstack.grow(itemstack1.getCount()); + this.pickupDelay = Math.max(other.pickupDelay, this.pickupDelay); + this.age = Math.min(other.age, this.age); @@ -142,19 +143,19 @@ return true; } } -@@ -314,6 +357,11 @@ +@@ -314,6 +358,11 @@ } else { + // CraftBukkit start -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, source, amount)) { ++ if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, source, amount)) { + return false; + } + // CraftBukkit end this.markVelocityChanged(); this.health = (int)((float)this.health - amount); -@@ -393,6 +441,35 @@ +@@ -393,6 +442,35 @@ Item item = itemstack.getItem(); int i = itemstack.getCount(); diff --git a/patches/net/minecraft/entity/item/EntityItemFrame.java.patch b/patches/net/minecraft/entity/item/EntityItemFrame.java.patch index df4af2a4..0b32e78d 100644 --- a/patches/net/minecraft/entity/item/EntityItemFrame.java.patch +++ b/patches/net/minecraft/entity/item/EntityItemFrame.java.patch @@ -1,27 +1,28 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityItemFrame.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityItemFrame.java -@@ -24,7 +24,10 @@ +@@ -24,7 +24,11 @@ import net.minecraft.world.storage.MapData; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.commons.io.Charsets; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import java.util.UUID; + public class EntityItemFrame extends EntityHanging { private static final DataParameter ITEM = EntityDataManager.createKey(EntityItemFrame.class, DataSerializers.ITEM_STACK); -@@ -63,6 +66,9 @@ +@@ -63,6 +67,9 @@ { if (!this.world.isRemote) { -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, source, amount, false) || this.isDead) { ++ if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, source, amount, false) || this.isDead) { + return true; + } this.dropItemOrSelf(source.getTrueSource(), false); this.playSound(SoundEvents.ENTITY_ITEMFRAME_REMOVE_ITEM, 1.0F, 1.0F); this.setDisplayedItem(ItemStack.EMPTY); -@@ -143,7 +149,7 @@ +@@ -143,7 +150,7 @@ if (stack.getItem() instanceof net.minecraft.item.ItemMap) { MapData mapdata = ((ItemMap)stack.getItem()).getMapData(stack, this.world); diff --git a/patches/net/minecraft/entity/item/EntityMinecartContainer.java.patch b/patches/net/minecraft/entity/item/EntityMinecartContainer.java.patch index 4bcfce23..b53c3b4b 100644 --- a/patches/net/minecraft/entity/item/EntityMinecartContainer.java.patch +++ b/patches/net/minecraft/entity/item/EntityMinecartContainer.java.patch @@ -12,7 +12,7 @@ import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.LootTable; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; +import org.bukkit.inventory.InventoryHolder; diff --git a/patches/net/minecraft/entity/item/EntityTNTPrimed.java.patch b/patches/net/minecraft/entity/item/EntityTNTPrimed.java.patch index 612c287f..6f4d86c8 100644 --- a/patches/net/minecraft/entity/item/EntityTNTPrimed.java.patch +++ b/patches/net/minecraft/entity/item/EntityTNTPrimed.java.patch @@ -1,14 +1,16 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityTNTPrimed.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityTNTPrimed.java -@@ -10,6 +10,7 @@ +@@ -10,6 +10,9 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; +import org.bukkit.event.entity.ExplosionPrimeEvent; ++import org.bukkit.craftbukkit.v1_12_R1.CraftServer; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; public class EntityTNTPrimed extends Entity { -@@ -18,6 +19,9 @@ +@@ -18,6 +21,9 @@ private EntityLivingBase tntPlacedBy; private int fuse; @@ -18,7 +20,7 @@ public EntityTNTPrimed(World worldIn) { super(worldIn); -@@ -59,6 +63,7 @@ +@@ -59,6 +65,7 @@ public void onUpdate() { @@ -26,7 +28,7 @@ this.prevPosX = this.posX; this.prevPosY = this.posY; this.prevPosZ = this.posZ; -@@ -84,12 +89,14 @@ +@@ -84,12 +91,14 @@ if (this.fuse <= 0) { @@ -42,15 +44,15 @@ } else { -@@ -100,8 +107,15 @@ +@@ -100,8 +109,15 @@ private void explode() { - float f = 4.0F; - this.world.createExplosion(this, this.posX, this.posY + (double)(this.height / 16.0F), this.posZ, 4.0F, true); + // CraftBukkit start -+ org.bukkit.craftbukkit.CraftServer server = this.world.getServer(); -+ ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) org.bukkit.craftbukkit.entity.CraftEntity.getEntity(server, this)); ++ CraftServer server = this.world.getServer(); ++ ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) CraftEntity.getEntity(server, this)); + server.getPluginManager().callEvent(event); + + if (!event.isCancelled()) { diff --git a/patches/net/minecraft/entity/item/EntityXPOrb.java.patch b/patches/net/minecraft/entity/item/EntityXPOrb.java.patch index dcbb3040..aa11e4a9 100644 --- a/patches/net/minecraft/entity/item/EntityXPOrb.java.patch +++ b/patches/net/minecraft/entity/item/EntityXPOrb.java.patch @@ -1,9 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/item/EntityXPOrb.java +++ ../src-work/minecraft/net/minecraft/entity/item/EntityXPOrb.java -@@ -1,10 +1,13 @@ - package net.minecraft.entity.item; - -+import com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent; +@@ -3,8 +3,10 @@ import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -14,23 +11,22 @@ import net.minecraft.init.Enchantments; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; -@@ -15,7 +18,15 @@ +@@ -15,7 +17,14 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.entity.ExperienceOrb; -+import org.bukkit.entity.Player; -+import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.event.entity.EntityTargetEvent; +import org.bukkit.event.entity.EntityTargetLivingEntityEvent; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftLivingEntity; +import java.util.UUID; + public class EntityXPOrb extends Entity { public int xpColor; -@@ -26,9 +37,60 @@ +@@ -26,9 +35,60 @@ private EntityPlayer closestPlayer; private int xpTargetColor; @@ -92,7 +88,7 @@ this.setSize(0.5F, 0.5F); this.setPosition(x, y, z); this.rotationYaw = (float)(Math.random() * 360.0D); -@@ -74,6 +136,7 @@ +@@ -74,6 +134,7 @@ public void onUpdate() { super.onUpdate(); @@ -100,7 +96,7 @@ if (this.delayBeforeCanPickup > 0) { -@@ -117,19 +180,30 @@ +@@ -117,19 +178,30 @@ if (this.closestPlayer != null) { @@ -113,7 +109,7 @@ + boolean cancelled = false; + if (this.closestPlayer != prevTarget) { + EntityTargetLivingEntityEvent event = CraftEventFactory.callEntityTargetLivingEvent(this, closestPlayer, EntityTargetEvent.TargetReason.CLOSEST_PLAYER); -+ EntityLivingBase target = event.getTarget() == null ? null : ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getTarget()).getHandle(); ++ EntityLivingBase target = event.getTarget() == null ? null : ((CraftLivingEntity) event.getTarget()).getHandle(); + closestPlayer = target instanceof EntityPlayer ? (EntityPlayer) target : null; + cancelled = event.isCancelled(); + } @@ -142,7 +138,7 @@ } this.move(MoverType.SELF, this.motionX, this.motionY, this.motionZ); -@@ -195,21 +269,23 @@ +@@ -195,21 +267,23 @@ { compound.setShort("Health", (short)this.xpOrbHealth); compound.setShort("Age", (short)this.xpOrbAge); @@ -169,7 +165,7 @@ { if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.player.PlayerPickupXpEvent(entityIn, this))) return; entityIn.xpCooldown = 2; -@@ -220,13 +296,17 @@ +@@ -220,13 +294,17 @@ { float ratio = itemstack.getItem().getXpRepairRatio(itemstack); int i = Math.min(roundAverage(this.xpValue * ratio), itemstack.getItemDamage()); @@ -190,7 +186,7 @@ } this.setDead(); -@@ -234,12 +314,12 @@ +@@ -234,12 +312,12 @@ } } @@ -205,7 +201,7 @@ { return xp * 2; } -@@ -296,6 +376,24 @@ +@@ -296,6 +374,24 @@ public static int getXPSplit(int expValue) { diff --git a/patches/net/minecraft/entity/monster/AbstractSkeleton.java.patch b/patches/net/minecraft/entity/monster/AbstractSkeleton.java.patch index bff71db3..57a9ec5a 100644 --- a/patches/net/minecraft/entity/monster/AbstractSkeleton.java.patch +++ b/patches/net/minecraft/entity/monster/AbstractSkeleton.java.patch @@ -1,14 +1,15 @@ --- ../src-base/minecraft/net/minecraft/entity/monster/AbstractSkeleton.java +++ ../src-work/minecraft/net/minecraft/entity/monster/AbstractSkeleton.java -@@ -42,6 +42,7 @@ +@@ -42,6 +42,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.event.entity.EntityCombustEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public abstract class AbstractSkeleton extends EntityMob implements IRangedAttackMob { -@@ -136,7 +137,13 @@ +@@ -136,7 +138,13 @@ if (flag) { @@ -23,11 +24,11 @@ } } } -@@ -221,8 +228,17 @@ +@@ -221,8 +229,17 @@ double d2 = target.posZ - this.posZ; double d3 = (double)MathHelper.sqrt(d0 * d0 + d2 * d2); entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float)(14 - this.world.getDifficulty().getDifficultyId() * 4)); -+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getHeldItemMainhand(), entityarrow, 0.8F); ++ org.bukkit.event.entity.EntityShootBowEvent event = CraftEventFactory.callEntityShootBowEvent(this, this.getHeldItemMainhand(), entityarrow, 0.8F); + if (event.isCancelled()) { + event.getProjectile().remove(); + return; diff --git a/patches/net/minecraft/entity/monster/EntityCreeper.java.patch b/patches/net/minecraft/entity/monster/EntityCreeper.java.patch index fc9f83d2..5b9981d1 100644 --- a/patches/net/minecraft/entity/monster/EntityCreeper.java.patch +++ b/patches/net/minecraft/entity/monster/EntityCreeper.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.storage.loot.LootTableList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.entity.ExplosionPrimeEvent; public class EntityCreeper extends EntityMob diff --git a/patches/net/minecraft/entity/monster/EntityEnderman.java.patch b/patches/net/minecraft/entity/monster/EntityEnderman.java.patch index 911ab958..53097996 100644 --- a/patches/net/minecraft/entity/monster/EntityEnderman.java.patch +++ b/patches/net/minecraft/entity/monster/EntityEnderman.java.patch @@ -45,14 +45,15 @@ import net.minecraft.util.datafix.DataFixer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -@@ -47,7 +34,16 @@ +@@ -47,7 +34,17 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; -+import org.bukkit.craftbukkit.entity.CraftEnderman; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEnderman; +import org.bukkit.entity.Enderman; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityTargetEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import javax.annotation.Nullable; +import java.util.Random; @@ -62,7 +63,7 @@ public class EntityEnderman extends EntityMob { private static final UUID ATTACKING_SPEED_BOOST_ID = UUID.fromString("020E0DFB-87AE-4653-9556-831010E291A0"); -@@ -97,25 +93,38 @@ +@@ -97,25 +94,38 @@ public void setAttackTarget(@Nullable EntityLivingBase entitylivingbaseIn) { @@ -109,7 +110,7 @@ } protected void entityInit() -@@ -187,8 +196,17 @@ +@@ -187,8 +197,17 @@ this.setHeldBlockState(iblockstate); } @@ -128,7 +129,7 @@ ItemStack itemstack = player.inventory.armorInventory.get(3); if (itemstack.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN)) -@@ -236,7 +254,7 @@ +@@ -236,7 +255,7 @@ { float f = this.getBrightness(); @@ -137,7 +138,7 @@ { this.setAttackTarget((EntityLivingBase)null); this.teleportRandomly(); -@@ -331,7 +349,7 @@ +@@ -331,7 +350,7 @@ { return false; } @@ -146,7 +147,7 @@ { for (int i = 0; i < 64; ++i) { -@@ -347,7 +365,7 @@ +@@ -347,7 +366,7 @@ { boolean flag = super.attackEntityFrom(source, amount); @@ -155,7 +156,7 @@ { this.teleportRandomly(); } -@@ -399,6 +417,12 @@ +@@ -399,6 +418,12 @@ private int aggroTime; private int teleportTime; @@ -168,7 +169,7 @@ public AIFindPlayer(EntityEnderman p_i45842_1_) { super(p_i45842_1_, EntityPlayer.class, false); -@@ -467,7 +491,7 @@ +@@ -467,7 +492,7 @@ { if (this.enderman.shouldAttackPlayer((EntityPlayer)this.targetEntity)) { @@ -177,14 +178,14 @@ { this.enderman.teleportRandomly(); } -@@ -524,8 +548,12 @@ +@@ -524,8 +549,12 @@ if (iblockstate2 != null && this.canPlaceBlock(world, blockpos, iblockstate2.getBlock(), iblockstate, iblockstate1) && net.minecraftforge.event.ForgeEventFactory.onBlockPlace(enderman, new net.minecraftforge.common.util.BlockSnapshot(world, blockpos, iblockstate2), net.minecraft.util.EnumFacing.UP).isCanceled()) { - world.setBlockState(blockpos, iblockstate2, 3); - this.enderman.setHeldBlockState((IBlockState)null); + // CraftBukkit start - Place event -+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.enderman, blockpos, this.enderman.getHeldBlockState().getBlock(), this.enderman.getHeldBlockState().getBlock().getMetaFromState(this.enderman.getHeldBlockState())).isCancelled()) { ++ if (!CraftEventFactory.callEntityChangeBlockEvent(this.enderman, blockpos, this.enderman.getHeldBlockState().getBlock(), this.enderman.getHeldBlockState().getBlock().getMetaFromState(this.enderman.getHeldBlockState())).isCancelled()) { + world.setBlockState(blockpos, iblockstate2, 3); + this.enderman.setHeldBlockState((IBlockState) null); + } @@ -192,14 +193,14 @@ } } -@@ -590,8 +618,12 @@ +@@ -590,8 +619,12 @@ if (EntityEnderman.CARRIABLE_BLOCKS.contains(block) && flag) { - this.enderman.setHeldBlockState(iblockstate); - world.setBlockToAir(blockpos); + // CraftBukkit start - Pickup event -+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.enderman, this.enderman.world.getWorld().getBlockAt(blockpos.getX(), blockpos.getY(), blockpos.getZ()), org.bukkit.Material.AIR).isCancelled()) { ++ if (!CraftEventFactory.callEntityChangeBlockEvent(this.enderman, this.enderman.world.getWorld().getBlockAt(blockpos.getX(), blockpos.getY(), blockpos.getZ()), org.bukkit.Material.AIR).isCancelled()) { + this.enderman.setHeldBlockState(iblockstate); + world.setBlockToAir(blockpos); + } diff --git a/patches/net/minecraft/entity/monster/EntitySilverfish.java.patch b/patches/net/minecraft/entity/monster/EntitySilverfish.java.patch index 8f92fee8..c0786e58 100644 --- a/patches/net/minecraft/entity/monster/EntitySilverfish.java.patch +++ b/patches/net/minecraft/entity/monster/EntitySilverfish.java.patch @@ -1,20 +1,28 @@ --- ../src-base/minecraft/net/minecraft/entity/monster/EntitySilverfish.java +++ ../src-work/minecraft/net/minecraft/entity/monster/EntitySilverfish.java -@@ -221,6 +221,9 @@ +@@ -26,6 +26,7 @@ + import net.minecraft.util.math.BlockPos; + import net.minecraft.world.World; + import net.minecraft.world.storage.loot.LootTableList; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class EntitySilverfish extends EntityMob + { +@@ -221,6 +222,9 @@ if (BlockSilverfish.canContainSilverfish(iblockstate)) { -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.entity, blockpos, Blocks.MONSTER_EGG, Block.getIdFromBlock(BlockSilverfish.getBlockById(iblockstate.getBlock().getMetaFromState(iblockstate)))).isCancelled()) { ++ if (CraftEventFactory.callEntityChangeBlockEvent(this.entity, blockpos, Blocks.MONSTER_EGG, Block.getIdFromBlock(BlockSilverfish.getBlockById(iblockstate.getBlock().getMetaFromState(iblockstate)))).isCancelled()) { + return; + } world.setBlockState(blockpos, Blocks.MONSTER_EGG.getDefaultState().withProperty(BlockSilverfish.VARIANT, BlockSilverfish.EnumType.forModelBlock(iblockstate)), 3); this.entity.spawnExplosionParticle(); this.entity.setDead(); -@@ -273,6 +276,9 @@ +@@ -273,6 +277,9 @@ if (iblockstate.getBlock() == Blocks.MONSTER_EGG) { -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.silverfish, blockpos1, Blocks.AIR, 0).isCancelled()) { ++ if (CraftEventFactory.callEntityChangeBlockEvent(this.silverfish, blockpos1, Blocks.AIR, 0).isCancelled()) { + continue; + } if (net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(world, this.silverfish)) diff --git a/patches/net/minecraft/entity/monster/EntitySnowman.java.patch b/patches/net/minecraft/entity/monster/EntitySnowman.java.patch index e56ed500..e17daa9f 100644 --- a/patches/net/minecraft/entity/monster/EntitySnowman.java.patch +++ b/patches/net/minecraft/entity/monster/EntitySnowman.java.patch @@ -4,7 +4,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.player.PlayerShearEntityEvent; public class EntitySnowman extends EntityGolem implements IRangedAttackMob, net.minecraftforge.common.IShearable @@ -25,7 +25,7 @@ if (this.world.getBlockState(blockpos).getMaterial() == Material.AIR && this.world.getBiome(blockpos).getTemperature(blockpos) < 0.8F && Blocks.SNOW_LAYER.canPlaceBlockAt(this.world, blockpos)) { - this.world.setBlockState(blockpos, Blocks.SNOW_LAYER.getDefaultState()); -+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this.world, blockpos, Blocks.SNOW_LAYER.getDefaultState(), this); ++ CraftEventFactory.handleBlockFormEvent(this.world, blockpos, Blocks.SNOW_LAYER.getDefaultState(), this); } } } diff --git a/patches/net/minecraft/entity/passive/AbstractHorse.java.patch b/patches/net/minecraft/entity/passive/AbstractHorse.java.patch index 72b72329..ce72cd12 100644 --- a/patches/net/minecraft/entity/passive/AbstractHorse.java.patch +++ b/patches/net/minecraft/entity/passive/AbstractHorse.java.patch @@ -1,14 +1,15 @@ --- ../src-base/minecraft/net/minecraft/entity/passive/AbstractHorse.java +++ ../src-work/minecraft/net/minecraft/entity/passive/AbstractHorse.java -@@ -56,6 +56,7 @@ +@@ -56,6 +56,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.event.entity.EntityRegainHealthEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public abstract class AbstractHorse extends EntityAnimal implements IInventoryChangedListener, IJumpingMount { -@@ -66,7 +67,7 @@ +@@ -66,7 +68,7 @@ return p_apply_1_ instanceof AbstractHorse && ((AbstractHorse)p_apply_1_).isBreeding(); } }; @@ -17,7 +18,7 @@ private static final DataParameter STATUS = EntityDataManager.createKey(AbstractHorse.class, DataSerializers.BYTE); private static final DataParameter> OWNER_UNIQUE_ID = EntityDataManager.>createKey(AbstractHorse.class, DataSerializers.OPTIONAL_UNIQUE_ID); private int eatingCounter; -@@ -75,7 +76,7 @@ +@@ -75,7 +77,7 @@ public int tailCounter; public int sprintCounter; protected boolean horseJumping; @@ -26,7 +27,7 @@ protected int temper; protected float jumpPower; private boolean allowStandSliding; -@@ -88,6 +89,8 @@ +@@ -88,6 +90,8 @@ protected boolean canGallop = true; protected int gallopTime; @@ -35,7 +36,7 @@ public AbstractHorse(World worldIn) { super(worldIn); -@@ -288,10 +291,10 @@ +@@ -288,10 +292,10 @@ return 2; } @@ -48,7 +49,7 @@ this.horseChest.setCustomName(this.getName()); if (containerhorsechest != null) -@@ -465,7 +468,7 @@ +@@ -465,7 +469,7 @@ public int getMaxTemper() { @@ -57,7 +58,7 @@ } protected float getSoundVolume() -@@ -545,7 +548,7 @@ +@@ -545,7 +549,7 @@ if (this.getHealth() < this.getMaxHealth() && f > 0.0F) { @@ -66,7 +67,7 @@ flag = true; } -@@ -609,7 +612,7 @@ +@@ -609,7 +613,7 @@ public void onDeath(DamageSource cause) { @@ -75,7 +76,7 @@ if (!this.world.isRemote && this.horseChest != null) { -@@ -623,6 +626,7 @@ +@@ -623,6 +627,7 @@ } } } @@ -83,7 +84,7 @@ } public void onLivingUpdate() -@@ -638,7 +642,7 @@ +@@ -638,7 +643,7 @@ { if (this.rand.nextInt(900) == 0 && this.deathTime == 0) { @@ -92,7 +93,7 @@ } if (this.canEatGrass()) -@@ -941,7 +945,7 @@ +@@ -941,7 +946,7 @@ { compound.setString("OwnerUUID", this.getOwnerUniqueId().toString()); } @@ -101,7 +102,7 @@ if (!this.horseChest.getStackInSlot(0).isEmpty()) { compound.setTag("SaddleItem", this.horseChest.getStackInSlot(0).writeToNBT(new NBTTagCompound())); -@@ -971,6 +975,9 @@ +@@ -971,6 +976,9 @@ { this.setOwnerUniqueId(UUID.fromString(s)); } @@ -111,7 +112,7 @@ IAttributeInstance iattributeinstance = this.getAttributeMap().getAttributeInstanceByName("Speed"); -@@ -1074,6 +1081,18 @@ +@@ -1074,6 +1082,18 @@ public void handleStartJump(int p_184775_1_) { @@ -122,7 +123,7 @@ + } else { + power = 0.4F + 0.4F * (float) p_184775_1_ / 90.0F; + } -+ org.bukkit.event.entity.HorseJumpEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callHorseJumpEvent(this, power); ++ org.bukkit.event.entity.HorseJumpEvent event = CraftEventFactory.callHorseJumpEvent(this, power); + if (event.isCancelled()) { + return; + } diff --git a/patches/net/minecraft/entity/passive/EntityCow.java.patch b/patches/net/minecraft/entity/passive/EntityCow.java.patch index 158873f1..3ebe1d00 100644 --- a/patches/net/minecraft/entity/passive/EntityCow.java.patch +++ b/patches/net/minecraft/entity/passive/EntityCow.java.patch @@ -4,8 +4,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; -+import org.bukkit.craftbukkit.event.CraftEventFactory; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; public class EntityCow extends EntityAnimal { diff --git a/patches/net/minecraft/entity/passive/EntityOcelot.java.patch b/patches/net/minecraft/entity/passive/EntityOcelot.java.patch index 8d029b67..3beb7c54 100644 --- a/patches/net/minecraft/entity/passive/EntityOcelot.java.patch +++ b/patches/net/minecraft/entity/passive/EntityOcelot.java.patch @@ -8,7 +8,14 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityAgeable; -@@ -47,6 +46,7 @@ +@@ -41,12 +40,14 @@ + import net.minecraft.world.DifficultyInstance; + import net.minecraft.world.World; + import net.minecraft.world.storage.loot.LootTableList; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class EntityOcelot extends EntityTameable + { private static final DataParameter OCELOT_VARIANT = EntityDataManager.createKey(EntityOcelot.class, DataSerializers.VARINT); private EntityAIAvoidEntity avoidEntity; private EntityAITempt aiTempt; @@ -16,7 +23,7 @@ public EntityOcelot(World worldIn) { -@@ -106,9 +106,10 @@ +@@ -106,9 +107,10 @@ } } @@ -29,7 +36,7 @@ } protected void applyEntityAttributes() -@@ -189,7 +190,8 @@ +@@ -189,7 +191,8 @@ { if (this.aiSit != null) { @@ -39,17 +46,17 @@ } return super.attackEntityFrom(source, amount); -@@ -222,7 +224,8 @@ +@@ -222,7 +225,8 @@ if (!this.world.isRemote) { - if (this.rand.nextInt(3) == 0 && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(this, player)) + // CraftBukkit - added event call and isCancelled check -+ if (this.rand.nextInt(3) == 0 && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(this, player) && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, player).isCancelled()) ++ if (this.rand.nextInt(3) == 0 && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(this, player) && !CraftEventFactory.callEntityTameEvent(this, player).isCancelled()) { this.setTamedBy(player); this.setTameSkin(1 + this.world.rand.nextInt(3)); -@@ -361,14 +364,14 @@ +@@ -361,14 +365,14 @@ { livingdata = super.onInitialSpawn(difficulty, livingdata); diff --git a/patches/net/minecraft/entity/passive/EntityParrot.java.patch b/patches/net/minecraft/entity/passive/EntityParrot.java.patch index d0d37a02..7d0e6c4f 100644 --- a/patches/net/minecraft/entity/passive/EntityParrot.java.patch +++ b/patches/net/minecraft/entity/passive/EntityParrot.java.patch @@ -17,16 +17,24 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.SharedMonsterAttributes; -@@ -247,7 +244,7 @@ +@@ -82,6 +79,7 @@ + import net.minecraft.world.storage.loot.LootTableList; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class EntityParrot extends EntityShoulderRiding implements EntityFlying + { +@@ -247,7 +245,7 @@ if (!this.world.isRemote) { - if (this.rand.nextInt(10) == 0 && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(this, player)) -+ if (this.rand.nextInt(10) == 0 && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(this, player) && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, player).isCancelled()) // CraftBukkit ++ if (this.rand.nextInt(10) == 0 && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(this, player) && !CraftEventFactory.callEntityTameEvent(this, player).isCancelled()) // CraftBukkit { this.setTamedBy(player); this.playTameEffect(true); -@@ -420,7 +417,8 @@ +@@ -420,7 +418,8 @@ { if (this.aiSit != null) { diff --git a/patches/net/minecraft/entity/passive/EntityPig.java.patch b/patches/net/minecraft/entity/passive/EntityPig.java.patch index 477e5a80..4f273ae0 100644 --- a/patches/net/minecraft/entity/passive/EntityPig.java.patch +++ b/patches/net/minecraft/entity/passive/EntityPig.java.patch @@ -4,7 +4,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityPig extends EntityAnimal { diff --git a/patches/net/minecraft/entity/passive/EntityRabbit.java.patch b/patches/net/minecraft/entity/passive/EntityRabbit.java.patch index 970ee403..7b1b9c5c 100644 --- a/patches/net/minecraft/entity/passive/EntityRabbit.java.patch +++ b/patches/net/minecraft/entity/passive/EntityRabbit.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/entity/passive/EntityRabbit.java +++ ../src-work/minecraft/net/minecraft/entity/passive/EntityRabbit.java -@@ -68,8 +68,14 @@ +@@ -52,6 +52,7 @@ + import net.minecraft.world.storage.loot.LootTableList; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class EntityRabbit extends EntityAnimal + { +@@ -68,8 +69,14 @@ this.setSize(0.4F, 0.5F); this.jumpHelper = new EntityRabbit.RabbitJumpHelper(this); this.moveHelper = new EntityRabbit.RabbitMoveHelper(this); @@ -15,12 +23,12 @@ protected void initEntityAI() { -@@ -587,11 +593,21 @@ +@@ -587,11 +594,21 @@ if (integer.intValue() == 0) { + // CraftBukkit start -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.rabbit, blockpos, Blocks.AIR, 0).isCancelled()) { ++ if (CraftEventFactory.callEntityChangeBlockEvent(this.rabbit, blockpos, Blocks.AIR, 0).isCancelled()) { + return; + } + // CraftBukkit end @@ -30,7 +38,7 @@ else { + // CraftBukkit start -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.rabbit, blockpos, block, block.getMetaFromState(iblockstate.withProperty(BlockCarrot.AGE, Integer.valueOf(integer.intValue() - 1)))).isCancelled()) { ++ if (CraftEventFactory.callEntityChangeBlockEvent(this.rabbit, blockpos, block, block.getMetaFromState(iblockstate.withProperty(BlockCarrot.AGE, Integer.valueOf(integer.intValue() - 1)))).isCancelled()) { + return; + } + // CraftBukkit end diff --git a/patches/net/minecraft/entity/passive/EntityVillager.java.patch b/patches/net/minecraft/entity/passive/EntityVillager.java.patch index c9df1e1c..43570404 100644 --- a/patches/net/minecraft/entity/passive/EntityVillager.java.patch +++ b/patches/net/minecraft/entity/passive/EntityVillager.java.patch @@ -5,9 +5,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.Bukkit; -+import org.bukkit.craftbukkit.entity.CraftVillager; -+import org.bukkit.craftbukkit.event.CraftEventFactory; -+import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftVillager; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMerchantRecipe; +import org.bukkit.entity.ExperienceOrb; +import org.bukkit.entity.Villager; +import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; diff --git a/patches/net/minecraft/entity/passive/EntityWolf.java.patch b/patches/net/minecraft/entity/passive/EntityWolf.java.patch index 8a7f322a..49421108 100644 --- a/patches/net/minecraft/entity/passive/EntityWolf.java.patch +++ b/patches/net/minecraft/entity/passive/EntityWolf.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.storage.loot.LootTableList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.entity.EntityTargetEvent; public class EntityWolf extends EntityTameable diff --git a/patches/net/minecraft/entity/player/EntityPlayer.java.patch b/patches/net/minecraft/entity/player/EntityPlayer.java.patch index 350fa562..f92c3e83 100644 --- a/patches/net/minecraft/entity/player/EntityPlayer.java.patch +++ b/patches/net/minecraft/entity/player/EntityPlayer.java.patch @@ -1,11 +1,36 @@ --- ../src-base/minecraft/net/minecraft/entity/player/EntityPlayer.java +++ ../src-work/minecraft/net/minecraft/entity/player/EntityPlayer.java -@@ -92,6 +92,16 @@ +@@ -8,7 +8,6 @@ + import java.util.UUID; + import javax.annotation.Nullable; + import net.minecraft.block.Block; +-import net.minecraft.block.BlockBed; + import net.minecraft.block.BlockHorizontal; + import net.minecraft.block.material.Material; + import net.minecraft.block.state.IBlockState; +@@ -32,7 +31,6 @@ + import net.minecraft.entity.passive.EntityPig; + import net.minecraft.entity.passive.EntityTameable; + import net.minecraft.entity.projectile.EntityFishHook; +-import net.minecraft.init.Blocks; + import net.minecraft.init.Items; + import net.minecraft.init.MobEffects; + import net.minecraft.init.SoundEvents; +@@ -42,7 +40,6 @@ + import net.minecraft.inventory.IInventory; + import net.minecraft.inventory.InventoryEnderChest; + import net.minecraft.item.ItemArmor; +-import net.minecraft.item.ItemAxe; + import net.minecraft.item.ItemElytra; + import net.minecraft.item.ItemStack; + import net.minecraft.item.ItemSword; +@@ -92,6 +89,18 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; -+import org.bukkit.craftbukkit.entity.CraftItem; ++import org.bukkit.craftbukkit.v1_12_R1.TrigMath; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftItem; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.event.entity.EntityCombustByEntityEvent; @@ -14,10 +39,11 @@ +import org.bukkit.event.player.PlayerDropItemEvent; +import org.bukkit.event.player.PlayerVelocityEvent; +import org.bukkit.util.Vector; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; @SuppressWarnings("incomplete-switch") public abstract class EntityPlayer extends EntityLivingBase -@@ -109,10 +119,10 @@ +@@ -109,10 +118,10 @@ protected static final DataParameter LEFT_SHOULDER_ENTITY = EntityDataManager.createKey(EntityPlayer.class, DataSerializers.COMPOUND_TAG); protected static final DataParameter RIGHT_SHOULDER_ENTITY = EntityDataManager.createKey(EntityPlayer.class, DataSerializers.COMPOUND_TAG); public InventoryPlayer inventory = new InventoryPlayer(this); @@ -30,7 +56,7 @@ protected int flyToggleTimer; public float prevCameraYaw; public float cameraYaw; -@@ -123,9 +133,9 @@ +@@ -123,9 +132,9 @@ public double chasingPosX; public double chasingPosY; public double chasingPosZ; @@ -42,7 +68,7 @@ public float renderOffsetX; @SideOnly(Side.CLIENT) public float renderOffsetY; -@@ -147,6 +157,12 @@ +@@ -147,6 +156,12 @@ @Nullable public EntityFishHook fishEntity; @@ -55,7 +81,7 @@ protected CooldownTracker createCooldownTracker() { return new CooldownTracker(); -@@ -159,9 +175,13 @@ +@@ -159,9 +174,13 @@ this.gameProfile = gameProfileIn; this.inventoryContainer = new ContainerPlayer(this.inventory, !worldIn.isRemote, this); this.openContainer = this.inventoryContainer; @@ -69,7 +95,7 @@ } protected void applyEntityAttributes() -@@ -408,7 +428,7 @@ +@@ -408,7 +427,7 @@ return SoundCategory.PLAYERS; } @@ -78,7 +104,7 @@ { return 20; } -@@ -499,7 +519,8 @@ +@@ -499,7 +518,8 @@ { if (this.getHealth() < this.getMaxHealth() && this.ticksExisted % 20 == 0) { @@ -88,16 +114,16 @@ } if (this.foodStats.needFood() && this.ticksExisted % 10 == 0) -@@ -527,7 +548,7 @@ +@@ -527,7 +547,7 @@ this.setAIMoveSpeed((float)iattributeinstance.getAttributeValue()); float f = MathHelper.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); - float f1 = (float)(Math.atan(-this.motionY * 0.20000000298023224D) * 15.0D); -+ float f1 = (float) (org.bukkit.craftbukkit.TrigMath.atan(-this.motionY * 0.20000000298023224D) * 15.0D);// CraftBukkit ++ float f1 = (float) (TrigMath.atan(-this.motionY * 0.20000000298023224D) * 15.0D);// CraftBukkit if (f > 0.1F) { -@@ -691,6 +712,7 @@ +@@ -691,6 +711,7 @@ @Nullable public EntityItem dropItem(boolean dropAll) { @@ -105,7 +131,7 @@ ItemStack stack = inventory.getCurrentItem(); if (stack.isEmpty()) -@@ -750,6 +772,30 @@ +@@ -750,6 +771,30 @@ entityitem.motionZ += Math.sin((double)f3) * (double)f2; } @@ -136,7 +162,7 @@ ItemStack itemstack = this.dropItemAndGetStack(entityitem); if (traceItem) -@@ -893,6 +939,13 @@ +@@ -893,6 +938,13 @@ this.wakeUpPlayer(true, true, false); } @@ -150,7 +176,7 @@ if (compound.hasKey("SpawnX", 99) && compound.hasKey("SpawnY", 99) && compound.hasKey("SpawnZ", 99)) { this.spawnPos = new BlockPos(compound.getInteger("SpawnX"), compound.getInteger("SpawnY"), compound.getInteger("SpawnZ")); -@@ -987,6 +1040,7 @@ +@@ -987,6 +1039,7 @@ { compound.setTag("ShoulderEntityRight", this.getRightShoulderEntity()); } @@ -158,7 +184,7 @@ } public boolean attackEntityFrom(DamageSource source, float amount) -@@ -1015,13 +1069,13 @@ +@@ -1015,13 +1068,13 @@ this.wakeUpPlayer(true, true, false); } @@ -174,7 +200,7 @@ } if (this.world.getDifficulty() == EnumDifficulty.EASY) -@@ -1035,7 +1089,14 @@ +@@ -1035,7 +1088,14 @@ } } @@ -190,7 +216,7 @@ } } } -@@ -1052,17 +1113,29 @@ +@@ -1052,17 +1112,29 @@ public boolean canAttackPlayer(EntityPlayer other) { @@ -229,7 +255,7 @@ } protected void damageArmor(float damage) -@@ -1113,8 +1186,11 @@ +@@ -1113,8 +1185,11 @@ return (float)i / (float)this.inventory.armorInventory.size(); } @@ -243,7 +269,7 @@ if (!this.isEntityInvulnerable(damageSrc)) { damageAmount = net.minecraftforge.common.ForgeHooks.onLivingHurt(this, damageSrc, damageAmount); -@@ -1140,8 +1216,15 @@ +@@ -1140,8 +1215,15 @@ } } } @@ -259,7 +285,7 @@ public void openEditSign(TileEntitySign signTile) { } -@@ -1317,8 +1400,17 @@ +@@ -1317,8 +1399,17 @@ if (j > 0 && !targetEntity.isBurning()) { @@ -279,7 +305,7 @@ } } -@@ -1353,8 +1445,10 @@ +@@ -1353,8 +1444,10 @@ { if (entitylivingbase != this && entitylivingbase != targetEntity && !this.isOnSameTeam(entitylivingbase) && this.getDistanceSq(entitylivingbase) < 9.0D) { @@ -292,7 +318,7 @@ } } -@@ -1364,11 +1458,28 @@ +@@ -1364,11 +1457,28 @@ if (targetEntity instanceof EntityPlayerMP && targetEntity.velocityChanged) { @@ -326,7 +352,7 @@ } if (flag2) -@@ -1434,7 +1545,15 @@ +@@ -1434,7 +1544,15 @@ if (j > 0) { @@ -343,7 +369,7 @@ } if (this.world instanceof WorldServer && f5 > 2.0F) -@@ -1454,6 +1573,11 @@ +@@ -1454,6 +1572,11 @@ { targetEntity.extinguish(); } @@ -355,7 +381,7 @@ } } } -@@ -1527,9 +1651,9 @@ +@@ -1527,9 +1650,9 @@ return this.gameProfile; } @@ -367,7 +393,7 @@ if (ret != null) return ret; final IBlockState state = this.world.isBlockLoaded(bedLocation) ? this.world.getBlockState(bedLocation) : null; final boolean isBed = state != null && state.getBlock().isBed(state, this.world, bedLocation, this); -@@ -1539,31 +1663,31 @@ +@@ -1539,31 +1662,31 @@ { if (this.isPlayerSleeping() || !this.isEntityAlive()) { @@ -406,7 +432,7 @@ } } -@@ -1572,6 +1696,20 @@ +@@ -1572,6 +1695,20 @@ this.dismountRidingEntity(); } @@ -427,7 +453,7 @@ this.spawnShoulderEntities(); this.setSize(0.2F, 0.2F); -@@ -1598,7 +1736,7 @@ +@@ -1598,7 +1735,7 @@ this.world.updateAllPlayersSleepingFlag(); } @@ -436,7 +462,7 @@ } private boolean bedInRange(BlockPos p_190774_1_, EnumFacing p_190774_2_) -@@ -1651,6 +1789,23 @@ +@@ -1651,6 +1788,23 @@ this.world.updateAllPlayersSleepingFlag(); } @@ -460,7 +486,7 @@ this.sleepTimer = immediately ? 0 : 100; if (setSpawn) -@@ -1757,11 +1912,13 @@ +@@ -1757,11 +1911,13 @@ { this.spawnPos = pos; this.spawnForced = forced; @@ -474,21 +500,21 @@ } } -@@ -1820,7 +1977,12 @@ +@@ -1820,7 +1976,12 @@ this.motionY = d3 * 0.6D; this.jumpMovementFactor = f; this.fallDistance = 0.0F; - this.setFlag(7, false); + // this.setFlag(7, false); + // CraftBukkit start -+ if (getFlag(7) && !org.bukkit.craftbukkit.event.CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) { ++ if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) { + this.setFlag(7, false); + } + // CraftBukkit end } else { -@@ -2225,10 +2387,16 @@ +@@ -2225,10 +2386,16 @@ protected void spawnShoulderEntities() { @@ -509,7 +535,7 @@ } private void spawnShoulderEntity(@Nullable NBTTagCompound p_192026_1_) -@@ -2247,6 +2415,23 @@ +@@ -2247,6 +2414,23 @@ } } @@ -533,7 +559,7 @@ @SideOnly(Side.CLIENT) public boolean isInvisibleToPlayer(EntityPlayer player) { -@@ -2481,7 +2666,7 @@ +@@ -2481,7 +2665,7 @@ return (NBTTagCompound)this.dataManager.get(LEFT_SHOULDER_ENTITY); } @@ -542,7 +568,7 @@ { this.dataManager.set(LEFT_SHOULDER_ENTITY, tag); } -@@ -2491,7 +2676,7 @@ +@@ -2491,7 +2675,7 @@ return (NBTTagCompound)this.dataManager.get(RIGHT_SHOULDER_ENTITY); } @@ -551,7 +577,7 @@ { this.dataManager.set(RIGHT_SHOULDER_ENTITY, tag); } -@@ -2531,7 +2716,7 @@ +@@ -2531,7 +2715,7 @@ public boolean canUseCommandBlock() { @@ -560,7 +586,7 @@ } /** -@@ -2671,7 +2856,7 @@ +@@ -2671,7 +2855,7 @@ @SuppressWarnings("unchecked") @Override @Nullable @@ -569,7 +595,7 @@ { if (capability == net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { -@@ -2683,7 +2868,7 @@ +@@ -2683,7 +2867,7 @@ } @Override @@ -578,7 +604,7 @@ { return capability == net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } -@@ -2702,7 +2887,7 @@ +@@ -2702,7 +2886,7 @@ SYSTEM(1, "options.chat.visibility.system"), HIDDEN(2, "options.chat.visibility.hidden"); @@ -587,7 +613,7 @@ private final int chatVisibility; private final String resourceKey; -@@ -2732,7 +2917,7 @@ +@@ -2732,7 +2916,7 @@ static { @@ -596,7 +622,7 @@ { ID_LOOKUP[entityplayer$enumchatvisibility.chatVisibility] = entityplayer$enumchatvisibility; } -@@ -2763,4 +2948,11 @@ +@@ -2763,4 +2947,11 @@ OTHER_PROBLEM, NOT_SAFE; } diff --git a/patches/net/minecraft/entity/player/EntityPlayerMP.java.patch b/patches/net/minecraft/entity/player/EntityPlayerMP.java.patch index c7ee063b..dc5f4276 100644 --- a/patches/net/minecraft/entity/player/EntityPlayerMP.java.patch +++ b/patches/net/minecraft/entity/player/EntityPlayerMP.java.patch @@ -46,7 +46,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -@@ -109,21 +112,36 @@ +@@ -109,21 +112,37 @@ import net.minecraft.world.GameType; import net.minecraft.world.IInteractionObject; import net.minecraft.world.ILockableContainer; @@ -58,16 +58,17 @@ +import org.bukkit.Bukkit; +import org.bukkit.GameMode; +import org.bukkit.WeatherType; -+import org.bukkit.craftbukkit.CraftWorld; -+import org.bukkit.craftbukkit.entity.CraftPlayer; -+import org.bukkit.craftbukkit.event.CraftEventFactory; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.event.inventory.InventoryType; +import org.bukkit.event.player.PlayerChangedMainHandEvent; +import org.bukkit.event.player.PlayerGameModeChangeEvent; +import org.bukkit.event.player.PlayerLocaleChangeEvent; +import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.inventory.MainHand; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; public class EntityPlayerMP extends EntityPlayer implements IContainerListener { @@ -85,7 +86,7 @@ private final PlayerAdvancements advancements; private final StatisticsManagerServer statsFile; private float lastHealthScore = Float.MIN_VALUE; -@@ -135,13 +153,13 @@ +@@ -135,13 +154,13 @@ private float lastHealth = -1.0E8F; private int lastFoodLevel = -99999999; private boolean wasHungry = true; @@ -103,7 +104,7 @@ private boolean seenCredits; private final RecipeBookServer recipeBook = new RecipeBookServer(); private Vec3d levitationStartPos; -@@ -152,7 +170,31 @@ +@@ -152,7 +171,31 @@ public boolean isChangingQuantityOnly; public int ping; public boolean queuedEndExit; @@ -135,7 +136,7 @@ public EntityPlayerMP(MinecraftServer server, WorldServer worldIn, GameProfile profile, PlayerInteractionManager interactionManagerIn) { super(worldIn, profile); -@@ -188,8 +230,33 @@ +@@ -188,8 +231,33 @@ { this.setPosition(this.posX, this.posY + 1.0D, this.posZ); } @@ -169,7 +170,7 @@ public void readEntityFromNBT(NBTTagCompound compound) { super.readEntityFromNBT(compound); -@@ -218,6 +285,7 @@ +@@ -218,6 +286,7 @@ { this.recipeBook.read(compound.getCompoundTag("recipeBook")); } @@ -177,7 +178,7 @@ } public static void registerFixesPlayerMP(DataFixer p_191522_0_) -@@ -270,8 +338,34 @@ +@@ -270,8 +339,34 @@ } compound.setTag("recipeBook", this.recipeBook.write()); @@ -212,7 +213,7 @@ public void addExperienceLevel(int levels) { super.addExperienceLevel(levels); -@@ -313,6 +407,11 @@ +@@ -313,6 +408,11 @@ public void onUpdate() { @@ -224,7 +225,7 @@ this.interactionManager.updateBlockRemoving(); --this.respawnInvulnerabilityTicks; -@@ -398,7 +497,7 @@ +@@ -398,7 +498,7 @@ if (this.getHealth() != this.lastHealth || this.lastFoodLevel != this.foodStats.getFoodLevel() || this.foodStats.getSaturationLevel() == 0.0F != this.wasHungry) { @@ -233,7 +234,7 @@ this.lastHealth = this.getHealth(); this.lastFoodLevel = this.foodStats.getFoodLevel(); this.wasHungry = this.foodStats.getSaturationLevel() == 0.0F; -@@ -422,6 +521,12 @@ +@@ -422,6 +522,12 @@ this.updateScorePoints(IScoreCriteria.AIR, MathHelper.ceil((float)this.lastAirScore)); } @@ -246,7 +247,7 @@ if (this.getTotalArmorValue() != this.lastArmorScore) { this.lastArmorScore = this.getTotalArmorValue(); -@@ -450,6 +555,16 @@ +@@ -450,6 +556,16 @@ { CriteriaTriggers.LOCATION.trigger(this); } @@ -263,7 +264,7 @@ } catch (Throwable throwable) { -@@ -462,9 +577,9 @@ +@@ -462,9 +578,9 @@ private void updateScorePoints(IScoreCriteria criteria, int points) { @@ -275,7 +276,7 @@ score.setScorePoints(points); } } -@@ -473,30 +588,64 @@ +@@ -473,30 +589,64 @@ { if (net.minecraftforge.common.ForgeHooks.onLivingDeath(this, cause)) return; boolean flag = this.world.getGameRules().getBoolean("showDeathMessages"); @@ -341,7 +342,7 @@ { - this.mcServer.getPlayerList().sendMessage(this.getCombatTracker().getDeathMessage()); + // this.mcServer.getPlayerList().sendMessage(this.getCombatTracker().getDeathMessage()); -+ this.mcServer.getPlayerList().sendMessage(org.bukkit.craftbukkit.util.CraftChatMessage.fromString(deathMessage)); ++ this.mcServer.getPlayerList().sendMessage(CraftChatMessage.fromString(deathMessage)); } } @@ -353,7 +354,7 @@ if (!this.world.getGameRules().getBoolean("keepInventory") && !this.isSpectator()) { -@@ -516,9 +665,14 @@ +@@ -516,9 +666,14 @@ } } @@ -370,7 +371,7 @@ score.incrementScore(); } -@@ -549,23 +703,28 @@ +@@ -549,23 +704,28 @@ { super.awardKillScore(p_191956_1_, p_191956_2_, p_191956_3_); this.addScore(p_191956_2_); @@ -405,7 +406,7 @@ } CriteriaTriggers.PLAYER_KILLED_ENTITY.trigger(this, p_191956_1_, p_191956_3_); -@@ -606,6 +765,43 @@ +@@ -606,6 +766,43 @@ return Lists.newArrayList(); } @@ -449,7 +450,7 @@ public boolean attackEntityFrom(DamageSource source, float amount) { if (this.isEntityInvulnerable(source)) -@@ -641,8 +837,17 @@ +@@ -641,8 +838,17 @@ } } } @@ -469,7 +470,7 @@ } } } -@@ -654,14 +859,17 @@ +@@ -654,14 +860,17 @@ private boolean canPlayersAttack() { @@ -489,7 +490,7 @@ if (this.dimension == 0 && dimensionIn == -1) { -@@ -674,6 +882,7 @@ +@@ -674,6 +883,7 @@ if (this.dimension == 1 && dimensionIn == 1 && teleporter.isVanilla()) { @@ -497,7 +498,7 @@ this.world.removeEntity(this); if (!this.queuedEndExit) -@@ -692,7 +901,21 @@ +@@ -692,7 +902,21 @@ dimensionIn = 1; } @@ -520,7 +521,7 @@ this.connection.sendPacket(new SPacketEffect(1032, BlockPos.ORIGIN, 0, false)); this.lastExperience = -1; this.lastHealth = -1.0F; -@@ -732,11 +955,11 @@ +@@ -732,11 +956,11 @@ this.openContainer.detectAndSendChanges(); } @@ -535,7 +536,7 @@ { this.addStat(StatList.SLEEP_IN_BED); Packet packet = new SPacketUseBed(this, bedLocation); -@@ -751,6 +974,7 @@ +@@ -751,6 +975,7 @@ public void wakeUpPlayer(boolean immediately, boolean updateWorldFlag, boolean setSpawn) { @@ -543,7 +544,7 @@ if (this.isPlayerSleeping()) { this.getServerWorld().getEntityTracker().sendToTrackingAndSelf(this, new SPacketAnimation(this, 2)); -@@ -844,6 +1068,12 @@ +@@ -844,6 +1069,12 @@ this.connection.sendPacket(new SPacketSignEditorOpen(signTile.getPos())); } @@ -556,7 +557,7 @@ public void getNextWindowId() { this.currentWindowId = this.currentWindowId % 100 + 1; -@@ -851,15 +1081,23 @@ +@@ -851,15 +1082,23 @@ public void displayGui(IInteractionObject guiOwner) { @@ -582,7 +583,7 @@ this.openContainer.windowId = this.currentWindowId; this.openContainer.addListener(this); net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.player.PlayerContainerEvent.Open(this, this.openContainer)); -@@ -868,6 +1106,29 @@ +@@ -868,6 +1107,29 @@ public void displayGUIChest(IInventory chestInventory) { @@ -612,7 +613,7 @@ if (chestInventory instanceof ILootContainer && ((ILootContainer)chestInventory).getLootTable() != null && this.isSpectator()) { this.sendStatusMessage((new TextComponentTranslation("container.spectatorCantOpen", new Object[0])).setStyle((new Style()).setColor(TextFormatting.RED)), true); -@@ -887,8 +1148,10 @@ +@@ -887,8 +1149,10 @@ { this.connection.sendPacket(new SPacketChat(new TextComponentTranslation("container.isLocked", new Object[] {chestInventory.getDisplayName()}), ChatType.GAME_INFO)); this.connection.sendPacket(new SPacketSoundEffect(SoundEvents.BLOCK_CHEST_LOCKED, SoundCategory.BLOCKS, this.posX, this.posY, this.posZ, 1.0F, 1.0F)); @@ -623,7 +624,7 @@ } this.getNextWindowId(); -@@ -896,12 +1159,14 @@ +@@ -896,12 +1160,14 @@ if (chestInventory instanceof IInteractionObject) { this.connection.sendPacket(new SPacketOpenWindow(this.currentWindowId, ((IInteractionObject)chestInventory).getGuiID(), chestInventory.getDisplayName(), chestInventory.getSizeInventory())); @@ -640,7 +641,7 @@ } this.openContainer.windowId = this.currentWindowId; -@@ -912,8 +1177,15 @@ +@@ -912,8 +1178,15 @@ public void displayVillagerTradeGui(IMerchant villager) { @@ -657,7 +658,7 @@ this.openContainer.windowId = this.currentWindowId; this.openContainer.addListener(this); net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.player.PlayerContainerEvent.Open(this, this.openContainer)); -@@ -933,6 +1205,13 @@ +@@ -933,6 +1206,13 @@ public void openGuiHorseInventory(AbstractHorse horse, IInventory inventoryIn) { @@ -671,7 +672,7 @@ if (this.openContainer != this.inventoryContainer) { this.closeScreen(); -@@ -940,7 +1219,8 @@ +@@ -940,7 +1220,8 @@ this.getNextWindowId(); this.connection.sendPacket(new SPacketOpenWindow(this.currentWindowId, "EntityHorse", inventoryIn.getDisplayName(), inventoryIn.getSizeInventory(), horse.getEntityId())); @@ -681,7 +682,7 @@ this.openContainer.windowId = this.currentWindowId; this.openContainer.addListener(this); } -@@ -988,6 +1268,12 @@ +@@ -988,6 +1269,12 @@ { this.connection.sendPacket(new SPacketWindowItems(containerToSend.windowId, itemsList)); this.connection.sendPacket(new SPacketSetSlot(-1, -1, this.inventory.getItemStack())); @@ -694,7 +695,7 @@ } public void sendWindowProperty(Container containerIn, int varToUpdate, int newValue) -@@ -1005,6 +1291,7 @@ +@@ -1005,6 +1292,7 @@ public void closeScreen() { @@ -702,7 +703,7 @@ this.connection.sendPacket(new SPacketCloseWindow(this.openContainer.windowId)); this.closeContainer(); } -@@ -1080,6 +1367,10 @@ +@@ -1080,6 +1368,10 @@ for (ResourceLocation resourcelocation : p_193102_1_) { @@ -713,7 +714,7 @@ list.add(CraftingManager.getRecipe(resourcelocation)); } -@@ -1110,8 +1401,16 @@ +@@ -1110,8 +1402,16 @@ public void setPlayerHealthUpdated() { this.lastHealth = -1.0E8F; @@ -730,7 +731,7 @@ public void sendStatusMessage(ITextComponent chatComponent, boolean actionBar) { this.connection.sendPacket(new SPacketChat(chatComponent, actionBar ? ChatType.GAME_INFO : ChatType.CHAT)); -@@ -1156,7 +1455,7 @@ +@@ -1156,7 +1456,7 @@ this.lastExperience = -1; this.lastHealth = -1.0F; this.lastFoodLevel = -1; @@ -739,7 +740,7 @@ this.entityRemoveQueue.addAll(that.entityRemoveQueue); this.seenCredits = that.seenCredits; this.enteredNetherPosition = that.enteredNetherPosition; -@@ -1246,6 +1545,18 @@ +@@ -1246,6 +1546,18 @@ public void setGameType(GameType gameType) { @@ -758,7 +759,7 @@ this.interactionManager.setGameType(gameType); this.connection.sendPacket(new SPacketChangeGameState(3, (float)gameType.getID())); -@@ -1280,34 +1591,32 @@ +@@ -1280,34 +1592,32 @@ public boolean canUseCommand(int permLevel, String commandName) { @@ -814,7 +815,7 @@ } public String getPlayerIP() -@@ -1320,6 +1629,17 @@ +@@ -1320,6 +1630,17 @@ public void handleClientSettings(CPacketClientSettings packetIn) { @@ -832,7 +833,7 @@ this.language = packetIn.getLang(); this.chatVisibility = packetIn.getChatVisibility(); this.chatColours = packetIn.isColorsEnabled(); -@@ -1327,7 +1647,7 @@ +@@ -1327,7 +1648,7 @@ this.getDataManager().set(MAIN_HAND, Byte.valueOf((byte)(packetIn.getMainHand() == EnumHandSide.LEFT ? 0 : 1))); } @@ -841,7 +842,7 @@ { return this.chatVisibility; } -@@ -1402,7 +1722,7 @@ +@@ -1402,7 +1723,7 @@ if (entity != this.spectatingEntity) { this.connection.sendPacket(new SPacketCamera(this.spectatingEntity)); @@ -850,7 +851,7 @@ } } -@@ -1434,7 +1754,8 @@ +@@ -1434,7 +1755,8 @@ @Nullable public ITextComponent getTabListDisplayName() { @@ -860,7 +861,7 @@ } public void swingArm(EnumHand hand) -@@ -1455,13 +1776,20 @@ +@@ -1455,13 +1777,20 @@ public void setElytraFlying() { @@ -884,7 +885,7 @@ } public PlayerAdvancements getAdvancements() -@@ -1474,4 +1802,145 @@ +@@ -1474,4 +1803,145 @@ { return this.enteredNetherPosition; } diff --git a/patches/net/minecraft/entity/player/InventoryPlayer.java.patch b/patches/net/minecraft/entity/player/InventoryPlayer.java.patch index 8097fe8c..6d3b221b 100644 --- a/patches/net/minecraft/entity/player/InventoryPlayer.java.patch +++ b/patches/net/minecraft/entity/player/InventoryPlayer.java.patch @@ -12,7 +12,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; public class InventoryPlayer implements IInventory diff --git a/patches/net/minecraft/entity/projectile/EntityArrow.java.patch b/patches/net/minecraft/entity/projectile/EntityArrow.java.patch index 7bc29c73..5feea90e 100644 --- a/patches/net/minecraft/entity/projectile/EntityArrow.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityArrow.java.patch @@ -8,7 +8,7 @@ import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -@@ -36,6 +37,10 @@ +@@ -36,6 +37,12 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -16,10 +16,12 @@ +import org.bukkit.event.entity.EntityCombustByEntityEvent; +import org.bukkit.event.entity.EntityCombustEvent; +import org.bukkit.event.player.PlayerPickupArrowEvent; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftItem; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public abstract class EntityArrow extends Entity implements IProjectile { -@@ -47,21 +52,33 @@ +@@ -47,21 +54,33 @@ } }); private static final DataParameter CRITICAL = EntityDataManager.createKey(EntityArrow.class, DataSerializers.BYTE); @@ -59,7 +61,7 @@ public EntityArrow(World worldIn) { super(worldIn); -@@ -83,6 +100,7 @@ +@@ -83,6 +102,7 @@ { this(worldIn, shooter.posX, shooter.posY + (double)shooter.getEyeHeight() - 0.10000000149011612D, shooter.posZ); this.shootingEntity = shooter; @@ -67,7 +69,7 @@ if (shooter instanceof EntityPlayer) { -@@ -222,7 +240,7 @@ +@@ -222,7 +242,7 @@ { ++this.ticksInGround; @@ -76,16 +78,16 @@ { this.setDead(); } -@@ -339,7 +357,7 @@ +@@ -339,7 +359,7 @@ protected void onHit(RayTraceResult raytraceResultIn) { Entity entity = raytraceResultIn.entityHit; - -+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, raytraceResultIn); ++ CraftEventFactory.callProjectileHitEvent(this, raytraceResultIn); if (entity != null) { float f = MathHelper.sqrt(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); -@@ -363,7 +381,12 @@ +@@ -363,7 +383,12 @@ if (this.isBurning() && !(entity instanceof EntityEnderman)) { @@ -99,7 +101,7 @@ } if (entity.attackEntityFrom(damagesource, (float)i)) -@@ -570,9 +593,20 @@ +@@ -570,9 +595,20 @@ { if (!this.world.isRemote && this.inGround && this.arrowShake <= 0) { @@ -107,7 +109,7 @@ + ItemStack itemstack = this.getArrowStack(); + EntityItem item = new EntityItem(this.world, this.posX, this.posY, this.posZ, itemstack); + if (this.pickupStatus == PickupStatus.ALLOWED && entityIn.inventory.canHold(itemstack) > 0) { -+ PlayerPickupArrowEvent event = new PlayerPickupArrowEvent((org.bukkit.entity.Player) entityIn.getBukkitEntity(), new org.bukkit.craftbukkit.entity.CraftItem(this.world.getServer(), this, item), (org.bukkit.entity.Arrow) this.getBukkitEntity()); ++ PlayerPickupArrowEvent event = new PlayerPickupArrowEvent((org.bukkit.entity.Player) entityIn.getBukkitEntity(), new CraftItem(this.world.getServer(), this, item), (org.bukkit.entity.Arrow) this.getBukkitEntity()); + // event.setCancelled(!entityhuman.thisisatest); TODO + this.world.getServer().getPluginManager().callEvent(event); @@ -122,7 +124,7 @@ { flag = false; } -@@ -655,7 +689,13 @@ +@@ -655,7 +691,13 @@ if (EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.FLAME, p_190547_1_) > 0) { diff --git a/patches/net/minecraft/entity/projectile/EntityEvokerFangs.java.patch b/patches/net/minecraft/entity/projectile/EntityEvokerFangs.java.patch index fa426d2d..97dbc311 100644 --- a/patches/net/minecraft/entity/projectile/EntityEvokerFangs.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityEvokerFangs.java.patch @@ -1,12 +1,20 @@ --- ../src-base/minecraft/net/minecraft/entity/projectile/EntityEvokerFangs.java +++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityEvokerFangs.java -@@ -136,7 +136,9 @@ +@@ -12,6 +12,7 @@ + import net.minecraft.world.WorldServer; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class EntityEvokerFangs extends Entity + { +@@ -136,7 +137,9 @@ { if (entitylivingbase == null) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = this; ++ CraftEventFactory.entityDamage = this; p_190551_1_.attackEntityFrom(DamageSource.MAGIC, 6.0F); -+ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = null; ++ CraftEventFactory.entityDamage = null; } else { diff --git a/patches/net/minecraft/entity/projectile/EntityFireball.java.patch b/patches/net/minecraft/entity/projectile/EntityFireball.java.patch index 32705663..6c3bd0d5 100644 --- a/patches/net/minecraft/entity/projectile/EntityFireball.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityFireball.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public abstract class EntityFireball extends Entity { diff --git a/patches/net/minecraft/entity/projectile/EntityFishHook.java.patch b/patches/net/minecraft/entity/projectile/EntityFishHook.java.patch index 71607aee..8e1863e6 100644 --- a/patches/net/minecraft/entity/projectile/EntityFishHook.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityFishHook.java.patch @@ -1,6 +1,23 @@ --- ../src-base/minecraft/net/minecraft/entity/projectile/EntityFishHook.java +++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityFishHook.java -@@ -32,20 +32,24 @@ +@@ -1,7 +1,7 @@ + package net.minecraft.entity.projectile; + + import java.util.List; +-import net.minecraft.block.Block; ++ + import net.minecraft.block.BlockLiquid; + import net.minecraft.block.material.Material; + import net.minecraft.block.state.IBlockState; +@@ -10,7 +10,6 @@ + import net.minecraft.entity.item.EntityItem; + import net.minecraft.entity.item.EntityXPOrb; + import net.minecraft.entity.player.EntityPlayer; +-import net.minecraft.init.Blocks; + import net.minecraft.init.Items; + import net.minecraft.init.SoundEvents; + import net.minecraft.item.Item; +@@ -32,20 +31,25 @@ import net.minecraft.world.storage.loot.LootTableList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -8,6 +25,7 @@ +import org.bukkit.entity.Fish; +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerFishEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityFishHook extends Entity { @@ -83,7 +101,7 @@ if (raytraceresult != null && raytraceresult.typeOfHit != RayTraceResult.Type.MISS) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, raytraceresult); // Craftbukkit - Call event ++ CraftEventFactory.callProjectileHitEvent(this, raytraceresult); // Craftbukkit - Call event if (raytraceresult.typeOfHit == RayTraceResult.Type.ENTITY) { this.caughtEntity = raytraceresult.entityHit; diff --git a/patches/net/minecraft/entity/projectile/EntityLargeFireball.java.patch b/patches/net/minecraft/entity/projectile/EntityLargeFireball.java.patch index 324a91fc..c97d72f9 100644 --- a/patches/net/minecraft/entity/projectile/EntityLargeFireball.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityLargeFireball.java.patch @@ -1,10 +1,18 @@ --- ../src-base/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.java +++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.java -@@ -9,6 +9,7 @@ +@@ -1,6 +1,5 @@ + package net.minecraft.entity.projectile; + +-import net.minecraft.entity.Entity; + import net.minecraft.entity.EntityLivingBase; + import net.minecraft.nbt.NBTTagCompound; + import net.minecraft.util.DamageSource; +@@ -9,6 +8,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.event.entity.ExplosionPrimeEvent; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; public class EntityLargeFireball extends EntityFireball { @@ -33,7 +41,7 @@ - this.world.newExplosion((Entity)null, this.posX, this.posY, this.posZ, (float)this.explosionPower, flag, flag); + // this.world.newExplosion((Entity)null, this.posX, this.posY, this.posZ, (float)this.explosionPower, flag, flag); + // CraftBukkit start - fire ExplosionPrimeEvent -+ ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) org.bukkit.craftbukkit.entity.CraftEntity.getEntity(this.world.getServer(), this)); ++ ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) CraftEntity.getEntity(this.world.getServer(), this)); + this.world.getServer().getPluginManager().callEvent(event); + if (!event.isCancelled()) { + // give 'this' instead of (Entity) null so we know what causes the damage diff --git a/patches/net/minecraft/entity/projectile/EntityLlamaSpit.java.patch b/patches/net/minecraft/entity/projectile/EntityLlamaSpit.java.patch index 88d41dc6..ffd2dc32 100644 --- a/patches/net/minecraft/entity/projectile/EntityLlamaSpit.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityLlamaSpit.java.patch @@ -8,7 +8,11 @@ import net.minecraft.entity.IProjectile; import net.minecraft.entity.passive.EntityLlama; import net.minecraft.nbt.NBTTagCompound; -@@ -20,7 +21,7 @@ +@@ -17,10 +18,11 @@ + import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityLlamaSpit extends Entity implements IProjectile { @@ -17,11 +21,11 @@ private NBTTagCompound ownerNbt; public EntityLlamaSpit(World worldIn) -@@ -211,6 +212,7 @@ +@@ -211,6 +213,7 @@ public void onHit(RayTraceResult p_190536_1_) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, p_190536_1_); // CraftBukkit ++ CraftEventFactory.callProjectileHitEvent(this, p_190536_1_); // CraftBukkit if (p_190536_1_.entityHit != null && this.owner != null) { p_190536_1_.entityHit.attackEntityFrom(DamageSource.causeIndirectDamage(this, this.owner).setProjectile(), 1.0F); diff --git a/patches/net/minecraft/entity/projectile/EntityPotion.java.patch b/patches/net/minecraft/entity/projectile/EntityPotion.java.patch index a984a154..b8b4beb1 100644 --- a/patches/net/minecraft/entity/projectile/EntityPotion.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityPotion.java.patch @@ -10,16 +10,17 @@ import javax.annotation.Nullable; import net.minecraft.entity.EntityAreaEffectCloud; import net.minecraft.entity.EntityLivingBase; -@@ -31,6 +33,8 @@ +@@ -31,6 +33,9 @@ import net.minecraft.world.World; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -+import org.bukkit.craftbukkit.entity.CraftLivingEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftLivingEntity; +import org.bukkit.entity.LivingEntity; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntityPotion extends EntityThrowable { -@@ -124,7 +128,7 @@ +@@ -124,7 +129,7 @@ { this.applyWater(); } @@ -28,7 +29,7 @@ { if (this.isLingering()) { -@@ -161,45 +165,55 @@ +@@ -161,45 +166,55 @@ } } @@ -65,7 +66,7 @@ + } + } + } -+ org.bukkit.event.entity.PotionSplashEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPotionSplashEvent(this, affected); ++ org.bukkit.event.entity.PotionSplashEvent event = CraftEventFactory.callPotionSplashEvent(this, affected); + if (!event.isCancelled() && p_190543_2_ != null && !p_190543_2_.isEmpty()) { // do not process effects if there are no effects to process + for (LivingEntity victim : event.getAffectedEntities()) { + if (!(victim instanceof CraftLivingEntity)) { @@ -112,13 +113,13 @@ } } } -@@ -229,10 +243,16 @@ +@@ -229,10 +244,16 @@ entityareaeffectcloud.setColor(nbttagcompound.getInteger("CustomPotionColor")); } - this.world.spawnEntity(entityareaeffectcloud); + // this.world.spawnEntity(entityareaeffectcloud); -+ org.bukkit.event.entity.LingeringPotionSplashEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callLingeringPotionSplashEvent(this, entityareaeffectcloud); ++ org.bukkit.event.entity.LingeringPotionSplashEvent event = CraftEventFactory.callLingeringPotionSplashEvent(this, entityareaeffectcloud); + if (!(event.isCancelled() || entityareaeffectcloud.isDead)) { + this.world.spawnEntity(entityareaeffectcloud); + } else { diff --git a/patches/net/minecraft/entity/projectile/EntityShulkerBullet.java.patch b/patches/net/minecraft/entity/projectile/EntityShulkerBullet.java.patch index 242dce03..d69bb6f6 100644 --- a/patches/net/minecraft/entity/projectile/EntityShulkerBullet.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityShulkerBullet.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/entity/projectile/EntityShulkerBullet.java +++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityShulkerBullet.java -@@ -77,8 +77,29 @@ +@@ -25,6 +25,7 @@ + import net.minecraft.world.WorldServer; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class EntityShulkerBullet extends Entity + { +@@ -77,8 +78,29 @@ this.target = targetIn; this.direction = EnumFacing.UP; this.selectNextMoveDirection(p_i46772_4_); @@ -30,11 +38,11 @@ protected void writeEntityToNBT(NBTTagCompound compound) { if (this.owner != null) -@@ -382,6 +403,7 @@ +@@ -382,6 +404,7 @@ protected void bulletHit(RayTraceResult result) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, result); // CraftBukkit ++ CraftEventFactory.callProjectileHitEvent(this, result); // CraftBukkit if (result.entityHit == null) { ((WorldServer)this.world).spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, this.posX, this.posY, this.posZ, 2, 0.2D, 0.2D, 0.2D, 0.0D); diff --git a/patches/net/minecraft/entity/projectile/EntitySmallFireball.java.patch b/patches/net/minecraft/entity/projectile/EntitySmallFireball.java.patch index 2547d7c3..2a6e25d1 100644 --- a/patches/net/minecraft/entity/projectile/EntitySmallFireball.java.patch +++ b/patches/net/minecraft/entity/projectile/EntitySmallFireball.java.patch @@ -1,14 +1,15 @@ --- ../src-base/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.java +++ ../src-work/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.java -@@ -8,6 +8,7 @@ +@@ -8,6 +8,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import org.bukkit.event.entity.EntityCombustByEntityEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class EntitySmallFireball extends EntityFireball { -@@ -21,6 +22,9 @@ +@@ -21,6 +23,9 @@ { super(worldIn, shooter, accelX, accelY, accelZ); this.setSize(0.3125F, 0.3125F); @@ -18,7 +19,7 @@ } public EntitySmallFireball(World worldIn, double x, double y, double z, double accelX, double accelY, double accelZ) -@@ -42,12 +46,17 @@ +@@ -42,12 +47,17 @@ { if (!result.entityHit.isImmuneToFire()) { @@ -41,7 +42,7 @@ } } } -@@ -60,13 +69,15 @@ +@@ -60,13 +70,15 @@ flag1 = net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(this.world, this.shootingEntity); } @@ -53,7 +54,7 @@ if (this.world.isAirBlock(blockpos)) { - this.world.setBlockState(blockpos, Blocks.FIRE.getDefaultState()); -+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockpos.getX(), blockpos.getY(), blockpos.getZ(), this).isCancelled()) { ++ if (!CraftEventFactory.callBlockIgniteEvent(world, blockpos.getX(), blockpos.getY(), blockpos.getZ(), this).isCancelled()) { + this.world.setBlockState(blockpos, Blocks.FIRE.getDefaultState()); + } } diff --git a/patches/net/minecraft/entity/projectile/EntityThrowable.java.patch b/patches/net/minecraft/entity/projectile/EntityThrowable.java.patch index bbffb0f0..d2399c9c 100644 --- a/patches/net/minecraft/entity/projectile/EntityThrowable.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityThrowable.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/entity/projectile/EntityThrowable.java +++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityThrowable.java -@@ -31,8 +31,8 @@ +@@ -22,6 +22,7 @@ + import net.minecraft.world.WorldServer; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public abstract class EntityThrowable extends Entity implements IProjectile + { +@@ -31,8 +32,8 @@ private Block inTile; protected boolean inGround; public int throwableShake; @@ -11,7 +19,7 @@ private int ticksInGround; private int ticksInAir; public Entity ignoreEntity; -@@ -57,6 +57,7 @@ +@@ -57,6 +58,7 @@ { this(worldIn, throwerIn.posX, throwerIn.posY + (double)throwerIn.getEyeHeight() - 0.10000000149011612D, throwerIn.posZ); this.thrower = throwerIn; @@ -19,7 +27,7 @@ } protected void entityInit() -@@ -196,7 +197,7 @@ +@@ -196,7 +198,7 @@ { flag = true; } @@ -28,12 +36,12 @@ { this.ignoreEntity = entity1; flag = true; -@@ -247,6 +248,9 @@ +@@ -247,6 +249,9 @@ else if (!net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, raytraceresult)) { this.onImpact(raytraceresult); + if (this.isDead) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, raytraceresult); ++ CraftEventFactory.callProjectileHitEvent(this, raytraceresult); + } } } diff --git a/patches/net/minecraft/init/Bootstrap.java.patch b/patches/net/minecraft/init/Bootstrap.java.patch index 91980702..29ba266a 100644 --- a/patches/net/minecraft/init/Bootstrap.java.patch +++ b/patches/net/minecraft/init/Bootstrap.java.patch @@ -20,20 +20,31 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; -@@ -71,6 +65,12 @@ +@@ -31,7 +25,6 @@ + import net.minecraft.entity.item.EntityFireworkRocket; + import net.minecraft.entity.item.EntityTNTPrimed; + import net.minecraft.entity.player.EntityPlayer; +-import net.minecraft.entity.player.EntityPlayerMP; + import net.minecraft.entity.projectile.EntityArrow; + import net.minecraft.entity.projectile.EntityEgg; + import net.minecraft.entity.projectile.EntityPotion; +@@ -71,6 +64,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.Location; +import org.bukkit.TreeType; +import org.bukkit.block.BlockState; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlockState; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.event.block.BlockDispenseEvent; +import org.bukkit.event.world.StructureGrowEvent; ++import org.bukkit.craftbukkit.v1_12_R1.projectiles.CraftBlockProjectileSource; public class Bootstrap { -@@ -193,15 +193,42 @@ +@@ -193,15 +195,42 @@ double d0 = source.getX() + (double)enumfacing.getFrontOffsetX(); double d1 = (double)((float)(source.getBlockPos().getY() + enumfacing.getFrontOffsetY()) + 0.2F); double d2 = source.getZ() + (double)enumfacing.getFrontOffsetZ(); @@ -78,7 +89,7 @@ return stack; } }); -@@ -213,7 +240,33 @@ +@@ -213,7 +242,33 @@ double d0 = source.getX() + (double)enumfacing.getFrontOffsetX(); double d1 = (double)((float)source.getBlockPos().getY() + 0.2F); double d2 = source.getZ() + (double)enumfacing.getFrontOffsetZ(); @@ -113,7 +124,7 @@ source.getWorld().spawnEntity(entityfireworkrocket); stack.shrink(1); return stack; -@@ -237,8 +290,34 @@ +@@ -237,8 +292,34 @@ double d3 = random.nextGaussian() * 0.05D + (double)enumfacing.getFrontOffsetX(); double d4 = random.nextGaussian() * 0.05D + (double)enumfacing.getFrontOffsetY(); double d5 = random.nextGaussian() * 0.05D + (double)enumfacing.getFrontOffsetZ(); @@ -144,13 +155,13 @@ + } + + EntitySmallFireball fireball = new EntitySmallFireball(world, d0, d1, d2, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ()); -+ fireball.projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource((TileEntityDispenser) source.getBlockTileEntity()); ++ fireball.projectileSource = new CraftBlockProjectileSource((TileEntityDispenser) source.getBlockTileEntity()); + +// stack.shrink(1); return stack; } protected void playDispenseSound(IBlockSource source) -@@ -246,20 +325,63 @@ +@@ -246,20 +327,63 @@ source.getWorld().playEvent(1018, source.getBlockPos(), 0); } }); @@ -223,7 +234,7 @@ } }; BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.LAVA_BUCKET, ibehaviordispenseitem); -@@ -293,6 +415,26 @@ +@@ -293,6 +417,26 @@ item = Items.LAVA_BUCKET; } @@ -250,7 +261,7 @@ world.setBlockToAir(blockpos); stack.shrink(1); -@@ -311,21 +453,42 @@ +@@ -311,21 +455,42 @@ } } }); @@ -292,7 +303,7 @@ - if (stack.attemptDamageItem(1, world.rand, (EntityPlayerMP)null)) - { - stack.setCount(0); -+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockpos.getX(), blockpos.getY(), blockpos.getZ(), source.getBlockPos().getX(), source.getBlockPos().getY(), source.getBlockPos().getZ()).isCancelled()) { ++ if (!CraftEventFactory.callBlockIgniteEvent(world, blockpos.getX(), blockpos.getY(), blockpos.getZ(), source.getBlockPos().getX(), source.getBlockPos().getY(), source.getBlockPos().getZ()).isCancelled()) { + world.setBlockState(blockpos, Blocks.FIRE.getDefaultState()); + if (stack.attemptDamageItem(1, world.rand, null)) { + stack.setCount(0); @@ -300,7 +311,7 @@ } } else if (world.getBlockState(blockpos).getBlock() == Blocks.TNT) -@@ -341,7 +504,7 @@ +@@ -341,7 +506,7 @@ return stack; } }); @@ -309,7 +320,7 @@ { protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) { -@@ -351,7 +514,28 @@ +@@ -351,7 +516,28 @@ { World world = source.getWorld(); BlockPos blockpos = source.getBlockPos().offset((EnumFacing)source.getBlockState().getValue(BlockDispenser.FACING)); @@ -338,7 +349,7 @@ if (ItemDye.applyBonemeal(stack, world, blockpos)) { if (!world.isRemote) -@@ -364,6 +548,28 @@ +@@ -364,6 +550,28 @@ this.successful = false; } @@ -350,7 +361,7 @@ + List blocks = (List) world.capturedBlockSnapshots.clone(); + List blockstates = new java.util.ArrayList(); + for (net.minecraftforge.common.util.BlockSnapshot snapshot : blocks) { -+ blockstates.add(new org.bukkit.craftbukkit.block.CraftBlockState(snapshot)); ++ blockstates.add(new CraftBlockState(snapshot)); + } + world.capturedBlockSnapshots.clear(); + StructureGrowEvent structureEvent = null; @@ -367,7 +378,7 @@ return stack; } else -@@ -378,14 +584,38 @@ +@@ -378,14 +586,38 @@ { World world = source.getWorld(); BlockPos blockpos = source.getBlockPos().offset((EnumFacing)source.getBlockState().getValue(BlockDispenser.FACING)); @@ -409,7 +420,7 @@ { protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) { -@@ -393,6 +623,27 @@ +@@ -393,6 +625,27 @@ EnumFacing enumfacing = (EnumFacing)source.getBlockState().getValue(BlockDispenser.FACING); BlockPos blockpos = source.getBlockPos().offset(enumfacing); BlockSkull blockskull = Blocks.SKULL; @@ -437,7 +448,7 @@ this.successful = true; if (world.isAirBlock(blockpos) && blockskull.canDispenserPlace(world, blockpos, stack)) -@@ -449,13 +700,34 @@ +@@ -449,13 +702,34 @@ return stack; } }); @@ -473,7 +484,7 @@ this.successful = true; if (world.isAirBlock(blockpos) && blockpumpkin.canDispenserPlace(world, blockpos)) -@@ -483,7 +755,7 @@ +@@ -483,7 +757,7 @@ for (EnumDyeColor enumdyecolor : EnumDyeColor.values()) { @@ -482,7 +493,7 @@ } } -@@ -588,11 +860,37 @@ +@@ -588,11 +862,37 @@ d3 = 0.0D; } @@ -523,7 +534,7 @@ return stack; } -@@ -612,7 +910,7 @@ +@@ -612,7 +912,7 @@ } } @@ -532,7 +543,7 @@ { private BehaviorDispenseShulkerBox() { -@@ -624,6 +922,27 @@ +@@ -624,6 +924,27 @@ World world = source.getWorld(); EnumFacing enumfacing = (EnumFacing)source.getBlockState().getValue(BlockDispenser.FACING); BlockPos blockpos = source.getBlockPos().offset(enumfacing); diff --git a/patches/net/minecraft/inventory/Container.java.patch b/patches/net/minecraft/inventory/Container.java.patch index 375bac0f..83f73af9 100644 --- a/patches/net/minecraft/inventory/Container.java.patch +++ b/patches/net/minecraft/inventory/Container.java.patch @@ -1,33 +1,32 @@ --- ../src-base/minecraft/net/minecraft/inventory/Container.java +++ ../src-work/minecraft/net/minecraft/inventory/Container.java -@@ -18,7 +18,26 @@ +@@ -18,7 +18,25 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.Bukkit; -+import org.bukkit.craftbukkit.entity.CraftPlayer; -+import org.bukkit.craftbukkit.inventory.CraftInventory; -+import org.bukkit.craftbukkit.inventory.CraftInventoryView; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryView; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.event.Event; +import org.bukkit.event.inventory.InventoryDragEvent; +import org.bukkit.event.inventory.InventoryType; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.InventoryView; -+import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; -+import java.util.List; +import java.util.Map; -+import java.util.Set; + public abstract class Container { public NonNullList inventoryItemStacks = NonNullList.create(); -@@ -31,7 +50,77 @@ +@@ -31,7 +49,77 @@ private final Set dragSlots = Sets.newHashSet(); protected List listeners = Lists.newArrayList(); private final Set playerList = Sets.newHashSet(); @@ -47,7 +46,7 @@ + return bukkitView; + } + -+ public void transferTo(Container other, org.bukkit.craftbukkit.entity.CraftHumanEntity player) { ++ public void transferTo(Container other, CraftHumanEntity player) { + InventoryView source = this.getBukkitView(), destination = other.getBukkitView(); + if (source != null) { + try { @@ -105,7 +104,7 @@ protected Slot addSlotToContainer(Slot slotIn) { slotIn.slotNumber = this.inventorySlots.size(); -@@ -79,7 +168,7 @@ +@@ -79,7 +167,7 @@ ItemStack itemstack = ((Slot)this.inventorySlots.get(i)).getStack(); ItemStack itemstack1 = this.inventoryItemStacks.get(i); @@ -114,7 +113,7 @@ { boolean clientStackChanged = !ItemStack.areItemStacksEqualUsingNBTShareTag(itemstack1, itemstack); itemstack1 = itemstack.isEmpty() ? ItemStack.EMPTY : itemstack.copy(); -@@ -92,6 +181,7 @@ +@@ -92,6 +180,7 @@ } } } @@ -122,7 +121,7 @@ } public boolean enchantItem(EntityPlayer playerIn, int id) -@@ -174,7 +264,7 @@ +@@ -174,7 +263,7 @@ { ItemStack itemstack9 = inventoryplayer.getItemStack().copy(); int k1 = inventoryplayer.getItemStack().getCount(); @@ -131,7 +130,7 @@ for (Slot slot8 : this.dragSlots) { ItemStack itemstack13 = inventoryplayer.getItemStack(); -@@ -192,12 +282,50 @@ +@@ -192,12 +281,50 @@ } k1 -= itemstack14.getCount() - j3; @@ -185,7 +184,7 @@ } this.resetDrag(); -@@ -219,8 +347,9 @@ +@@ -219,8 +346,9 @@ { if (dragType == 0) { @@ -196,7 +195,7 @@ } if (dragType == 1) -@@ -348,6 +477,15 @@ +@@ -348,6 +476,15 @@ } slot6.onSlotChanged(); @@ -212,13 +211,13 @@ } } } -@@ -797,7 +935,9 @@ +@@ -797,7 +934,9 @@ p_192389_4_.setRecipeUsed(irecipe); itemstack = irecipe.getCraftingResult(p_192389_3_); } - + if (p_192389_3_.resultInventory != null && getBukkitView() != null) { -+ itemstack = org.bukkit.craftbukkit.event.CraftEventFactory.callPreCraftEvent(p_192389_3_, itemstack, getBukkitView(), false); // CraftBukkit ++ itemstack = CraftEventFactory.callPreCraftEvent(p_192389_3_, itemstack, getBukkitView(), false); // CraftBukkit + } p_192389_4_.setInventorySlotContents(0, itemstack); entityplayermp.connection.sendPacket(new SPacketSetSlot(this.windowId, 0, itemstack)); diff --git a/patches/net/minecraft/inventory/ContainerBeacon.java.patch b/patches/net/minecraft/inventory/ContainerBeacon.java.patch index 986a4f7e..64cb641a 100644 --- a/patches/net/minecraft/inventory/ContainerBeacon.java.patch +++ b/patches/net/minecraft/inventory/ContainerBeacon.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/inventory/ContainerBeacon.java +++ ../src-work/minecraft/net/minecraft/inventory/ContainerBeacon.java -@@ -1,21 +1,26 @@ +@@ -1,21 +1,28 @@ package net.minecraft.inventory; import net.minecraft.entity.player.EntityPlayer; @@ -11,7 +11,9 @@ +import net.minecraft.tileentity.TileEntityBeacon; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.inventory.CraftInventoryView; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryBeacon; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryView; public class ContainerBeacon extends Container { @@ -31,7 +33,7 @@ this.addSlotToContainer(this.beaconSlot); int i = 36; int j = 137; -@@ -68,6 +73,7 @@ +@@ -68,6 +75,7 @@ public boolean canInteractWith(EntityPlayer playerIn) { @@ -39,7 +41,7 @@ return this.tileBeacon.isUsableByPlayer(playerIn); } -@@ -150,4 +156,15 @@ +@@ -150,4 +158,15 @@ return 1; } } @@ -50,7 +52,7 @@ + return bukkitEntity; + } + -+ org.bukkit.craftbukkit.inventory.CraftInventory inventory = new org.bukkit.craftbukkit.inventory.CraftInventoryBeacon((TileEntityBeacon) this.tileBeacon); // TODO - check this ++ CraftInventory inventory = new CraftInventoryBeacon((TileEntityBeacon) this.tileBeacon); // TODO - check this + bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this); + return bukkitEntity; + } diff --git a/patches/net/minecraft/inventory/ContainerEnchantment.java.patch b/patches/net/minecraft/inventory/ContainerEnchantment.java.patch index ad0fa1db..d83f1f8c 100644 --- a/patches/net/minecraft/inventory/ContainerEnchantment.java.patch +++ b/patches/net/minecraft/inventory/ContainerEnchantment.java.patch @@ -13,9 +13,9 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.inventory.CraftInventoryEnchanting; -+import org.bukkit.craftbukkit.inventory.CraftInventoryView; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryEnchanting; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryView; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.enchantments.EnchantmentOffer; +import org.bukkit.entity.Player; +import org.bukkit.event.enchantment.EnchantItemEvent; diff --git a/patches/net/minecraft/inventory/ContainerHorseInventory.java.patch b/patches/net/minecraft/inventory/ContainerHorseInventory.java.patch index db21dc6d..7d3d2bfb 100644 --- a/patches/net/minecraft/inventory/ContainerHorseInventory.java.patch +++ b/patches/net/minecraft/inventory/ContainerHorseInventory.java.patch @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.inventory.CraftInventoryView; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryView; +import org.bukkit.inventory.InventoryView; public class ContainerHorseInventory extends Container @@ -17,7 +17,7 @@ private final IInventory horseInventory; private final AbstractHorse horse; -+ org.bukkit.craftbukkit.inventory.CraftInventoryView bukkitEntity; ++ CraftInventoryView bukkitEntity; + InventoryPlayer player; + public ContainerHorseInventory(IInventory playerInventory, IInventory horseInventoryIn, final AbstractHorse horse, EntityPlayer player) diff --git a/patches/net/minecraft/inventory/ContainerMerchant.java.patch b/patches/net/minecraft/inventory/ContainerMerchant.java.patch index 3c783105..1e6a9959 100644 --- a/patches/net/minecraft/inventory/ContainerMerchant.java.patch +++ b/patches/net/minecraft/inventory/ContainerMerchant.java.patch @@ -1,14 +1,15 @@ --- ../src-base/minecraft/net/minecraft/inventory/ContainerMerchant.java +++ ../src-work/minecraft/net/minecraft/inventory/ContainerMerchant.java -@@ -5,6 +5,7 @@ +@@ -5,6 +5,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.inventory.CraftInventoryView; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryMerchant; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryView; public class ContainerMerchant extends Container { -@@ -12,6 +13,9 @@ +@@ -12,6 +14,9 @@ private final InventoryMerchant merchantInventory; private final World world; @@ -18,7 +19,7 @@ public ContainerMerchant(InventoryPlayer playerInventory, IMerchant merchant, World worldIn) { this.merchant = merchant; -@@ -20,6 +24,7 @@ +@@ -20,6 +25,7 @@ this.addSlotToContainer(new Slot(this.merchantInventory, 0, 36, 53)); this.addSlotToContainer(new Slot(this.merchantInventory, 1, 62, 53)); this.addSlotToContainer(new SlotMerchantResult(playerInventory.player, merchant, this.merchantInventory, 2, 120, 53)); @@ -26,7 +27,7 @@ for (int i = 0; i < 3; ++i) { -@@ -137,4 +142,12 @@ +@@ -137,4 +143,12 @@ } } } @@ -34,7 +35,7 @@ + @Override + public CraftInventoryView getBukkitView() { + if (bukkitEntity == null) { -+ bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), new org.bukkit.craftbukkit.inventory.CraftInventoryMerchant(merchantInventory), this); ++ bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), new CraftInventoryMerchant(merchantInventory), this); + } + return bukkitEntity; + } diff --git a/patches/net/minecraft/inventory/ContainerPlayer.java.patch b/patches/net/minecraft/inventory/ContainerPlayer.java.patch index b9834a77..9a22740c 100644 --- a/patches/net/minecraft/inventory/ContainerPlayer.java.patch +++ b/patches/net/minecraft/inventory/ContainerPlayer.java.patch @@ -4,8 +4,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.inventory.CraftInventoryCrafting; -+import org.bukkit.craftbukkit.inventory.CraftInventoryView; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryCrafting; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryView; public class ContainerPlayer extends Container { diff --git a/patches/net/minecraft/inventory/ContainerRepair.java.patch b/patches/net/minecraft/inventory/ContainerRepair.java.patch index 55718000..849aa9e5 100644 --- a/patches/net/minecraft/inventory/ContainerRepair.java.patch +++ b/patches/net/minecraft/inventory/ContainerRepair.java.patch @@ -1,14 +1,17 @@ --- ../src-base/minecraft/net/minecraft/inventory/ContainerRepair.java +++ ../src-work/minecraft/net/minecraft/inventory/ContainerRepair.java -@@ -18,6 +18,7 @@ +@@ -18,6 +18,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -+import org.bukkit.craftbukkit.inventory.CraftInventoryView; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryAnvil; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryView; public class ContainerRepair extends Container { -@@ -28,9 +29,13 @@ +@@ -28,9 +32,13 @@ private final BlockPos selfPosition; public int maximumCost; public int materialCost; @@ -23,7 +26,7 @@ @SideOnly(Side.CLIENT) public ContainerRepair(InventoryPlayer playerInventory, World worldIn, EntityPlayer player) { -@@ -39,6 +44,7 @@ +@@ -39,6 +47,7 @@ public ContainerRepair(InventoryPlayer playerInventory, final World worldIn, final BlockPos blockPosIn, EntityPlayer player) { @@ -31,37 +34,37 @@ this.outputSlot = new InventoryCraftResult(); this.inputSlots = new InventoryBasic("Repair", true, 2) { -@@ -178,7 +184,8 @@ +@@ -178,7 +187,8 @@ if (l2 <= 0) { - this.outputSlot.setInventorySlotContents(0, ItemStack.EMPTY); +// this.outputSlot.setInventorySlotContents(0, ItemStack.EMPTY); -+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); ++ CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); this.maximumCost = 0; return; } -@@ -299,7 +306,8 @@ +@@ -299,7 +309,8 @@ if (flag3 && !flag2) { - this.outputSlot.setInventorySlotContents(0, ItemStack.EMPTY); +// this.outputSlot.setInventorySlotContents(0, ItemStack.EMPTY); -+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); ++ CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); this.maximumCost = 0; return; } -@@ -358,7 +366,8 @@ +@@ -358,7 +369,8 @@ EnchantmentHelper.setEnchantments(map, itemstack1); } - this.outputSlot.setInventorySlotContents(0, itemstack1); +// this.outputSlot.setInventorySlotContents(0, itemstack1); -+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), itemstack1); ++ CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), itemstack1); this.detectAndSendChanges(); } } -@@ -390,6 +399,7 @@ +@@ -390,6 +402,7 @@ public boolean canInteractWith(EntityPlayer playerIn) { @@ -69,7 +72,7 @@ if (this.world.getBlockState(this.selfPosition).getBlock() != Blocks.ANVIL) { return false; -@@ -471,4 +481,30 @@ +@@ -471,4 +484,30 @@ this.updateRepairOutput(); } @@ -94,7 +97,7 @@ + return bukkitEntity; + } + -+ org.bukkit.craftbukkit.inventory.CraftInventory inventory = new org.bukkit.craftbukkit.inventory.CraftInventoryAnvil( ++ CraftInventory inventory = new CraftInventoryAnvil( + new org.bukkit.Location(world.getWorld(), selfPosition.getX(), selfPosition.getY(), selfPosition.getZ()), this.inputSlots, this.outputSlot, this); + bukkitEntity = new CraftInventoryView(this.playerInventory.player.getBukkitEntity(), inventory, this); + return bukkitEntity; diff --git a/patches/net/minecraft/inventory/ContainerWorkbench.java.patch b/patches/net/minecraft/inventory/ContainerWorkbench.java.patch index f6d8bcf9..17548fd9 100644 --- a/patches/net/minecraft/inventory/ContainerWorkbench.java.patch +++ b/patches/net/minecraft/inventory/ContainerWorkbench.java.patch @@ -4,8 +4,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.inventory.CraftInventoryCrafting; -+import org.bukkit.craftbukkit.inventory.CraftInventoryView; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryCrafting; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryView; public class ContainerWorkbench extends Container { diff --git a/patches/net/minecraft/inventory/IInventory.java.patch b/patches/net/minecraft/inventory/IInventory.java.patch index 0d39d465..220e357d 100644 --- a/patches/net/minecraft/inventory/IInventory.java.patch +++ b/patches/net/minecraft/inventory/IInventory.java.patch @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.IWorldNameable; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; -public interface IInventory extends IWorldNameable -{ diff --git a/patches/net/minecraft/inventory/InventoryBasic.java.patch b/patches/net/minecraft/inventory/InventoryBasic.java.patch index eae80957..83a48337 100644 --- a/patches/net/minecraft/inventory/InventoryBasic.java.patch +++ b/patches/net/minecraft/inventory/InventoryBasic.java.patch @@ -5,7 +5,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; public class InventoryBasic implements IInventory diff --git a/patches/net/minecraft/inventory/InventoryCraftResult.java.patch b/patches/net/minecraft/inventory/InventoryCraftResult.java.patch index 100ec64e..4e4d55a5 100644 --- a/patches/net/minecraft/inventory/InventoryCraftResult.java.patch +++ b/patches/net/minecraft/inventory/InventoryCraftResult.java.patch @@ -12,7 +12,7 @@ import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; public class InventoryCraftResult implements IInventory diff --git a/patches/net/minecraft/inventory/InventoryCrafting.java.patch b/patches/net/minecraft/inventory/InventoryCrafting.java.patch index ad3aec62..a33dcdd8 100644 --- a/patches/net/minecraft/inventory/InventoryCrafting.java.patch +++ b/patches/net/minecraft/inventory/InventoryCrafting.java.patch @@ -10,7 +10,7 @@ import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; +import org.bukkit.event.inventory.InventoryType; diff --git a/patches/net/minecraft/inventory/InventoryLargeChest.java.patch b/patches/net/minecraft/inventory/InventoryLargeChest.java.patch index c60a3350..af1f231e 100644 --- a/patches/net/minecraft/inventory/InventoryLargeChest.java.patch +++ b/patches/net/minecraft/inventory/InventoryLargeChest.java.patch @@ -5,7 +5,7 @@ import net.minecraft.world.ILockableContainer; import net.minecraft.world.LockCode; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; +import java.util.ArrayList; diff --git a/patches/net/minecraft/inventory/InventoryMerchant.java.patch b/patches/net/minecraft/inventory/InventoryMerchant.java.patch index f9ff82ba..13e550eb 100644 --- a/patches/net/minecraft/inventory/InventoryMerchant.java.patch +++ b/patches/net/minecraft/inventory/InventoryMerchant.java.patch @@ -13,8 +13,8 @@ import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; -+import org.bukkit.craftbukkit.entity.CraftVillager; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftVillager; +import java.util.List; +import org.bukkit.entity.HumanEntity; diff --git a/patches/net/minecraft/inventory/SlotFurnaceOutput.java.patch b/patches/net/minecraft/inventory/SlotFurnaceOutput.java.patch index f68f7449..aa3a9755 100644 --- a/patches/net/minecraft/inventory/SlotFurnaceOutput.java.patch +++ b/patches/net/minecraft/inventory/SlotFurnaceOutput.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java +++ ../src-work/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java -@@ -4,7 +4,11 @@ +@@ -4,7 +4,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; @@ -9,10 +9,11 @@ +import org.bukkit.entity.ExperienceOrb; +import org.bukkit.entity.Player; +import org.bukkit.event.inventory.FurnaceExtractEvent; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; public class SlotFurnaceOutput extends Slot { -@@ -70,11 +74,21 @@ +@@ -70,11 +75,21 @@ i = j; } @@ -21,7 +22,7 @@ + org.bukkit.block.Block block = this.player.world.getWorld().getBlockAt(furnace.getPos().getX(), furnace.getPos().getY(), furnace.getPos().getZ()); + + if (removeCount != 0) { -+ FurnaceExtractEvent event = new FurnaceExtractEvent(player, block, org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), removeCount, i); ++ FurnaceExtractEvent event = new FurnaceExtractEvent(player, block, CraftMagicNumbers.getMaterial(stack.getItem()), removeCount, i); + this.player.world.getServer().getPluginManager().callEvent(event); + i = event.getExpToDrop(); + } diff --git a/patches/net/minecraft/item/ItemArmor.java.patch b/patches/net/minecraft/item/ItemArmor.java.patch index 045aaff6..4225e1bd 100644 --- a/patches/net/minecraft/item/ItemArmor.java.patch +++ b/patches/net/minecraft/item/ItemArmor.java.patch @@ -4,7 +4,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.event.block.BlockDispenseEvent; public class ItemArmor extends Item diff --git a/patches/net/minecraft/item/ItemBoat.java.patch b/patches/net/minecraft/item/ItemBoat.java.patch index 64a1e6b4..2094883e 100644 --- a/patches/net/minecraft/item/ItemBoat.java.patch +++ b/patches/net/minecraft/item/ItemBoat.java.patch @@ -1,10 +1,18 @@ --- ../src-base/minecraft/net/minecraft/item/ItemBoat.java +++ ../src-work/minecraft/net/minecraft/item/ItemBoat.java -@@ -84,6 +84,11 @@ +@@ -16,6 +16,7 @@ + import net.minecraft.util.math.RayTraceResult; + import net.minecraft.util.math.Vec3d; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class ItemBoat extends Item + { +@@ -84,6 +85,11 @@ } else { -+ org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(playerIn, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, raytraceresult.getBlockPos(), raytraceresult.sideHit, itemstack, handIn); ++ org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(playerIn, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, raytraceresult.getBlockPos(), raytraceresult.sideHit, itemstack, handIn); + + if (event.isCancelled()) { + return new ActionResult<>(EnumActionResult.PASS, itemstack); @@ -12,7 +20,7 @@ Block block = worldIn.getBlockState(raytraceresult.getBlockPos()).getBlock(); boolean flag1 = block == Blocks.WATER || block == Blocks.FLOWING_WATER; EntityBoat entityboat = new EntityBoat(worldIn, raytraceresult.hitVec.x, flag1 ? raytraceresult.hitVec.y - 0.12D : raytraceresult.hitVec.y, raytraceresult.hitVec.z); -@@ -98,7 +103,9 @@ +@@ -98,7 +104,9 @@ { if (!worldIn.isRemote) { diff --git a/patches/net/minecraft/item/ItemBow.java.patch b/patches/net/minecraft/item/ItemBow.java.patch index de52efb8..43bb8807 100644 --- a/patches/net/minecraft/item/ItemBow.java.patch +++ b/patches/net/minecraft/item/ItemBow.java.patch @@ -8,15 +8,16 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Enchantments; import net.minecraft.init.Items; -@@ -18,6 +19,7 @@ +@@ -18,6 +19,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.event.entity.EntityCombustEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class ItemBow extends Item { -@@ -135,8 +137,19 @@ +@@ -135,8 +138,19 @@ if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) { @@ -29,7 +30,7 @@ + entityarrow.setFire(event.getDuration()); + } } -+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityplayer, itemstack, entityarrow, f); ++ org.bukkit.event.entity.EntityShootBowEvent event = CraftEventFactory.callEntityShootBowEvent(entityplayer, itemstack, entityarrow, f); + if (event.isCancelled()) { + event.getProjectile().remove(); + return; @@ -37,7 +38,7 @@ stack.damageItem(1, entityplayer); -@@ -145,7 +158,15 @@ +@@ -145,7 +159,15 @@ entityarrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; } diff --git a/patches/net/minecraft/item/ItemBucket.java.patch b/patches/net/minecraft/item/ItemBucket.java.patch index b1c00ac9..0349b1a5 100644 --- a/patches/net/minecraft/item/ItemBucket.java.patch +++ b/patches/net/minecraft/item/ItemBucket.java.patch @@ -4,8 +4,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.event.CraftEventFactory; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.event.player.PlayerBucketEmptyEvent; +import org.bukkit.event.player.PlayerBucketFillEvent; diff --git a/patches/net/minecraft/item/ItemFireball.java.patch b/patches/net/minecraft/item/ItemFireball.java.patch index 74cc9e7c..42d674f5 100644 --- a/patches/net/minecraft/item/ItemFireball.java.patch +++ b/patches/net/minecraft/item/ItemFireball.java.patch @@ -1,10 +1,18 @@ --- ../src-base/minecraft/net/minecraft/item/ItemFireball.java +++ ../src-work/minecraft/net/minecraft/item/ItemFireball.java -@@ -38,6 +38,12 @@ +@@ -11,6 +11,7 @@ + import net.minecraft.util.SoundCategory; + import net.minecraft.util.math.BlockPos; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class ItemFireball extends Item + { +@@ -38,6 +39,12 @@ { if (worldIn.getBlockState(pos).getMaterial() == Material.AIR) { -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(worldIn, pos.getX(), pos.getY(), pos.getZ(), org.bukkit.event.block.BlockIgniteEvent.IgniteCause.FIREBALL, player).isCancelled()) { ++ if (CraftEventFactory.callBlockIgniteEvent(worldIn, pos.getX(), pos.getY(), pos.getZ(), org.bukkit.event.block.BlockIgniteEvent.IgniteCause.FIREBALL, player).isCancelled()) { + if (!player.capabilities.isCreativeMode) { + itemstack.shrink(1); + } diff --git a/patches/net/minecraft/item/ItemFlintAndSteel.java.patch b/patches/net/minecraft/item/ItemFlintAndSteel.java.patch index 8bccfa5c..9a32c397 100644 --- a/patches/net/minecraft/item/ItemFlintAndSteel.java.patch +++ b/patches/net/minecraft/item/ItemFlintAndSteel.java.patch @@ -1,11 +1,27 @@ --- ../src-base/minecraft/net/minecraft/item/ItemFlintAndSteel.java +++ ../src-work/minecraft/net/minecraft/item/ItemFlintAndSteel.java +@@ -1,7 +1,6 @@ + package net.minecraft.item; + + import net.minecraft.advancements.CriteriaTriggers; +-import net.minecraft.block.material.Material; + import net.minecraft.creativetab.CreativeTabs; + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.entity.player.EntityPlayerMP; +@@ -13,6 +12,7 @@ + import net.minecraft.util.SoundCategory; + import net.minecraft.util.math.BlockPos; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class ItemFlintAndSteel extends Item + { @@ -36,6 +36,12 @@ { if (worldIn.isAirBlock(pos)) { + // CraftBukkit start - Store the clicked block -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(worldIn, pos.getX(), pos.getY(), pos.getZ(), org.bukkit.event.block.BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, player).isCancelled()) { ++ if (CraftEventFactory.callBlockIgniteEvent(worldIn, pos.getX(), pos.getY(), pos.getZ(), org.bukkit.event.block.BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, player).isCancelled()) { + itemstack.damageItem(1, player); + return EnumActionResult.PASS; + } diff --git a/patches/net/minecraft/item/ItemHangingEntity.java.patch b/patches/net/minecraft/item/ItemHangingEntity.java.patch index ce47b70a..1a82ab8d 100644 --- a/patches/net/minecraft/item/ItemHangingEntity.java.patch +++ b/patches/net/minecraft/item/ItemHangingEntity.java.patch @@ -1,21 +1,22 @@ --- ../src-base/minecraft/net/minecraft/item/ItemHangingEntity.java +++ ../src-work/minecraft/net/minecraft/item/ItemHangingEntity.java -@@ -11,6 +11,8 @@ +@@ -11,6 +11,9 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import org.bukkit.entity.Player; +import org.bukkit.event.hanging.HangingPlaceEvent; ++import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlock; public class ItemHangingEntity extends Item { -@@ -35,6 +37,16 @@ +@@ -35,6 +38,16 @@ { if (!worldIn.isRemote) { + Player who = (player == null) ? null : (Player) player.getBukkitEntity(); + org.bukkit.block.Block blockClicked = worldIn.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()); -+ org.bukkit.block.BlockFace blockFace = org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(facing); ++ org.bukkit.block.BlockFace blockFace = CraftBlock.notchToBlockFace(facing); + + HangingPlaceEvent event = new HangingPlaceEvent((org.bukkit.entity.Hanging) entityhanging.getBukkitEntity(), who, blockClicked, blockFace); + worldIn.getServer().getPluginManager().callEvent(event); diff --git a/patches/net/minecraft/item/ItemLead.java.patch b/patches/net/minecraft/item/ItemLead.java.patch index e43c70e7..5b420ae5 100644 --- a/patches/net/minecraft/item/ItemLead.java.patch +++ b/patches/net/minecraft/item/ItemLead.java.patch @@ -1,14 +1,15 @@ --- ../src-base/minecraft/net/minecraft/item/ItemLead.java +++ ../src-work/minecraft/net/minecraft/item/ItemLead.java -@@ -12,6 +12,7 @@ +@@ -12,6 +12,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import org.bukkit.event.hanging.HangingPlaceEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class ItemLead extends Item { -@@ -55,8 +56,19 @@ +@@ -55,8 +57,19 @@ if (entityleashknot == null) { entityleashknot = EntityLeashKnot.createKnot(worldIn, fence); @@ -21,7 +22,7 @@ + } } -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerLeashEntityEvent(entityliving, entityleashknot, player).isCancelled()) { ++ if (CraftEventFactory.callPlayerLeashEntityEvent(entityliving, entityleashknot, player).isCancelled()) { + continue; + } + diff --git a/patches/net/minecraft/item/ItemLilyPad.java.patch b/patches/net/minecraft/item/ItemLilyPad.java.patch index f446d93f..90e4316e 100644 --- a/patches/net/minecraft/item/ItemLilyPad.java.patch +++ b/patches/net/minecraft/item/ItemLilyPad.java.patch @@ -1,19 +1,28 @@ --- ../src-base/minecraft/net/minecraft/item/ItemLilyPad.java +++ ../src-work/minecraft/net/minecraft/item/ItemLilyPad.java -@@ -50,6 +50,8 @@ +@@ -17,6 +17,8 @@ + import net.minecraft.util.math.BlockPos; + import net.minecraft.util.math.RayTraceResult; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlockState; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class ItemLilyPad extends ItemColored + { +@@ -50,6 +52,8 @@ if (iblockstate.getMaterial() == Material.WATER && ((Integer)iblockstate.getValue(BlockLiquid.LEVEL)).intValue() == 0 && worldIn.isAirBlock(blockpos1)) { + // CraftBukkit start - special case for handling block placement with water lilies -+ org.bukkit.block.BlockState blockstate = org.bukkit.craftbukkit.block.CraftBlockState.getBlockState(worldIn, blockpos1.getX(), blockpos1.getY(), blockpos1.getZ()); ++ org.bukkit.block.BlockState blockstate = CraftBlockState.getBlockState(worldIn, blockpos1.getX(), blockpos1.getY(), blockpos1.getZ()); // special case for handling block placement with water lilies net.minecraftforge.common.util.BlockSnapshot blocksnapshot = net.minecraftforge.common.util.BlockSnapshot.getBlockSnapshot(worldIn, blockpos1); worldIn.setBlockState(blockpos1, Blocks.WATERLILY.getDefaultState()); -@@ -61,6 +63,12 @@ +@@ -61,6 +65,12 @@ worldIn.setBlockState(blockpos1, Blocks.WATERLILY.getDefaultState(), 11); -+ org.bukkit.event.block.BlockPlaceEvent placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(worldIn, playerIn, handIn, blockstate, blockpos.getX(), blockpos.getY(), blockpos.getZ()); ++ org.bukkit.event.block.BlockPlaceEvent placeEvent = CraftEventFactory.callBlockPlaceEvent(worldIn, playerIn, handIn, blockstate, blockpos.getX(), blockpos.getY(), blockpos.getZ()); + if (placeEvent != null && (placeEvent.isCancelled() || !placeEvent.canBuild())) { + blockstate.update(true, false); + return new ActionResult<>(EnumActionResult.PASS, itemstack); diff --git a/patches/net/minecraft/item/ItemMap.java.patch b/patches/net/minecraft/item/ItemMap.java.patch index a0528ca3..9a485cc5 100644 --- a/patches/net/minecraft/item/ItemMap.java.patch +++ b/patches/net/minecraft/item/ItemMap.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/item/ItemMap.java +++ ../src-work/minecraft/net/minecraft/item/ItemMap.java -@@ -21,11 +21,14 @@ +@@ -21,11 +21,15 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; @@ -12,10 +12,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.Bukkit; +import org.bukkit.event.server.MapInitializeEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class ItemMap extends ItemMapBase { -@@ -36,16 +39,20 @@ +@@ -36,16 +40,20 @@ public static ItemStack setupNewMap(World worldIn, double worldX, double worldZ, byte scale, boolean trackingPosition, boolean unlimitedTracking) { @@ -35,11 +36,11 @@ mapdata.trackingPosition = trackingPosition; mapdata.unlimitedTracking = unlimitedTracking; mapdata.markDirty(); -+ org.bukkit.craftbukkit.event.CraftEventFactory.callEvent(new MapInitializeEvent(mapdata.mapView)); ++ CraftEventFactory.callEvent(new MapInitializeEvent(mapdata.mapView)); return itemstack; } -@@ -60,19 +67,25 @@ +@@ -60,19 +68,25 @@ @Nullable public MapData getMapData(ItemStack stack, World worldIn) { @@ -69,7 +70,7 @@ } return mapdata; -@@ -80,7 +93,8 @@ +@@ -80,7 +94,8 @@ public void updateMapData(World worldIn, Entity viewer, MapData data) { @@ -79,7 +80,7 @@ { int i = 1 << data.scale; int j = data.xCenter; -@@ -425,6 +439,7 @@ +@@ -425,6 +440,7 @@ protected static void scaleMap(ItemStack p_185063_0_, World p_185063_1_, int p_185063_2_) { MapData mapdata = Items.FILLED_MAP.getMapData(p_185063_0_, p_185063_1_); @@ -87,7 +88,7 @@ p_185063_0_.setItemDamage(p_185063_1_.getUniqueDataId("map")); MapData mapdata1 = new MapData("map_" + p_185063_0_.getMetadata()); -@@ -436,12 +451,15 @@ +@@ -436,12 +452,15 @@ mapdata1.dimension = mapdata.dimension; mapdata1.markDirty(); p_185063_1_.setData("map_" + p_185063_0_.getMetadata(), mapdata1); @@ -103,7 +104,7 @@ p_185064_0_.setItemDamage(p_185064_1_.getUniqueDataId("map")); MapData mapdata1 = new MapData("map_" + p_185064_0_.getMetadata()); mapdata1.trackingPosition = true; -@@ -454,6 +472,8 @@ +@@ -454,6 +473,8 @@ mapdata1.dimension = mapdata.dimension; mapdata1.markDirty(); p_185064_1_.setData("map_" + p_185064_0_.getMetadata(), mapdata1); diff --git a/patches/net/minecraft/item/ItemMinecart.java.patch b/patches/net/minecraft/item/ItemMinecart.java.patch index d63282c0..1a244aa4 100644 --- a/patches/net/minecraft/item/ItemMinecart.java.patch +++ b/patches/net/minecraft/item/ItemMinecart.java.patch @@ -4,7 +4,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.event.block.BlockDispenseEvent; public class ItemMinecart extends Item diff --git a/patches/net/minecraft/item/ItemStack.java.patch b/patches/net/minecraft/item/ItemStack.java.patch index 5fbc3765..82cc2f67 100644 --- a/patches/net/minecraft/item/ItemStack.java.patch +++ b/patches/net/minecraft/item/ItemStack.java.patch @@ -9,34 +9,13 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.Enchantment; -@@ -30,12 +30,16 @@ - import net.minecraft.nbt.NBTBase; - import net.minecraft.nbt.NBTTagCompound; - import net.minecraft.nbt.NBTTagList; -+import net.minecraft.server.MinecraftServer; - import net.minecraft.stats.StatList; -+import net.minecraft.tileentity.TileEntity; -+import net.minecraft.tileentity.TileEntitySkull; - import net.minecraft.util.ActionResult; - import net.minecraft.util.EnumActionResult; - import net.minecraft.util.EnumFacing; - import net.minecraft.util.EnumHand; - import net.minecraft.util.ResourceLocation; -+import net.minecraft.util.SoundCategory; - import net.minecraft.util.datafix.DataFixer; - import net.minecraft.util.datafix.FixTypes; - import net.minecraft.util.datafix.walkers.BlockEntityTag; -@@ -49,14 +53,21 @@ +@@ -49,14 +49,17 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.Location; -+import org.bukkit.TreeType; -+import org.bukkit.block.BlockState; -+import org.bukkit.craftbukkit.block.CraftBlockState; -+import org.bukkit.craftbukkit.util.CraftMagicNumbers; -+import org.bukkit.entity.Player; -+import org.bukkit.event.world.StructureGrowEvent; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; public final class ItemStack implements net.minecraftforge.common.capabilities.ICapabilitySerializable { @@ -50,7 +29,7 @@ private NBTTagCompound stackTagCompound; private boolean isEmpty; int itemDamage; -@@ -119,23 +130,33 @@ +@@ -119,23 +122,33 @@ public ItemStack(NBTTagCompound compound) { @@ -90,7 +69,7 @@ } public boolean isEmpty() -@@ -160,6 +181,7 @@ +@@ -160,6 +173,7 @@ return true; } } @@ -98,7 +77,7 @@ public static void registerFixes(DataFixer fixer) { -@@ -185,11 +207,10 @@ +@@ -185,11 +199,10 @@ { if (!worldIn.isRemote) return net.minecraftforge.common.ForgeHooks.onPlaceItemIntoWorld(this, playerIn, worldIn, pos, side, hitX, hitY, hitZ, hand); EnumActionResult enumactionresult = this.getItem().onItemUse(playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ); @@ -112,7 +91,7 @@ return enumactionresult; } -@@ -231,7 +252,8 @@ +@@ -231,7 +244,8 @@ if (this.stackTagCompound != null) { @@ -122,7 +101,7 @@ } if (this.capabilities != null) -@@ -291,6 +313,26 @@ +@@ -291,6 +305,26 @@ public void setItemDamage(int meta) { @@ -149,13 +128,13 @@ getItem().setDamage(this, meta); } -@@ -322,6 +364,19 @@ +@@ -322,6 +356,19 @@ amount -= j; + // Spigot start + if (damager != null) { -+ org.bukkit.craftbukkit.inventory.CraftItemStack item = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(this); ++ CraftItemStack item = CraftItemStack.asCraftMirror(this); + org.bukkit.event.player.PlayerItemDamageEvent event = new org.bukkit.event.player.PlayerItemDamageEvent(damager.getBukkitEntity(), item, amount); + org.bukkit.Bukkit.getServer().getPluginManager().callEvent(event); + if (amount != event.getDamage() || event.isCancelled()) { @@ -169,19 +148,19 @@ if (amount <= 0) { return false; -@@ -347,6 +402,11 @@ +@@ -347,6 +394,11 @@ if (this.attemptDamageItem(amount, entityIn.getRNG(), entityIn instanceof EntityPlayerMP ? (EntityPlayerMP)entityIn : null)) { entityIn.renderBrokenItemStack(this); + // CraftBukkit start - Check for item breaking + if (this.stackSize == 1 && entityIn instanceof EntityPlayer) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityPlayer) entityIn, this); ++ CraftEventFactory.callPlayerItemBreakEvent((EntityPlayer) entityIn, this); + } + // CraftBukkit end this.shrink(1); if (entityIn instanceof EntityPlayer) -@@ -983,6 +1043,14 @@ +@@ -983,6 +1035,14 @@ public void setRepairCost(int cost) { @@ -196,7 +175,7 @@ if (!this.hasTagCompound()) { this.stackTagCompound = new NBTTagCompound(); -@@ -1043,6 +1111,14 @@ +@@ -1043,6 +1103,14 @@ nbttaglist.appendTag(nbttagcompound); } @@ -211,7 +190,7 @@ public ITextComponent getTextComponent() { TextComponentString textcomponentstring = new TextComponentString(this.getDisplayName()); -@@ -1280,4 +1356,16 @@ +@@ -1280,4 +1348,16 @@ { return this.isEmpty() || this.getItem().doesSneakBypassUse(this, world, pos, player); } diff --git a/patches/net/minecraft/item/crafting/RecipeRepairItem.java.patch b/patches/net/minecraft/item/crafting/RecipeRepairItem.java.patch index e131717a..e9137efd 100644 --- a/patches/net/minecraft/item/crafting/RecipeRepairItem.java.patch +++ b/patches/net/minecraft/item/crafting/RecipeRepairItem.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/item/crafting/RecipeRepairItem.java +++ ../src-work/minecraft/net/minecraft/item/crafting/RecipeRepairItem.java -@@ -2,14 +2,22 @@ +@@ -2,14 +2,23 @@ import com.google.common.collect.Lists; import java.util.List; @@ -12,6 +12,7 @@ import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; -public class RecipeRepairItem extends net.minecraftforge.registries.IForgeRegistryEntry.Impl implements IRecipe +public class RecipeRepairItem extends ShapelessRecipes implements IRecipe @@ -25,7 +26,7 @@ public boolean matches(InventoryCrafting inv, World worldIn) { List list = Lists.newArrayList(); -@@ -79,7 +87,18 @@ +@@ -79,7 +88,18 @@ i1 = 0; } @@ -38,7 +39,7 @@ + ShapelessRecipes recipe = new ShapelessRecipes("", result.copy(), ingredients); + recipe.key = new ResourceLocation("repairitem"); + inv.currentRecipe = recipe; -+ result = org.bukkit.craftbukkit.event.CraftEventFactory.callPreCraftEvent(inv, result, inv.eventHandler.getBukkitView(), true); ++ result = CraftEventFactory.callPreCraftEvent(inv, result, inv.eventHandler.getBukkitView(), true); + return result; + // return new ItemStack(itemstack2.getItem(), 1, i1); + // CraftBukkit end diff --git a/patches/net/minecraft/item/crafting/ShapedRecipes.java.patch b/patches/net/minecraft/item/crafting/ShapedRecipes.java.patch index 4798a2ec..66551a8a 100644 --- a/patches/net/minecraft/item/crafting/ShapedRecipes.java.patch +++ b/patches/net/minecraft/item/crafting/ShapedRecipes.java.patch @@ -1,16 +1,17 @@ --- ../src-base/minecraft/net/minecraft/item/crafting/ShapedRecipes.java +++ ../src-work/minecraft/net/minecraft/item/crafting/ShapedRecipes.java -@@ -19,6 +19,9 @@ +@@ -19,6 +19,10 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; -+import org.bukkit.craftbukkit.inventory.CraftShapedRecipe; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftShapedRecipe; +import org.bukkit.inventory.Recipe; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; public class ShapedRecipes extends net.minecraftforge.registries.IForgeRegistryEntry.Impl implements net.minecraftforge.common.crafting.IShapedRecipe { -@@ -28,6 +31,8 @@ +@@ -28,6 +32,8 @@ private final ItemStack recipeOutput; private final String group; @@ -19,7 +20,7 @@ public ShapedRecipes(String group, int width, int height, NonNullList ingredients, ItemStack result) { this.group = group; -@@ -373,6 +378,67 @@ +@@ -373,6 +379,67 @@ } } @@ -72,7 +73,7 @@ + for (Ingredient list : this.recipeItems) { + if (list != null && list.matchingStacks.length > 0) { + net.minecraft.item.ItemStack stack = list.matchingStacks[0]; -+ recipe.setIngredient(c, org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), (list.matchingStacks.length) > 1 ? 32767 : stack.getMetadata()); ++ recipe.setIngredient(c, CraftMagicNumbers.getMaterial(stack.getItem()), (list.matchingStacks.length) > 1 ? 32767 : stack.getMetadata()); + } + c++; + } diff --git a/patches/net/minecraft/item/crafting/ShapelessRecipes.java.patch b/patches/net/minecraft/item/crafting/ShapelessRecipes.java.patch index 2a067614..92d6fa2b 100644 --- a/patches/net/minecraft/item/crafting/ShapelessRecipes.java.patch +++ b/patches/net/minecraft/item/crafting/ShapelessRecipes.java.patch @@ -1,18 +1,19 @@ --- ../src-base/minecraft/net/minecraft/item/crafting/ShapelessRecipes.java +++ ../src-work/minecraft/net/minecraft/item/crafting/ShapelessRecipes.java -@@ -9,7 +9,11 @@ +@@ -9,7 +9,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.JsonUtils; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; -+import org.bukkit.craftbukkit.inventory.CraftShapelessRecipe; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftShapelessRecipe; +import org.bukkit.inventory.Recipe; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; public class ShapelessRecipes extends net.minecraftforge.registries.IForgeRegistryEntry.Impl implements IRecipe { -@@ -18,6 +22,8 @@ +@@ -18,6 +23,8 @@ private final String group; private final boolean isSimple; @@ -21,7 +22,7 @@ public ShapelessRecipes(String group, ItemStack output, NonNullList ingredients) { this.group = group; -@@ -136,4 +142,22 @@ +@@ -136,4 +143,22 @@ { return width * height >= this.recipeItems.size(); } @@ -33,7 +34,7 @@ + for (Ingredient list : this.recipeItems) { + if (list != null) { + net.minecraft.item.ItemStack stack = list.matchingStacks[0]; -+ recipe.addIngredient(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), (list.matchingStacks.length) > 1 ? 32767 : stack.getMetadata()); ++ recipe.addIngredient(CraftMagicNumbers.getMaterial(stack.getItem()), (list.matchingStacks.length) > 1 ? 32767 : stack.getMetadata()); + } + } + return recipe; diff --git a/patches/net/minecraft/network/NetHandlerPlayServer.java.patch b/patches/net/minecraft/network/NetHandlerPlayServer.java.patch index 578b192b..1be214fb 100644 --- a/patches/net/minecraft/network/NetHandlerPlayServer.java.patch +++ b/patches/net/minecraft/network/NetHandlerPlayServer.java.patch @@ -58,18 +58,21 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ChatType; import net.minecraft.util.text.ITextComponent; -@@ -120,6 +128,43 @@ +@@ -120,6 +128,46 @@ import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.entity.CraftPlayer; -+import org.bukkit.craftbukkit.event.CraftEventFactory; -+import org.bukkit.craftbukkit.inventory.CraftInventoryView; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; -+import org.bukkit.craftbukkit.util.CraftChatMessage; -+import org.bukkit.craftbukkit.util.LazyPlayerSet; -+import org.bukkit.craftbukkit.util.Waitable; ++import org.bukkit.craftbukkit.v1_12_R1.CraftServer; ++import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlock; ++import org.bukkit.craftbukkit.v1_12_R1.block.CraftSign; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryView; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; ++import org.bukkit.craftbukkit.v1_12_R1.util.LazyPlayerSet; ++import org.bukkit.craftbukkit.v1_12_R1.util.Waitable; +import org.bukkit.entity.Player; +import org.bukkit.event.Event; +import org.bukkit.event.block.Action; @@ -102,7 +105,7 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable { -@@ -131,7 +176,11 @@ +@@ -131,7 +179,11 @@ private long field_194402_f; private boolean field_194403_g; private long field_194404_h; @@ -115,11 +118,11 @@ private int itemDropThreshold; private final IntHashMap pendingTransactions = new IntHashMap(); private double firstGoodX; -@@ -158,6 +207,26 @@ +@@ -158,6 +210,26 @@ private int lastMovePacketCounter; private ServerRecipeBookHelper field_194309_H = new ServerRecipeBookHelper(); -+ private final org.bukkit.craftbukkit.CraftServer server; ++ private final CraftServer server; + private boolean processedDisconnect; + private int lastTick = MinecraftServer.currentTick; + private int allowedPlayerTicks = 1; @@ -142,7 +145,7 @@ public NetHandlerPlayServer(MinecraftServer server, NetworkManager networkManagerIn, EntityPlayerMP playerIn) { this.serverController = server; -@@ -165,8 +234,13 @@ +@@ -165,8 +237,13 @@ networkManagerIn.setNetHandler(this); this.player = playerIn; playerIn.connection = this; @@ -156,7 +159,7 @@ public void update() { this.captureCurrentPosition(); -@@ -226,7 +300,7 @@ +@@ -226,7 +303,7 @@ this.serverController.profiler.startSection("keepAlive"); long i = this.currentTimeMillis(); @@ -165,7 +168,7 @@ { if (this.field_194403_g) { -@@ -242,11 +316,14 @@ +@@ -242,11 +319,14 @@ } this.serverController.profiler.endSection(); @@ -183,7 +186,7 @@ if (this.itemDropThreshold > 0) { -@@ -255,11 +332,12 @@ +@@ -255,11 +335,12 @@ if (this.player.getLastActiveTime() > 0L && this.serverController.getMaxPlayerIdleMinutes() > 0 && MinecraftServer.getCurrentTimeMillis() - this.player.getLastActiveTime() > (long)(this.serverController.getMaxPlayerIdleMinutes() * 1000 * 60)) { @@ -197,7 +200,7 @@ { this.firstGoodX = this.player.posX; this.firstGoodY = this.player.posY; -@@ -274,23 +352,48 @@ +@@ -274,23 +355,48 @@ return this.netManager; } @@ -255,7 +258,7 @@ } public void processInput(CPacketInput packetIn) -@@ -345,9 +448,34 @@ +@@ -345,9 +451,34 @@ double d9 = entity.motionX * entity.motionX + entity.motionY * entity.motionY + entity.motionZ * entity.motionZ; double d10 = d6 * d6 + d7 * d7 + d8 * d8; @@ -293,7 +296,7 @@ this.netManager.sendPacket(new SPacketMoveVehicle(entity)); return; } -@@ -370,12 +498,11 @@ +@@ -370,12 +501,11 @@ d10 = d6 * d6 + d7 * d7 + d8 * d8; boolean flag1 = false; @@ -308,7 +311,7 @@ entity.setPositionAndRotation(d3, d4, d5, f, f1); this.player.setPositionAndRotation(d3, d4, d5, this.player.rotationYaw, this.player.rotationPitch); // Forge - Resync player position on vehicle moving boolean flag2 = worldserver.getCollisionBoxes(entity, entity.getEntityBoundingBox().shrink(0.0625D)).isEmpty(); -@@ -388,6 +515,73 @@ +@@ -388,6 +518,73 @@ return; } @@ -382,7 +385,7 @@ this.serverController.getPlayerList().serverUpdateMovingPlayer(this.player); this.player.addMovementStat(this.player.posX - d0, this.player.posY - d1, this.player.posZ - d2); this.vehicleFloating = d11 >= -0.03125D && !this.serverController.isFlightAllowed() && !worldserver.checkBlockCollision(entity.getEntityBoundingBox().grow(0.0625D).expand(0.0D, -0.55D, 0.0D)); -@@ -402,7 +596,7 @@ +@@ -402,7 +599,7 @@ { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.player.getServerWorld()); @@ -391,7 +394,7 @@ { this.player.setPositionAndRotation(this.targetPos.x, this.targetPos.y, this.targetPos.z, this.player.rotationYaw, this.player.rotationPitch); -@@ -461,7 +655,7 @@ +@@ -461,7 +658,7 @@ { WorldServer worldserver = this.serverController.getWorld(this.player.dimension); @@ -400,7 +403,7 @@ { if (this.networkTickCount == 0) { -@@ -475,6 +669,7 @@ +@@ -475,6 +672,7 @@ this.lastPositionUpdate = this.networkTickCount; this.setPlayerLocation(this.targetPos.x, this.targetPos.y, this.targetPos.z, this.player.rotationYaw, this.player.rotationPitch); } @@ -408,7 +411,7 @@ } else { -@@ -484,9 +679,17 @@ +@@ -484,9 +682,17 @@ { this.player.setPositionAndRotation(this.player.posX, this.player.posY, this.player.posZ, packetIn.getYaw(this.player.rotationYaw), packetIn.getPitch(this.player.rotationPitch)); this.serverController.getPlayerList().serverUpdateMovingPlayer(this.player); @@ -426,7 +429,7 @@ double d0 = this.player.posX; double d1 = this.player.posY; double d2 = this.player.posZ; -@@ -514,19 +717,34 @@ +@@ -514,19 +720,34 @@ ++this.movePacketCounter; int i = this.movePacketCounter - this.lastMovePacketCounter; @@ -465,7 +468,7 @@ this.setPlayerLocation(this.player.posX, this.player.posY, this.player.posZ, this.player.rotationYaw, this.player.rotationPitch); return; } -@@ -557,10 +775,9 @@ +@@ -557,10 +778,9 @@ d11 = d7 * d7 + d8 * d8 + d9 * d9; boolean flag = false; @@ -477,7 +480,7 @@ } this.player.setPositionAndRotation(d4, d5, d6, f, f1); -@@ -577,6 +794,69 @@ +@@ -577,6 +797,69 @@ } } @@ -547,7 +550,7 @@ this.floating = d12 >= -0.03125D; this.floating &= !this.serverController.isFlightAllowed() && !this.player.capabilities.allowFlying; this.floating &= !this.player.isPotionActive(MobEffects.LEVITATION) && !this.player.isElytraFlying() && !worldserver.checkBlockCollision(this.player.getEntityBoundingBox().grow(0.0625D).expand(0.0D, -0.55D, 0.0D)); -@@ -598,8 +878,74 @@ +@@ -598,8 +881,74 @@ this.setPlayerLocation(x, y, z, yaw, pitch, Collections.emptySet()); } @@ -622,7 +625,7 @@ double d0 = relativeSet.contains(SPacketPlayerPosLook.EnumFlags.X) ? this.player.posX : 0.0D; double d1 = relativeSet.contains(SPacketPlayerPosLook.EnumFlags.Y) ? this.player.posY : 0.0D; double d2 = relativeSet.contains(SPacketPlayerPosLook.EnumFlags.Z) ? this.player.posZ : 0.0D; -@@ -617,6 +963,14 @@ +@@ -617,6 +966,14 @@ f1 = pitch + this.player.rotationPitch; } @@ -637,7 +640,7 @@ if (++this.teleportId == Integer.MAX_VALUE) { this.teleportId = 0; -@@ -630,6 +984,7 @@ +@@ -630,6 +987,7 @@ public void processPlayerDigging(CPacketPlayerDigging packetIn) { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.player.getServerWorld()); @@ -645,7 +648,7 @@ WorldServer worldserver = this.serverController.getWorld(this.player.dimension); BlockPos blockpos = packetIn.getPosition(); this.player.markPlayerActive(); -@@ -641,7 +996,16 @@ +@@ -641,7 +999,16 @@ if (!this.player.isSpectator()) { ItemStack itemstack = this.player.getHeldItem(EnumHand.OFF_HAND); @@ -663,7 +666,7 @@ this.player.setHeldItem(EnumHand.MAIN_HAND, itemstack); } -@@ -650,6 +1014,20 @@ +@@ -650,6 +1017,20 @@ if (!this.player.isSpectator()) { @@ -684,7 +687,7 @@ this.player.dropItem(false); } -@@ -694,7 +1072,15 @@ +@@ -694,7 +1075,15 @@ } else { @@ -700,7 +703,7 @@ } } else -@@ -725,6 +1111,7 @@ +@@ -725,6 +1114,7 @@ public void processTryUseItemOnBlock(CPacketPlayerTryUseItemOnBlock packetIn) { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.player.getServerWorld()); @@ -708,7 +711,7 @@ WorldServer worldserver = this.serverController.getWorld(this.player.dimension); EnumHand enumhand = packetIn.getHand(); ItemStack itemstack = this.player.getHeldItem(enumhand); -@@ -738,6 +1125,13 @@ +@@ -738,6 +1128,13 @@ dist *= dist; if (this.targetPos == null && this.player.getDistanceSq((double)blockpos.getX() + 0.5D, (double)blockpos.getY() + 0.5D, (double)blockpos.getZ() + 0.5D) < dist && !this.serverController.isBlockProtected(worldserver, blockpos, this.player) && worldserver.getWorldBorder().contains(blockpos)) { @@ -722,7 +725,7 @@ this.player.interactionManager.processRightClickBlock(this.player, worldserver, itemstack, enumhand, blockpos, enumfacing, packetIn.getFacingX(), packetIn.getFacingY(), packetIn.getFacingZ()); } } -@@ -755,6 +1149,7 @@ +@@ -755,6 +1152,7 @@ public void processTryUseItem(CPacketPlayerTryUseItem packetIn) { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.player.getServerWorld()); @@ -730,7 +733,7 @@ WorldServer worldserver = this.serverController.getWorld(this.player.dimension); EnumHand enumhand = packetIn.getHand(); ItemStack itemstack = this.player.getHeldItem(enumhand); -@@ -762,7 +1157,46 @@ +@@ -762,7 +1160,46 @@ if (!itemstack.isEmpty()) { @@ -778,7 +781,7 @@ } } -@@ -774,7 +1208,8 @@ +@@ -774,7 +1211,8 @@ { Entity entity = null; @@ -788,7 +791,7 @@ { if (worldserver != null) { -@@ -792,6 +1227,7 @@ +@@ -792,6 +1230,7 @@ this.player.setSpectatingEntity(this.player); this.player.dismountRidingEntity(); @@ -796,7 +799,7 @@ if (entity.world == this.player.world) { this.player.setPositionAndUpdate(entity.posX, entity.posY, entity.posZ); -@@ -823,12 +1259,16 @@ +@@ -823,12 +1262,16 @@ this.serverController.getPlayerList().syncPlayerInventory(this.player); net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerChangedDimensionEvent(this.player, prevDimension, this.player.dimension); } @@ -813,7 +816,7 @@ } public void processSteerBoat(CPacketSteerBoat packetIn) -@@ -844,13 +1284,27 @@ +@@ -844,13 +1287,27 @@ public void onDisconnect(ITextComponent reason) { @@ -843,7 +846,7 @@ if (this.serverController.isSinglePlayer() && this.player.getName().equals(this.serverController.getServerOwner())) { -@@ -877,6 +1331,13 @@ +@@ -877,6 +1334,13 @@ } } @@ -857,7 +860,7 @@ try { this.netManager.sendPacket(packetIn); -@@ -899,23 +1360,42 @@ +@@ -899,23 +1363,42 @@ public void processHeldItemChange(CPacketHeldItemChange packetIn) { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.player.getServerWorld()); @@ -903,7 +906,7 @@ { TextComponentTranslation textcomponenttranslation = new TextComponentTranslation("chat.cannotSend", new Object[0]); textcomponenttranslation.getStyle().setColor(TextFormatting.RED); -@@ -931,47 +1411,277 @@ +@@ -931,47 +1414,277 @@ { if (!ChatAllowedCharacters.isAllowedCharacter(s.charAt(i))) { @@ -1192,7 +1195,7 @@ this.player.markPlayerActive(); switch (packetIn.getAction()) -@@ -1053,8 +1763,16 @@ +@@ -1053,8 +1766,16 @@ public void processUseEntity(CPacketUseEntity packetIn) { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.player.getServerWorld()); @@ -1209,7 +1212,7 @@ this.player.markPlayerActive(); if (entity != null) -@@ -1069,20 +1787,58 @@ +@@ -1069,20 +1790,58 @@ if (this.player.getDistanceSq(entity) < d0) { @@ -1269,7 +1272,7 @@ { this.disconnect(new TextComponentTranslation("multiplayer.disconnect.invalid_entity_attacked", new Object[0])); this.serverController.logWarning("Player " + this.player.getName() + " tried to attack an invalid entity"); -@@ -1090,6 +1846,10 @@ +@@ -1090,6 +1849,10 @@ } this.player.attackTargetEntityWithCurrentItem(entity); @@ -1280,7 +1283,7 @@ } } } -@@ -1108,7 +1868,8 @@ +@@ -1108,7 +1871,8 @@ if (this.player.queuedEndExit) { this.player.queuedEndExit = false; @@ -1290,7 +1293,7 @@ CriteriaTriggers.CHANGED_DIMENSION.trigger(this.player, DimensionType.THE_END, DimensionType.OVERWORLD); } else -@@ -1136,17 +1897,32 @@ +@@ -1136,17 +1900,32 @@ public void processCloseWindow(CPacketCloseWindow packetIn) { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.player.getServerWorld()); @@ -1325,7 +1328,7 @@ { NonNullList nonnulllist = NonNullList.create(); -@@ -1159,9 +1935,304 @@ +@@ -1159,9 +1938,304 @@ } else { @@ -1632,7 +1635,7 @@ { this.player.connection.sendPacket(new SPacketConfirmTransaction(packetIn.getWindowId(), packetIn.getActionNumber(), true)); this.player.isChangingQuantityOnly = true; -@@ -1178,8 +2249,8 @@ +@@ -1178,8 +2252,8 @@ for (int j = 0; j < this.player.openContainer.inventorySlots.size(); ++j) { @@ -1643,7 +1646,7 @@ nonnulllist1.add(itemstack1); } -@@ -1203,6 +2274,7 @@ +@@ -1203,6 +2277,7 @@ public void processEnchantItem(CPacketEnchantItem packetIn) { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.player.getServerWorld()); @@ -1651,7 +1654,7 @@ this.player.markPlayerActive(); if (this.player.openContainer.windowId == packetIn.getWindowId() && this.player.openContainer.getCanCraft(this.player) && !this.player.isSpectator()) -@@ -1242,8 +2314,47 @@ +@@ -1242,8 +2317,47 @@ } boolean flag1 = packetIn.getSlotId() >= 1 && packetIn.getSlotId() <= 45; @@ -1700,7 +1703,7 @@ if (flag1 && flag2) { if (itemstack.isEmpty()) -@@ -1273,6 +2384,7 @@ +@@ -1273,6 +2387,7 @@ public void processConfirmTransaction(CPacketConfirmTransaction packetIn) { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.player.getServerWorld()); @@ -1708,7 +1711,7 @@ Short oshort = this.pendingTransactions.lookup(this.player.openContainer.windowId); if (oshort != null && packetIn.getUid() == oshort.shortValue() && this.player.openContainer.windowId == packetIn.getWindowId() && !this.player.openContainer.getCanCraft(this.player) && !this.player.isSpectator()) -@@ -1284,6 +2396,7 @@ +@@ -1284,6 +2399,7 @@ public void processUpdateSign(CPacketUpdateSign packetIn) { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.player.getServerWorld()); @@ -1716,7 +1719,7 @@ this.player.markPlayerActive(); WorldServer worldserver = this.serverController.getWorld(this.player.dimension); BlockPos blockpos = packetIn.getPosition(); -@@ -1300,19 +2413,35 @@ +@@ -1300,19 +2416,35 @@ TileEntitySign tileentitysign = (TileEntitySign)tileentity; @@ -1743,18 +1746,18 @@ + lines[i] = TextFormatting.getTextWithoutFormattingCodes(new TextComponentString(TextFormatting.getTextWithoutFormattingCodes(astring[i])).getUnformattedText()); } -+ SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); ++ SignChangeEvent event = new SignChangeEvent((CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); + this.server.getPluginManager().callEvent(event); + + if (!event.isCancelled()) { -+ System.arraycopy(org.bukkit.craftbukkit.block.CraftSign.sanitizeLines(event.getLines()), 0, tileentitysign.signText, 0, 4); ++ System.arraycopy(CraftSign.sanitizeLines(event.getLines()), 0, tileentitysign.signText, 0, 4); + tileentitysign.isEditable = false; + } + tileentitysign.markDirty(); worldserver.notifyBlockUpdate(blockpos, iblockstate, iblockstate, 3); } -@@ -1320,6 +2449,7 @@ +@@ -1320,6 +2452,7 @@ public void processKeepAlive(CPacketKeepAlive packetIn) { @@ -1762,7 +1765,7 @@ if (this.field_194403_g && packetIn.getKey() == this.field_194404_h) { int i = (int)(this.currentTimeMillis() - this.field_194402_f); -@@ -1328,7 +2458,11 @@ +@@ -1328,7 +2461,11 @@ } else if (!this.player.getName().equals(this.serverController.getServerOwner())) { @@ -1775,7 +1778,7 @@ } } -@@ -1340,12 +2474,25 @@ +@@ -1340,12 +2477,25 @@ public void processPlayerAbilities(CPacketPlayerAbilities packetIn) { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.player.getServerWorld()); @@ -1802,7 +1805,7 @@ List list = Lists.newArrayList(); for (String s : this.serverController.getTabCompletions(this.player, packetIn.getMessage(), packetIn.getTargetBlock(), packetIn.hasTargetBlock())) -@@ -1369,6 +2516,11 @@ +@@ -1369,6 +2519,11 @@ if ("MC|BEdit".equals(s)) { @@ -1814,7 +1817,7 @@ PacketBuffer packetbuffer = packetIn.getBufferData(); try -@@ -1395,15 +2547,22 @@ +@@ -1395,15 +2550,22 @@ if (itemstack.getItem() == Items.WRITABLE_BOOK && itemstack.getItem() == itemstack1.getItem()) { itemstack1.setTagInfo("pages", itemstack.getTagCompound().getTagList("pages", 8)); @@ -1837,7 +1840,7 @@ PacketBuffer packetbuffer1 = packetIn.getBufferData(); try -@@ -1443,12 +2602,14 @@ +@@ -1443,12 +2605,14 @@ } itemstack2.setTagInfo("pages", nbttaglist); @@ -1853,7 +1856,7 @@ } } else if ("MC|TrSel".equals(s)) -@@ -1466,6 +2627,7 @@ +@@ -1466,6 +2630,7 @@ catch (Exception exception5) { LOGGER.error("Couldn't select trade", (Throwable)exception5); @@ -1861,7 +1864,7 @@ } } else if ("MC|AdvCmd".equals(s)) -@@ -1528,6 +2690,7 @@ +@@ -1528,6 +2693,7 @@ catch (Exception exception4) { LOGGER.error("Couldn't set command block", (Throwable)exception4); @@ -1869,7 +1872,7 @@ } } else if ("MC|AutoCmd".equals(s)) -@@ -1606,6 +2769,7 @@ +@@ -1606,6 +2772,7 @@ catch (Exception exception3) { LOGGER.error("Couldn't set command block", (Throwable)exception3); @@ -1877,7 +1880,7 @@ } } else if ("MC|Beacon".equals(s)) -@@ -1632,6 +2796,7 @@ +@@ -1632,6 +2799,7 @@ catch (Exception exception2) { LOGGER.error("Couldn't set beacon", (Throwable)exception2); @@ -1885,7 +1888,7 @@ } } } -@@ -1743,6 +2908,7 @@ +@@ -1743,6 +2911,7 @@ catch (Exception exception1) { LOGGER.error("Couldn't set structure block", (Throwable)exception1); @@ -1893,7 +1896,7 @@ } } else if ("MC|PickItem".equals(s)) -@@ -1760,7 +2926,43 @@ +@@ -1760,7 +2929,43 @@ catch (Exception exception) { LOGGER.error("Couldn't pick item", (Throwable)exception); diff --git a/patches/net/minecraft/network/PacketBuffer.java.patch b/patches/net/minecraft/network/PacketBuffer.java.patch index c00d8ed0..a1a26b6c 100644 --- a/patches/net/minecraft/network/PacketBuffer.java.patch +++ b/patches/net/minecraft/network/PacketBuffer.java.patch @@ -4,7 +4,7 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; public class PacketBuffer extends ByteBuf { diff --git a/patches/net/minecraft/potion/Potion.java.patch b/patches/net/minecraft/potion/Potion.java.patch index 7fb0391d..9716d54f 100644 --- a/patches/net/minecraft/potion/Potion.java.patch +++ b/patches/net/minecraft/potion/Potion.java.patch @@ -14,7 +14,7 @@ import net.minecraft.util.registry.RegistryNamespaced; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; public class Potion extends net.minecraftforge.registries.IForgeRegistryEntry.Impl diff --git a/patches/net/minecraft/server/MinecraftServer.java.patch b/patches/net/minecraft/server/MinecraftServer.java.patch index 1c9ac647..36f50c5a 100644 --- a/patches/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/net/minecraft/server/MinecraftServer.java.patch @@ -1,16 +1,16 @@ --- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java +++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java -@@ -1,7 +1,9 @@ +@@ -1,7 +1,8 @@ package net.minecraft.server; +import com.destroystokyo.paper.utils.CachedSizeConcurrentLinkedQueue; import com.google.common.collect.Lists; - import com.google.common.collect.Queues; +-import com.google.common.collect.Queues; +import com.google.common.collect.Sets; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; -@@ -17,91 +19,97 @@ +@@ -17,91 +18,102 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; @@ -106,11 +106,16 @@ +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.World.Environment; -+import org.bukkit.craftbukkit.CraftServer; -+import org.bukkit.craftbukkit.Main; -+import org.bukkit.craftbukkit.entity.CraftCustomEntity; ++import org.bukkit.craftbukkit.v1_12_R1.CraftServer; ++import org.bukkit.craftbukkit.v1_12_R1.Main; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftCustomEntity; +import org.bukkit.entity.EntityType; +import org.bukkit.potion.PotionEffectType; ++import org.bukkit.craftbukkit.v1_12_R1.chunkio.ChunkIOExecutor; ++import org.bukkit.craftbukkit.v1_12_R1.enchantments.CraftEnchantment; ++import org.bukkit.craftbukkit.v1_12_R1.potion.CraftPotionEffectType; ++import org.bukkit.craftbukkit.v1_12_R1.scoreboard.CraftScoreboardManager; ++import org.bukkit.craftbukkit.v1_12_R1.util.ServerShutdownThread; +import org.magmafoundation.magma.configuration.MagmaConfig; +import org.spigotmc.SlackActivityAccountant; @@ -138,7 +143,7 @@ @SideOnly(Side.SERVER) private String hostname; private int serverPort = -1; -@@ -128,7 +136,6 @@ +@@ -128,7 +140,6 @@ private KeyPair serverKeyPair; private String serverOwner; private String folderName; @@ -146,7 +151,7 @@ private String worldName; private boolean isDemo; private boolean enableBonusChest; -@@ -144,178 +151,273 @@ +@@ -144,178 +155,273 @@ private final GameProfileRepository profileRepo; private final PlayerProfileCache profileCache; private long nanoTimeSinceStatusRefresh; @@ -158,7 +163,7 @@ private boolean worldIconSet; + // CraftBukkit start + public List worldServerList = new ArrayList<>(); -+ public org.bukkit.craftbukkit.CraftServer server; ++ public CraftServer server; + public OptionSet options; + public org.bukkit.command.ConsoleCommandSender console; + public org.bukkit.command.RemoteConsoleCommandSender remoteConsole; @@ -220,7 +225,7 @@ + MinecraftServer.LOGGER.warn((String)null, (Throwable)ex); + } + } -+ Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this)); ++ Runtime.getRuntime().addShutdownHook(new ServerShutdownThread(this)); + this.serverThread = primaryThread = new Thread(net.minecraftforge.fml.common.thread.SidedThreadGroups.SERVER, + this, "Server thread"); // Moved from main } @@ -455,11 +460,11 @@ + ID_MAP.put((short)typeId, bukkitType); + } + for (Object enchantment : Enchantment.REGISTRY) { -+ org.bukkit.enchantments.Enchantment.registerEnchantment(new org.bukkit.craftbukkit.enchantments.CraftEnchantment((Enchantment) enchantment)); ++ org.bukkit.enchantments.Enchantment.registerEnchantment(new CraftEnchantment((Enchantment) enchantment)); + } + org.bukkit.enchantments.Enchantment.stopAcceptingRegistrations(); + for (Object effect : Potion.REGISTRY) { -+ PotionEffectType.registerPotionEffectType(new org.bukkit.craftbukkit.potion.CraftPotionEffectType((Potion) effect)); ++ PotionEffectType.registerPotionEffectType(new CraftPotionEffectType((Potion) effect)); + } + PotionEffectType.stopAcceptingRegistrations(); + server.loadPlugins(); @@ -481,7 +486,7 @@ - { - WorldServer world = (dim == 0 ? overWorld : (WorldServer)new WorldServerMulti(this, isavehandler, dim, overWorld, profiler).init()); + world.initialize(worldsettings); -+ this.server.scoreboardManager = new org.bukkit.craftbukkit.scoreboard.CraftScoreboardManager(this, world.getScoreboard()); ++ this.server.scoreboardManager = new CraftScoreboardManager(this, world.getScoreboard()); + } else { + gen = this.server.getGenerator(name); + @@ -517,7 +522,7 @@ int i = 16; int j = 4; int k = 192; -@@ -323,45 +425,51 @@ +@@ -323,45 +429,51 @@ int i1 = 0; this.setUserMessage("menu.generatingTerrain"); int j1 = 0; @@ -596,7 +601,7 @@ } } -@@ -379,73 +487,79 @@ +@@ -379,73 +491,79 @@ public abstract boolean shouldBroadcastConsoleToOps(); @@ -708,7 +713,7 @@ { if (worldserver1 != null) { -@@ -453,159 +567,215 @@ +@@ -453,159 +571,215 @@ worldserver1.flush(); } } @@ -998,7 +1003,7 @@ BufferedImage bufferedimage = ImageIO.read(file1); Validate.validState(bufferedimage.getWidth() == 64, "Must be 64 pixels wide"); Validate.validState(bufferedimage.getHeight() == 64, "Must be 64 pixels high"); -@@ -613,52 +783,42 @@ +@@ -613,52 +787,42 @@ ByteBuf bytebuf1 = Base64.encode(bytebuf); response.setFavicon("data:image/png;base64," + bytebuf1.toString(StandardCharsets.UTF_8)); bytebuf1.release(); // Forge: fix MC-122085 @@ -1061,7 +1066,7 @@ this.startProfiling = false; this.profiler.profilingEnabled = true; this.profiler.clearProfiling(); -@@ -667,16 +827,15 @@ +@@ -667,16 +831,15 @@ this.profiler.startSection("root"); this.updateTimeLightAndEntities(); @@ -1083,7 +1088,7 @@ } Collections.shuffle(Arrays.asList(agameprofile)); -@@ -684,7 +843,7 @@ +@@ -684,7 +847,7 @@ this.statusResponse.invalidateJson(); } @@ -1092,7 +1097,7 @@ { this.profiler.startSection("save"); this.playerList.saveAllPlayerData(); -@@ -697,95 +856,100 @@ +@@ -697,95 +860,100 @@ this.profiler.endSection(); this.profiler.startSection("snooper"); @@ -1140,7 +1145,7 @@ + processQueue.remove().run(); + } + -+ org.bukkit.craftbukkit.chunkio.ChunkIOExecutor.tick(); ++ ChunkIOExecutor.tick(); + + // Send time updates to everyone, it will get the right time from the world the player is in. + if (this.tickCounter % 20 == 0) { @@ -1241,7 +1246,7 @@ this.profiler.endStartSection("connection"); this.getNetworkSystem().networkTick(); this.profiler.endStartSection("players"); -@@ -794,33 +958,30 @@ +@@ -794,33 +962,30 @@ this.getFunctionManager().update(); this.profiler.endStartSection("tickables"); @@ -1283,7 +1288,7 @@ LOGGER.warn(msg); } -@@ -835,53 +996,51 @@ +@@ -835,53 +1000,51 @@ return ret; } @@ -1361,7 +1366,7 @@ } }); } -@@ -889,145 +1048,115 @@ +@@ -889,145 +1052,115 @@ return report; } @@ -1551,7 +1556,7 @@ worldserver1.getWorldInfo().setDifficulty(difficulty); worldserver1.setAllowedSpawnTypes(this.allowSpawnMonsters(), this.canSpawnAnimals); } -@@ -1035,80 +1164,75 @@ +@@ -1035,80 +1168,75 @@ } } @@ -1661,7 +1666,7 @@ ++l; } } -@@ -1117,228 +1241,186 @@ +@@ -1117,228 +1245,186 @@ playerSnooper.addClientStat("worlds", Integer.valueOf(l)); } @@ -1938,7 +1943,7 @@ return entity; } } -@@ -1347,316 +1429,212 @@ +@@ -1347,316 +1433,212 @@ return null; } @@ -2089,7 +2094,7 @@ - public static void main(String[] p_main_0_) - { + public static void main(String[] args) { -+ OptionSet options = org.bukkit.craftbukkit.Main.main(args); ++ OptionSet options = Main.main(args); + if (options == null) + return; //Forge: Copied from DedicatedServer.init as to run as early as possible, Old code left in place intentionally. diff --git a/patches/net/minecraft/server/dedicated/DedicatedServer.java.patch b/patches/net/minecraft/server/dedicated/DedicatedServer.java.patch index bd84223b..e148d7b8 100644 --- a/patches/net/minecraft/server/dedicated/DedicatedServer.java.patch +++ b/patches/net/minecraft/server/dedicated/DedicatedServer.java.patch @@ -1,6 +1,9 @@ --- ../src-base/minecraft/net/minecraft/server/dedicated/DedicatedServer.java +++ ../src-work/minecraft/net/minecraft/server/dedicated/DedicatedServer.java -@@ -4,10 +4,7 @@ +@@ -1,18 +1,11 @@ + package net.minecraft.server.dedicated; + +-import com.google.common.collect.Lists; import com.mojang.authlib.GameProfileRepository; import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; @@ -11,8 +14,13 @@ +import java.io.*; import java.net.InetAddress; import java.net.Proxy; - import java.nio.charset.StandardCharsets; -@@ -43,30 +40,43 @@ +-import java.nio.charset.StandardCharsets; +-import java.util.Collections; +-import java.util.List; + import java.util.Random; + import java.util.concurrent.TimeUnit; + import java.util.regex.Pattern; +@@ -43,30 +36,44 @@ import net.minecraft.world.World; import net.minecraft.world.WorldSettings; import net.minecraft.world.WorldType; @@ -23,14 +31,15 @@ +import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -+import org.bukkit.Bukkit; -+import org.bukkit.craftbukkit.LoggerOutputStream; -+import org.bukkit.craftbukkit.Main; -+import org.bukkit.craftbukkit.util.TerminalConsoleWriterThread; -+import org.bukkit.craftbukkit.util.Waitable; ++import org.bukkit.craftbukkit.v1_12_R1.LoggerOutputStream; ++import org.bukkit.craftbukkit.v1_12_R1.Main; ++import org.bukkit.craftbukkit.v1_12_R1.util.ForwardLogHandler; ++import org.bukkit.craftbukkit.v1_12_R1.util.TerminalConsoleWriterThread; ++import org.bukkit.craftbukkit.v1_12_R1.util.Waitable; +import org.bukkit.event.server.RemoteServerCommandEvent; +import org.bukkit.event.server.ServerCommandEvent; ++import org.bukkit.craftbukkit.v1_12_R1.command.CraftRemoteConsoleCommandSender; +import org.spigotmc.SpigotConfig; + @SideOnly(Side.SERVER) @@ -61,7 +70,7 @@ Thread thread = new Thread("Server Infinisleeper") { { -@@ -96,15 +106,23 @@ +@@ -96,15 +103,23 @@ { public void run() { @@ -92,7 +101,7 @@ } } catch (IOException ioexception1) -@@ -113,6 +131,27 @@ +@@ -113,6 +128,27 @@ } } }; @@ -103,7 +112,7 @@ + for (java.util.logging.Handler handler : global.getHandlers()) { + global.removeHandler(handler); + } -+ global.addHandler(new org.bukkit.craftbukkit.util.ForwardLogHandler()); ++ global.addHandler(new ForwardLogHandler()); + + final org.apache.logging.log4j.core.Logger logger = ((org.apache.logging.log4j.core.Logger) LogManager.getRootLogger()); + for (org.apache.logging.log4j.core.Appender appender : logger.getAppenders().values()) { @@ -120,7 +129,7 @@ thread.setDaemon(true); thread.start(); LOGGER.info("Starting minecraft server version 1.12.2"); -@@ -125,7 +164,7 @@ +@@ -125,7 +161,7 @@ net.minecraftforge.fml.common.FMLCommonHandler.instance().onServerStart(this); LOGGER.info("Loading properties"); @@ -129,7 +138,7 @@ this.eula = new ServerEula(new File("eula.txt")); if (!this.eula.hasAcceptedEULA()) -@@ -144,7 +183,7 @@ +@@ -144,7 +180,7 @@ { this.setOnlineMode(this.settings.getBooleanProperty("online-mode", true)); this.setPreventProxyConnections(this.settings.getBooleanProperty("prevent-proxy-connections", false)); @@ -138,7 +147,7 @@ } this.setCanSpawnAnimals(this.settings.getBooleanProperty("spawn-animals", true)); -@@ -180,11 +219,19 @@ +@@ -180,11 +216,19 @@ { this.setServerPort(this.settings.getIntProperty("server-port", 25565)); } @@ -158,7 +167,7 @@ try { this.getNetworkSystem().addLanEndpoint(inetaddress, this.getServerPort()); -@@ -196,13 +243,6 @@ +@@ -196,13 +240,6 @@ LOGGER.warn("Perhaps a server is already running on that port?"); return false; } @@ -172,7 +181,7 @@ } if (this.convertFiles()) -@@ -217,8 +257,7 @@ +@@ -217,8 +254,7 @@ else { net.minecraftforge.fml.common.FMLCommonHandler.instance().onServerStarted(); @@ -182,7 +191,7 @@ if (this.getFolderName() == null) { -@@ -268,11 +307,11 @@ +@@ -268,11 +304,11 @@ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false; LOGGER.info("Preparing level \"{}\"", (Object)this.getFolderName()); this.loadAllWorlds(this.getFolderName(), this.getFolderName(), k, worldtype, s2); @@ -196,7 +205,7 @@ if (this.settings.hasProperty("announce-player-achievements")) { this.worlds[0].getGameRules().setOrCreateGameRule("announceAdvancements", this.settings.getBooleanProperty("announce-player-achievements", true) ? "true" : "false"); -@@ -287,21 +326,32 @@ +@@ -287,21 +323,32 @@ this.rconQueryThread.startThread(); } @@ -206,7 +215,7 @@ LOGGER.info("Starting remote control listener"); this.rconThread = new RConThreadMain(this); this.rconThread.startThread(); -+ this.remoteConsole = new org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender(this.rconConsoleSource); ++ this.remoteConsole = new CraftRemoteConsoleCommandSender(this.rconConsoleSource); } - if (this.getMaxTickTime() > 0L) @@ -237,7 +246,7 @@ Items.AIR.getSubItems(CreativeTabs.SEARCH, NonNullList.create()); // <3 you Grum for this, saves us ~30 patch files! --^ return net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarting(this); -@@ -427,11 +477,19 @@ +@@ -427,11 +474,19 @@ public void executePendingCommands() { @@ -261,7 +270,7 @@ } public boolean isDedicatedServer() -@@ -684,13 +742,65 @@ +@@ -684,13 +739,65 @@ public String getPlugins() { diff --git a/patches/net/minecraft/server/management/PlayerInteractionManager.java.patch b/patches/net/minecraft/server/management/PlayerInteractionManager.java.patch index 00fc1c82..916d35fd 100644 --- a/patches/net/minecraft/server/management/PlayerInteractionManager.java.patch +++ b/patches/net/minecraft/server/management/PlayerInteractionManager.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/server/management/PlayerInteractionManager.java +++ ../src-work/minecraft/net/minecraft/server/management/PlayerInteractionManager.java -@@ -1,19 +1,23 @@ +@@ -1,19 +1,18 @@ package net.minecraft.server.management; -import net.minecraft.block.Block; @@ -10,17 +10,13 @@ +import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -+import net.minecraft.enchantment.EnchantmentHelper; -+import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; -+import net.minecraft.init.Enchantments; -+import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; - import net.minecraft.item.ItemSword; +-import net.minecraft.item.ItemSword; import net.minecraft.network.play.server.SPacketBlockChange; +import net.minecraft.network.play.server.SPacketCloseWindow; import net.minecraft.network.play.server.SPacketPlayerListItem; @@ -28,22 +24,18 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.ActionResult; -@@ -25,7 +29,14 @@ +@@ -25,6 +24,10 @@ import net.minecraft.world.ILockableContainer; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.Event; +import org.bukkit.event.block.Action; -+import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.player.PlayerInteractEvent; -+import java.util.ArrayList; -+ public class PlayerInteractionManager { - public World world; -@@ -50,7 +61,7 @@ +@@ -50,7 +53,7 @@ this.gameType = type; type.configurePlayerCapabilities(this.player.capabilities); this.player.sendPlayerAbilities(); @@ -52,7 +44,7 @@ this.world.updateAllPlayersSleepingFlag(); } -@@ -81,7 +92,7 @@ +@@ -81,7 +84,7 @@ public void updateBlockRemoving() { @@ -61,7 +53,7 @@ if (this.receivedFinishDiggingPacket) { -@@ -137,6 +148,19 @@ +@@ -137,6 +140,19 @@ public void onBlockClicked(BlockPos pos, EnumFacing side) { @@ -81,7 +73,7 @@ double reachDist = player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).getAttributeValue(); net.minecraftforge.event.entity.player.PlayerInteractEvent.LeftClickBlock event = net.minecraftforge.common.ForgeHooks.onLeftClickBlock(player, pos, side, net.minecraftforge.common.ForgeHooks.rayTraceEyeHitVec(player, reachDist + 1)); if (event.isCanceled()) -@@ -185,11 +209,24 @@ +@@ -185,11 +201,24 @@ this.initialDamage = this.curblockDamage; float f = 1.0F; @@ -108,7 +100,7 @@ this.world.extinguishFire((EntityPlayer)null, pos, side); } else -@@ -200,6 +237,26 @@ +@@ -200,6 +229,26 @@ } f = iblockstate.getPlayerRelativeBlockHardness(this.player, this.player.world, pos); } @@ -135,7 +127,7 @@ if (event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) { if (f >= 1.0F) -@@ -221,6 +278,7 @@ +@@ -221,6 +270,7 @@ this.destroyPos = pos; int i = (int)(f * 10.0F); this.world.sendBlockBreakProgress(this.player.getEntityId(), pos, i); @@ -143,7 +135,7 @@ this.durabilityRemainingOnBlock = i; } } -@@ -230,6 +288,7 @@ +@@ -230,6 +280,7 @@ { if (pos.equals(this.destroyPos)) { @@ -151,7 +143,7 @@ int i = this.curblockDamage - this.initialDamage; IBlockState iblockstate = this.world.getBlockState(pos); -@@ -251,6 +310,15 @@ +@@ -251,6 +302,15 @@ this.initialBlockDamage = this.initialDamage; } } @@ -167,7 +159,7 @@ } } -@@ -331,7 +399,7 @@ +@@ -331,7 +391,7 @@ // Drop experience if (!this.isCreative() && flag1 && exp > 0) { @@ -176,7 +168,7 @@ } return flag1; } -@@ -396,9 +464,58 @@ +@@ -396,9 +456,58 @@ } } @@ -236,7 +228,7 @@ { TileEntity tileentity = worldIn.getTileEntity(pos); -@@ -460,7 +577,7 @@ +@@ -460,7 +569,7 @@ { return EnumActionResult.PASS; } @@ -245,7 +237,7 @@ { if (stack.getItem() instanceof ItemBlock && !player.canUseCommandBlock()) { -@@ -496,6 +613,8 @@ +@@ -496,6 +605,8 @@ } } } diff --git a/patches/net/minecraft/server/management/PlayerList.java.patch b/patches/net/minecraft/server/management/PlayerList.java.patch index b5f1e63c..a3553fa0 100644 --- a/patches/net/minecraft/server/management/PlayerList.java.patch +++ b/patches/net/minecraft/server/management/PlayerList.java.patch @@ -9,16 +9,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -@@ -8,6 +11,8 @@ - import java.io.File; - import java.net.SocketAddress; - import java.text.SimpleDateFormat; -+import java.util.ArrayList; -+import java.util.Iterator; - import java.util.List; - import java.util.Map; - import java.util.Set; -@@ -27,6 +32,7 @@ +@@ -27,6 +30,7 @@ import net.minecraft.network.play.server.SPacketChat; import net.minecraft.network.play.server.SPacketCustomPayload; import net.minecraft.network.play.server.SPacketEntityEffect; @@ -26,7 +17,7 @@ import net.minecraft.network.play.server.SPacketEntityStatus; import net.minecraft.network.play.server.SPacketHeldItemChange; import net.minecraft.network.play.server.SPacketJoinGame; -@@ -45,6 +51,7 @@ +@@ -45,6 +49,7 @@ import net.minecraft.scoreboard.ServerScoreboard; import net.minecraft.scoreboard.Team; import net.minecraft.server.MinecraftServer; @@ -34,7 +25,7 @@ import net.minecraft.stats.StatList; import net.minecraft.stats.StatisticsManagerServer; import net.minecraft.util.math.BlockPos; -@@ -52,7 +59,7 @@ +@@ -52,7 +57,7 @@ import net.minecraft.util.text.ChatType; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; @@ -43,7 +34,7 @@ import net.minecraft.world.DimensionType; import net.minecraft.world.GameType; import net.minecraft.world.World; -@@ -62,10 +69,35 @@ +@@ -62,10 +67,39 @@ import net.minecraft.world.chunk.storage.AnvilChunkLoader; import net.minecraft.world.storage.IPlayerFileData; import net.minecraft.world.storage.WorldInfo; @@ -61,11 +52,13 @@ +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.TravelAgent; -+import org.bukkit.craftbukkit.CraftServer; -+import org.bukkit.craftbukkit.CraftWorld; -+import org.bukkit.craftbukkit.chunkio.ChunkIOExecutor; -+import org.bukkit.craftbukkit.command.ConsoleCommandCompleter; -+import org.bukkit.craftbukkit.util.CraftChatMessage; ++import org.bukkit.craftbukkit.v1_12_R1.CraftServer; ++import org.bukkit.craftbukkit.v1_12_R1.CraftTravelAgent; ++import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; ++import org.bukkit.craftbukkit.v1_12_R1.chunkio.ChunkIOExecutor; ++import org.bukkit.craftbukkit.v1_12_R1.command.ColouredConsoleSender; ++import org.bukkit.craftbukkit.v1_12_R1.command.ConsoleCommandCompleter; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerChangedWorldEvent; +import org.bukkit.event.player.PlayerJoinEvent; @@ -75,11 +68,13 @@ +import org.bukkit.event.player.PlayerRespawnEvent; +import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.util.Vector; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.spigotmc.event.player.PlayerSpawnLocationEvent; public abstract class PlayerList { -@@ -76,15 +108,15 @@ +@@ -76,15 +110,15 @@ private static final Logger LOGGER = LogManager.getLogger(); private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z"); private final MinecraftServer mcServer; @@ -99,7 +94,7 @@ private boolean whiteListEnforced; protected int maxPlayers; private int viewDistance; -@@ -92,14 +124,19 @@ +@@ -92,14 +126,19 @@ private boolean commandsAllowedForAll; private int playerPingIndex; @@ -108,7 +103,7 @@ public PlayerList(MinecraftServer server) { + this.cserver = server.server = new CraftServer(server, this); -+ server.console = org.bukkit.craftbukkit.command.ColouredConsoleSender.getInstance(); ++ server.console = ColouredConsoleSender.getInstance(); + server.reader.addCompleter(new ConsoleCommandCompleter(server.server)); this.bannedPlayers = new UserListBans(FILE_PLAYERBANS); this.bannedIPs = new UserListIPBans(FILE_IPBANS); @@ -121,7 +116,7 @@ this.mcServer = server; this.bannedPlayers.setLanServer(false); this.bannedIPs.setLanServer(false); -@@ -125,6 +162,13 @@ +@@ -125,6 +164,13 @@ playerIn.setPosition(spawnPoint.getX(), spawnPoint.getY(), spawnPoint.getZ()); } @@ -135,7 +130,7 @@ playerIn.setWorld(playerWorld); playerIn.interactionManager.setWorld((WorldServer)playerIn.world); String s1 = "local"; -@@ -134,36 +178,61 @@ +@@ -134,36 +180,61 @@ s1 = netManager.getRemoteAddress().toString(); } @@ -205,7 +200,7 @@ nethandlerplayserver.setPlayerLocation(playerIn.posX, playerIn.posY, playerIn.posZ, playerIn.rotationYaw, playerIn.rotationPitch); this.updateTimeAndWeatherForPlayer(playerIn, worldserver); -@@ -217,9 +286,11 @@ +@@ -217,9 +288,11 @@ playerIn.addSelfToInternalCraftingInventory(); net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerLoggedIn(playerIn); @@ -218,7 +213,7 @@ { Set set = Sets.newHashSet(); -@@ -246,28 +317,29 @@ +@@ -246,28 +319,29 @@ public void setPlayerManager(WorldServer[] worldServers) { @@ -253,7 +248,7 @@ } public void onDamageAmountChanged(WorldBorder border, double newAmount) { -@@ -344,16 +416,16 @@ +@@ -344,16 +418,16 @@ protected void writePlayerData(EntityPlayerMP playerIn) { if (playerIn.connection == null) return; @@ -273,7 +268,7 @@ if (playeradvancements != null) { -@@ -378,16 +450,84 @@ +@@ -378,16 +452,84 @@ this.preparePlayer(playerIn, (WorldServer)null); } @@ -294,7 +289,7 @@ + joinMessage = playerJoinEvent.getJoinMessage(); + + if (joinMessage != null && joinMessage.length() > 0) { -+ for (ITextComponent line : org.bukkit.craftbukkit.util.CraftChatMessage.fromString(joinMessage)) { ++ for (ITextComponent line : CraftChatMessage.fromString(joinMessage)) { + mcServer.getPlayerList().sendPacketToAllPlayers(new SPacketChat(line)); + } + } @@ -345,7 +340,7 @@ playerIn.addStat(StatList.LEAVE_GAME); + + // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it -+ org.bukkit.craftbukkit.event.CraftEventFactory.handleInventoryCloseEvent(playerIn); ++ CraftEventFactory.handleInventoryCloseEvent(playerIn); + if(playerIn.connection != null) { + // Magma CraftServer Changed to Bukkit + PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(playerIn), "\u00A7e" + playerIn.getName() + " left the game"); @@ -359,7 +354,7 @@ this.writePlayerData(playerIn); if (playerIn.isRiding()) -@@ -420,11 +560,27 @@ +@@ -420,11 +562,27 @@ if (entityplayermp == playerIn) { this.uuidToPlayerMap.remove(uuid); @@ -390,7 +385,7 @@ } public String allowUserToConnect(SocketAddress address, GameProfile profile) -@@ -463,6 +619,72 @@ +@@ -463,6 +621,72 @@ } } @@ -463,7 +458,7 @@ public EntityPlayerMP createPlayerForUser(GameProfile profile) { UUID uuid = EntityPlayer.getUUID(profile); -@@ -504,26 +726,37 @@ +@@ -504,26 +728,37 @@ return new EntityPlayerMP(this.mcServer, this.mcServer.getWorld(0), profile, playerinteractionmanager); } @@ -504,7 +499,7 @@ playerIn.dimension = dimension; PlayerInteractionManager playerinteractionmanager; -@@ -537,6 +770,11 @@ +@@ -537,6 +772,11 @@ } EntityPlayerMP entityplayermp = new EntityPlayerMP(this.mcServer, this.mcServer.getWorld(playerIn.dimension), playerIn.getGameProfile(), playerinteractionmanager); @@ -516,7 +511,7 @@ entityplayermp.connection = playerIn.connection; entityplayermp.copyFrom(playerIn, conqueredEnd); entityplayermp.dimension = dimension; -@@ -549,48 +787,178 @@ +@@ -549,48 +789,178 @@ entityplayermp.addTag(s); } @@ -667,7 +662,7 @@ + if (exitWorld != null) { + if ((cause == PlayerTeleportEvent.TeleportCause.END_PORTAL) && (i == 0)) { + // THE_END -> NORMAL; use bed if available, otherwise default spawn -+ exit = ((org.bukkit.craftbukkit.entity.CraftPlayer) entityplayer.getBukkitEntity()).getBedSpawnLocation(); ++ exit = ((CraftPlayer) entityplayer.getBukkitEntity()).getBedSpawnLocation(); + if (exit == null || ((CraftWorld) exit.getWorld()).getHandle().dimension != 0) { + BlockPos randomSpawn = entityplayer.getSpawnPoint(mcServer, exitWorld); + exit = new Location(exitWorld.getWorld(), randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -683,7 +678,7 @@ + } + } + -+ TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().getDefaultTeleporter() : org.bukkit.craftbukkit.CraftTravelAgent.DEFAULT; // return arbitrary TA to compensate for implementation dependent plugins ++ TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().getDefaultTeleporter() : CraftTravelAgent.DEFAULT; // return arbitrary TA to compensate for implementation dependent plugins + PlayerPortalEvent event = new PlayerPortalEvent(entityplayer.getBukkitEntity(), enter, exit, agent, cause); + event.useTravelAgent(useTravelAgent); + Bukkit.getServer().getPluginManager().callEvent(event); @@ -716,7 +711,7 @@ public void updatePermissionLevel(EntityPlayerMP player) { GameProfile gameprofile = player.getGameProfile(); -@@ -642,7 +1010,9 @@ +@@ -642,7 +1012,9 @@ public void transferEntityToWorld(Entity entityIn, int lastDimension, WorldServer oldWorldIn, WorldServer toWorldIn) { @@ -727,7 +722,7 @@ } // TODO: Remove (1.13) -@@ -729,11 +1099,158 @@ +@@ -729,11 +1101,158 @@ entityIn.setWorld(toWorldIn); } @@ -887,7 +882,7 @@ this.playerPingIndex = 0; } } -@@ -746,6 +1263,24 @@ +@@ -746,6 +1265,24 @@ } } @@ -912,7 +907,7 @@ public void sendPacketToAllPlayersInDimension(Packet packetIn, int dimension) { for (int i = 0; i < this.playerEntityList.size(); ++i) -@@ -861,12 +1396,20 @@ +@@ -861,12 +1398,20 @@ int i = this.mcServer.getOpPermissionLevel(); this.ops.addEntry(new UserListOpsEntry(profile, this.mcServer.getOpPermissionLevel(), this.ops.bypassesPlayerLimit(profile))); this.sendPlayerPermissionLevel(this.getPlayerByUUID(profile.getId()), i); @@ -933,7 +928,7 @@ } private void sendPlayerPermissionLevel(EntityPlayerMP player, int permLevel) -@@ -918,11 +1461,33 @@ +@@ -918,11 +1463,33 @@ public void sendToAllNearExcept(@Nullable EntityPlayer except, double x, double y, double z, double radius, int dimension, Packet packetIn) { @@ -971,7 +966,7 @@ { double d0 = x - entityplayermp.posX; double d1 = y - entityplayermp.posY; -@@ -938,11 +1503,23 @@ +@@ -938,11 +1505,23 @@ public void saveAllPlayerData() { @@ -998,7 +993,7 @@ public void addWhitelistedPlayer(GameProfile profile) { -@@ -988,16 +1565,21 @@ +@@ -988,16 +1567,21 @@ if (worldIn.isRaining()) { @@ -1024,7 +1019,7 @@ playerIn.connection.sendPacket(new SPacketHeldItemChange(playerIn.inventory.currentItem)); } -@@ -1079,17 +1661,26 @@ +@@ -1079,17 +1663,26 @@ public void removeAllPlayers() { @@ -1055,7 +1050,7 @@ } public void sendMessage(ITextComponent component) -@@ -1097,10 +1688,19 @@ +@@ -1097,10 +1690,19 @@ this.sendMessage(component, true); } @@ -1077,7 +1072,7 @@ if (statisticsmanagerserver == null) { -@@ -1119,7 +1719,7 @@ +@@ -1119,7 +1721,7 @@ statisticsmanagerserver = new StatisticsManagerServer(this.mcServer, file2); statisticsmanagerserver.readStatFile(); @@ -1086,7 +1081,7 @@ } return statisticsmanagerserver; -@@ -1128,14 +1728,14 @@ +@@ -1128,14 +1730,14 @@ public PlayerAdvancements getPlayerAdvancements(EntityPlayerMP p_192054_1_) { UUID uuid = p_192054_1_.getUniqueID(); @@ -1103,7 +1098,7 @@ } playeradvancements.setPlayer(p_192054_1_); -@@ -1148,7 +1748,7 @@ +@@ -1148,7 +1750,7 @@ if (this.mcServer.worlds != null) { @@ -1112,7 +1107,7 @@ { if (worldserver != null) { -@@ -1176,9 +1776,10 @@ +@@ -1176,9 +1778,10 @@ public void reloadResources() { diff --git a/patches/net/minecraft/server/network/NetHandlerLoginServer.java.patch b/patches/net/minecraft/server/network/NetHandlerLoginServer.java.patch index 82d7c39b..b741dac1 100644 --- a/patches/net/minecraft/server/network/NetHandlerLoginServer.java.patch +++ b/patches/net/minecraft/server/network/NetHandlerLoginServer.java.patch @@ -8,7 +8,7 @@ import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationUnavailableException; import io.netty.channel.ChannelFuture; -@@ -29,10 +31,15 @@ +@@ -29,10 +31,16 @@ import net.minecraft.util.CryptManager; import net.minecraft.util.ITickable; import net.minecraft.util.text.ITextComponent; @@ -18,13 +18,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.Bukkit; -+import org.bukkit.craftbukkit.util.Waitable; ++import org.bukkit.craftbukkit.v1_12_R1.CraftServer; ++import org.bukkit.craftbukkit.v1_12_R1.util.Waitable; +import org.bukkit.event.player.AsyncPlayerPreLoginEvent; +import org.bukkit.event.player.PlayerPreLoginEvent; public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable { -@@ -42,13 +49,15 @@ +@@ -42,13 +50,15 @@ private final byte[] verifyToken = new byte[4]; private final MinecraftServer server; public final NetworkManager networkManager; @@ -41,7 +42,7 @@ public NetHandlerLoginServer(MinecraftServer serverIn, NetworkManager networkManagerIn) { this.server = serverIn; -@@ -58,17 +67,21 @@ +@@ -58,17 +68,21 @@ public void update() { @@ -66,7 +67,7 @@ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.fmlServerHandshake(this.server.getPlayerList(), this.networkManager, this.player); this.player = null; } -@@ -94,22 +107,54 @@ +@@ -94,22 +108,54 @@ } } @@ -125,7 +126,7 @@ if (this.server.getNetworkCompressionThreshold() >= 0 && !this.networkManager.isLocalChannel()) { -@@ -127,12 +172,12 @@ +@@ -127,12 +173,12 @@ if (entityplayermp != null) { @@ -141,7 +142,7 @@ } } } -@@ -149,23 +194,42 @@ +@@ -149,23 +195,42 @@ public void processLoginStart(CPacketLoginStart packetIn) { @@ -188,7 +189,7 @@ PrivateKey privatekey = this.server.getKeyPair().getPrivate(); if (!Arrays.equals(this.verifyToken, packetIn.getVerifyToken(privatekey))) -@@ -175,7 +239,7 @@ +@@ -175,7 +240,7 @@ else { this.secretKey = packetIn.getSecretKey(privatekey); @@ -197,7 +198,7 @@ this.networkManager.enableEncryption(this.secretKey); (new Thread(net.minecraftforge.fml.common.thread.SidedThreadGroups.SERVER, "User Authenticator #" + AUTHENTICATOR_THREAD_ID.incrementAndGet()) { -@@ -190,14 +254,18 @@ +@@ -190,14 +255,18 @@ if (NetHandlerLoginServer.this.loginGameProfile != null) { @@ -219,7 +220,7 @@ } else { -@@ -211,13 +279,19 @@ +@@ -211,13 +280,19 @@ { NetHandlerLoginServer.LOGGER.warn("Authentication servers are down but will let them in anyway!"); NetHandlerLoginServer.this.loginGameProfile = NetHandlerLoginServer.this.getOfflineProfile(gameprofile); @@ -240,7 +241,7 @@ } } @Nullable -@@ -230,6 +304,54 @@ +@@ -230,6 +305,54 @@ } } @@ -250,7 +251,7 @@ + String playerName = loginGameProfile.getName(); + java.net.InetAddress address = ((java.net.InetSocketAddress) networkManager.getRemoteAddress()).getAddress(); + java.util.UUID uniqueId = loginGameProfile.getId(); -+ final org.bukkit.craftbukkit.CraftServer server = NetHandlerLoginServer.this.server.server; ++ final CraftServer server = NetHandlerLoginServer.this.server.server; + + // Paper start + PlayerProfile profile = Bukkit.createProfile(uniqueId, playerName); diff --git a/patches/net/minecraft/server/network/NetHandlerStatusServer.java.patch b/patches/net/minecraft/server/network/NetHandlerStatusServer.java.patch index 52358bbe..ad059485 100644 --- a/patches/net/minecraft/server/network/NetHandlerStatusServer.java.patch +++ b/patches/net/minecraft/server/network/NetHandlerStatusServer.java.patch @@ -10,12 +10,13 @@ import net.minecraft.network.status.INetHandlerStatusServer; import net.minecraft.network.status.client.CPacketPing; import net.minecraft.network.status.client.CPacketServerQuery; -@@ -9,7 +12,13 @@ +@@ -9,7 +12,14 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; -+import org.bukkit.craftbukkit.util.CraftIconCache; ++import org.bukkit.craftbukkit.v1_12_R1.CraftServer; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftIconCache; +import org.bukkit.entity.Player; +import java.net.InetSocketAddress; @@ -24,7 +25,7 @@ public class NetHandlerStatusServer implements INetHandlerStatusServer { private static final ITextComponent EXIT_MESSAGE = new TextComponentString("Status request has been handled."); -@@ -36,8 +45,102 @@ +@@ -36,8 +46,102 @@ else { this.handled = true; @@ -43,7 +44,7 @@ + @Override + public void setServerIcon(org.bukkit.util.CachedServerIcon icon) { + if (!(icon instanceof CraftIconCache)) { -+ throw new IllegalArgumentException(icon + " was not created by " + org.bukkit.craftbukkit.CraftServer.class); ++ throw new IllegalArgumentException(icon + " was not created by " + CraftServer.class); + } + this.icon = (CraftIconCache) icon; + } diff --git a/patches/net/minecraft/stats/StatisticsManager.java.patch b/patches/net/minecraft/stats/StatisticsManager.java.patch index f8107cbf..c856e8b8 100644 --- a/patches/net/minecraft/stats/StatisticsManager.java.patch +++ b/patches/net/minecraft/stats/StatisticsManager.java.patch @@ -1,10 +1,18 @@ --- ../src-base/minecraft/net/minecraft/stats/StatisticsManager.java +++ ../src-work/minecraft/net/minecraft/stats/StatisticsManager.java -@@ -11,6 +11,10 @@ +@@ -4,6 +4,7 @@ + import java.util.Map; + import net.minecraft.entity.player.EntityPlayer; + import net.minecraft.util.TupleIntJsonSerializable; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class StatisticsManager + { +@@ -11,6 +12,10 @@ public void increaseStat(EntityPlayer player, StatBase stat, int amount) { -+ org.bukkit.event.Cancellable cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.handleStatisticsIncrease(player, stat, this.readStat(stat), amount); ++ org.bukkit.event.Cancellable cancellable = CraftEventFactory.handleStatisticsIncrease(player, stat, this.readStat(stat), amount); + if (cancellable != null && cancellable.isCancelled()) { + return; + } diff --git a/patches/net/minecraft/tileentity/CommandBlockBaseLogic.java.patch b/patches/net/minecraft/tileentity/CommandBlockBaseLogic.java.patch index 2c551c3f..49e6a3db 100644 --- a/patches/net/minecraft/tileentity/CommandBlockBaseLogic.java.patch +++ b/patches/net/minecraft/tileentity/CommandBlockBaseLogic.java.patch @@ -36,7 +36,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.command.CommandSender; -+import org.bukkit.craftbukkit.command.VanillaCommandWrapper; ++import org.bukkit.craftbukkit.v1_12_R1.command.VanillaCommandWrapper; +import org.bukkit.event.server.ServerCommandEvent; public abstract class CommandBlockBaseLogic implements ICommandSender diff --git a/patches/net/minecraft/tileentity/MobSpawnerBaseLogic.java.patch b/patches/net/minecraft/tileentity/MobSpawnerBaseLogic.java.patch index f34cebe1..a581614f 100644 --- a/patches/net/minecraft/tileentity/MobSpawnerBaseLogic.java.patch +++ b/patches/net/minecraft/tileentity/MobSpawnerBaseLogic.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.java +++ ../src-work/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.java -@@ -1,42 +1,43 @@ +@@ -1,42 +1,44 @@ package net.minecraft.tileentity; +import com.destroystokyo.paper.MCUtil; @@ -27,6 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.entity.EntityType; +import org.bukkit.event.entity.CreatureSpawnEvent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import javax.annotation.Nullable; +import java.util.List; @@ -59,7 +60,7 @@ { String s = this.spawnData.getNbt().getString("id"); return StringUtils.isNullOrEmpty(s) ? null : new ResourceLocation(s); -@@ -47,6 +48,7 @@ +@@ -47,6 +49,7 @@ if (id != null) { this.spawnData.getNbt().setString("id", id.toString()); @@ -67,7 +68,7 @@ } } -@@ -106,6 +108,22 @@ +@@ -106,6 +109,22 @@ double d0 = j >= 1 ? nbttaglist.getDoubleAt(0) : (double)blockpos.getX() + (world.rand.nextDouble() - world.rand.nextDouble()) * (double)this.spawnRange + 0.5D; double d1 = j >= 2 ? nbttaglist.getDoubleAt(1) : (double)(blockpos.getY() + world.rand.nextInt(3) - 1); double d2 = j >= 3 ? nbttaglist.getDoubleAt(2) : (double)blockpos.getZ() + (world.rand.nextDouble() - world.rand.nextDouble()) * (double)this.spawnRange + 0.5D; @@ -90,7 +91,7 @@ Entity entity = AnvilChunkLoader.readWorldEntityPos(nbttagcompound, world, d0, d1, d2, false); if (entity == null) -@@ -132,7 +150,15 @@ +@@ -132,7 +151,15 @@ ((EntityLiving)entity).onInitialSpawn(world.getDifficultyForLocation(new BlockPos(entity)), (IEntityLivingData)null); } @@ -99,7 +100,7 @@ + + flag = true; // Paper + -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockpos).isCancelled()) { ++ if (CraftEventFactory.callSpawnerSpawnEvent(entity, blockpos).isCancelled()) { + continue; + } + @@ -107,7 +108,7 @@ world.playEvent(2004, blockpos, 0); if (entityliving != null) -@@ -140,7 +166,7 @@ +@@ -140,7 +167,7 @@ entityliving.spawnExplosionParticle(); } diff --git a/patches/net/minecraft/tileentity/TileEntityBeacon.java.patch b/patches/net/minecraft/tileentity/TileEntityBeacon.java.patch index 993f7e9b..1ce942ae 100644 --- a/patches/net/minecraft/tileentity/TileEntityBeacon.java.patch +++ b/patches/net/minecraft/tileentity/TileEntityBeacon.java.patch @@ -26,9 +26,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; -+import org.bukkit.craftbukkit.event.CraftEventFactory; -+import org.bukkit.craftbukkit.potion.CraftPotionUtil; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.potion.CraftPotionUtil; +import org.bukkit.entity.HumanEntity; +import org.bukkit.entity.Player; diff --git a/patches/net/minecraft/tileentity/TileEntityBrewingStand.java.patch b/patches/net/minecraft/tileentity/TileEntityBrewingStand.java.patch index 1e3eae0b..d66ac661 100644 --- a/patches/net/minecraft/tileentity/TileEntityBrewingStand.java.patch +++ b/patches/net/minecraft/tileentity/TileEntityBrewingStand.java.patch @@ -21,8 +21,8 @@ import net.minecraft.util.datafix.FixTypes; import net.minecraft.util.datafix.walkers.ItemStackDataLists; import net.minecraft.util.math.BlockPos; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.entity.HumanEntity; +import org.bukkit.event.inventory.BrewEvent; +import org.bukkit.event.inventory.BrewingStandFuelEvent; diff --git a/patches/net/minecraft/tileentity/TileEntityChest.java.patch b/patches/net/minecraft/tileentity/TileEntityChest.java.patch index 238c28f6..2abc63cf 100644 --- a/patches/net/minecraft/tileentity/TileEntityChest.java.patch +++ b/patches/net/minecraft/tileentity/TileEntityChest.java.patch @@ -8,18 +8,19 @@ import net.minecraft.init.SoundEvents; import net.minecraft.inventory.Container; import net.minecraft.inventory.ContainerChest; -@@ -23,6 +24,10 @@ +@@ -23,6 +24,11 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import java.util.List; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + public class TileEntityChest extends TileEntityLockableLoot implements ITickable { private NonNullList chestContents = NonNullList.withSize(27, ItemStack.EMPTY); -@@ -37,6 +42,8 @@ +@@ -37,6 +43,8 @@ private int ticksSinceSync; private BlockChest.Type cachedChestType; @@ -28,7 +29,7 @@ public TileEntityChest() { } -@@ -45,7 +52,27 @@ +@@ -45,7 +53,27 @@ { this.cachedChestType = typeIn; } @@ -56,7 +57,7 @@ public int getSizeInventory() { return 27; -@@ -109,7 +136,7 @@ +@@ -109,7 +137,7 @@ public int getInventoryStackLimit() { @@ -65,7 +66,7 @@ } public void updateContainingBlockInfo() -@@ -325,8 +352,18 @@ +@@ -325,8 +353,18 @@ this.numPlayersUsing = 0; } @@ -78,13 +79,13 @@ + int newPower = Math.max(0, Math.min(15, this.numPlayersUsing)); + + if (oldPower != newPower) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, pos.getX(), pos.getY(), pos.getZ(), oldPower, newPower); ++ CraftEventFactory.callRedstoneChange(world, pos.getX(), pos.getY(), pos.getZ(), oldPower, newPower); + } + } this.world.notifyNeighborsOfStateChange(this.pos, this.getBlockType(), false); if (this.getChestType() == BlockChest.Type.TRAP) -@@ -356,7 +393,7 @@ +@@ -356,7 +394,7 @@ @SuppressWarnings("unchecked") @Override @Nullable diff --git a/patches/net/minecraft/tileentity/TileEntityCommandBlock.java.patch b/patches/net/minecraft/tileentity/TileEntityCommandBlock.java.patch index ec8168ec..80ef8620 100644 --- a/patches/net/minecraft/tileentity/TileEntityCommandBlock.java.patch +++ b/patches/net/minecraft/tileentity/TileEntityCommandBlock.java.patch @@ -1,16 +1,24 @@ --- ../src-base/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.java +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.java -@@ -25,6 +25,9 @@ +@@ -16,6 +16,7 @@ + import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.command.CraftBlockCommandSender; + + public class TileEntityCommandBlock extends TileEntity + { +@@ -25,6 +26,9 @@ private boolean sendToClient; private final CommandBlockBaseLogic commandBlockLogic = new CommandBlockBaseLogic() { + { -+ sender = new org.bukkit.craftbukkit.command.CraftBlockCommandSender(this); ++ sender = new CraftBlockCommandSender(this); + } public BlockPos getPosition() { return TileEntityCommandBlock.this.pos; -@@ -134,7 +137,7 @@ +@@ -134,7 +138,7 @@ boolean flag = this.auto; this.auto = autoIn; diff --git a/patches/net/minecraft/tileentity/TileEntityDispenser.java.patch b/patches/net/minecraft/tileentity/TileEntityDispenser.java.patch index 6a39a1ec..0741fe0c 100644 --- a/patches/net/minecraft/tileentity/TileEntityDispenser.java.patch +++ b/patches/net/minecraft/tileentity/TileEntityDispenser.java.patch @@ -11,7 +11,7 @@ import net.minecraft.util.datafix.DataFixer; import net.minecraft.util.datafix.FixTypes; import net.minecraft.util.datafix.walkers.ItemStackDataLists; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; public class TileEntityDispenser extends TileEntityLockableLoot diff --git a/patches/net/minecraft/tileentity/TileEntityEndGateway.java.patch b/patches/net/minecraft/tileentity/TileEntityEndGateway.java.patch index 63691614..763fa84e 100644 --- a/patches/net/minecraft/tileentity/TileEntityEndGateway.java.patch +++ b/patches/net/minecraft/tileentity/TileEntityEndGateway.java.patch @@ -1,26 +1,25 @@ --- ../src-base/minecraft/net/minecraft/tileentity/TileEntityEndGateway.java +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityEndGateway.java -@@ -3,8 +3,12 @@ +@@ -3,8 +3,11 @@ import java.util.List; import java.util.Random; import javax.annotation.Nullable; + +import com.destroystokyo.paper.MCUtil; -+import com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; -@@ -24,14 +28,19 @@ +@@ -24,14 +27,19 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.Bukkit; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.block.CraftEndGateway; -+import org.bukkit.craftbukkit.entity.CraftPlayer; ++import org.bukkit.craftbukkit.v1_12_R1.block.CraftEndGateway; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; +import org.bukkit.event.player.PlayerTeleportEvent; public class TileEntityEndGateway extends TileEntityEndPortal implements ITickable @@ -35,13 +34,13 @@ public NBTTagCompound writeToNBT(NBTTagCompound compound) { -@@ -171,7 +180,35 @@ +@@ -171,7 +179,35 @@ if (this.exitPortal != null) { BlockPos blockpos = this.exactTeleport ? this.exitPortal : this.findExitPosition(); - entityIn.setPositionAndUpdate((double)blockpos.getX() + 0.5D, (double)blockpos.getY() + 0.5D, (double)blockpos.getZ() + 0.5D); + if (entityIn instanceof EntityPlayerMP) { -+ org.bukkit.craftbukkit.entity.CraftPlayer player = (CraftPlayer) entityIn.getBukkitEntity(); ++ CraftPlayer player = (CraftPlayer) entityIn.getBukkitEntity(); + Location location = new Location(world.getWorld(), (double) blockpos.getX() + 0.5D, (double) blockpos.getY() + 0.5D, (double) blockpos.getZ() + 0.5D); + location.setPitch(player.getLocation().getPitch()); + location.setYaw(player.getLocation().getYaw()); @@ -57,12 +56,12 @@ + return; + } + // Paper start - EntityTeleportEndGatewayEvent - replicated from above -+ org.bukkit.craftbukkit.entity.CraftPlayer player = (CraftPlayer) entityIn.getBukkitEntity(); ++ CraftPlayer player = (CraftPlayer) entityIn.getBukkitEntity(); + Location location = new Location(world.getWorld(), (double) blockpos.getX() + 0.5D, (double) blockpos.getY() + 0.5D, (double) blockpos.getZ() + 0.5D); + location.setPitch(player.getLocation().getPitch()); + location.setYaw(player.getLocation().getYaw()); + -+ com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent event = new com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent(player, player.getLocation(), location, new org.bukkit.craftbukkit.block.CraftEndGateway(MCUtil.toLocation(world, this.getPos()).getBlock())); ++ com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent event = new com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent(player, player.getLocation(), location, new CraftEndGateway(MCUtil.toLocation(world, this.getPos()).getBlock())); + if(!event.callEvent()){ + return; + } diff --git a/patches/net/minecraft/tileentity/TileEntityFurnace.java.patch b/patches/net/minecraft/tileentity/TileEntityFurnace.java.patch index 56efff79..6f7b6a2b 100644 --- a/patches/net/minecraft/tileentity/TileEntityFurnace.java.patch +++ b/patches/net/minecraft/tileentity/TileEntityFurnace.java.patch @@ -12,8 +12,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.entity.HumanEntity; +import org.bukkit.event.inventory.FurnaceBurnEvent; +import org.bukkit.event.inventory.FurnaceSmeltEvent; diff --git a/patches/net/minecraft/tileentity/TileEntityHopper.java.patch b/patches/net/minecraft/tileentity/TileEntityHopper.java.patch index a6b8b38c..31e3dfd1 100644 --- a/patches/net/minecraft/tileentity/TileEntityHopper.java.patch +++ b/patches/net/minecraft/tileentity/TileEntityHopper.java.patch @@ -15,12 +15,13 @@ import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -@@ -27,6 +29,12 @@ +@@ -27,6 +29,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; -+import org.bukkit.craftbukkit.inventory.CraftItemStack; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryDoubleChest; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.entity.HumanEntity; +import org.bukkit.event.inventory.InventoryMoveItemEvent; +import org.bukkit.event.inventory.InventoryPickupItemEvent; @@ -28,7 +29,7 @@ public class TileEntityHopper extends TileEntityLockableLoot implements IHopper, ITickable { -@@ -34,6 +42,32 @@ +@@ -34,6 +43,32 @@ private int transferCooldown = -1; private long tickedGameTime; @@ -61,7 +62,7 @@ public static void registerFixesHopper(DataFixer fixer) { fixer.registerWalker(FixTypes.BLOCK_ENTITY, new ItemStackDataLists(TileEntityHopper.class, new String[] {"Items"})); -@@ -106,7 +140,7 @@ +@@ -106,7 +141,7 @@ public int getInventoryStackLimit() { @@ -70,7 +71,7 @@ } public void update() -@@ -144,7 +178,7 @@ +@@ -144,7 +179,7 @@ if (flag) { @@ -79,7 +80,7 @@ this.markDirty(); return true; } -@@ -213,11 +247,36 @@ +@@ -213,11 +248,36 @@ if (!this.getStackInSlot(i).isEmpty()) { ItemStack itemstack = this.getStackInSlot(i).copy(); @@ -91,7 +92,7 @@ + Inventory destinationInventory; + // Have to special case large chests as they work oddly + if (iinventory instanceof InventoryLargeChest) { -+ destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) iinventory); ++ destinationInventory = new CraftInventoryDoubleChest((InventoryLargeChest) iinventory); + } else { + destinationInventory = iinventory.getOwner().getInventory(); + } @@ -118,7 +119,7 @@ return true; } -@@ -358,14 +417,47 @@ +@@ -358,14 +418,47 @@ if (!itemstack.isEmpty() && canExtractItemFromSlot(inventoryIn, itemstack, index, direction)) { ItemStack itemstack1 = itemstack.copy(); @@ -130,7 +131,7 @@ + Inventory sourceInventory; + // Have to special case large chests as they work oddly + if (inventoryIn instanceof InventoryLargeChest) { -+ sourceInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) inventoryIn); ++ sourceInventory = new CraftInventoryDoubleChest((InventoryLargeChest) inventoryIn); + } else { + sourceInventory = inventoryIn.getOwner().getInventory(); + } @@ -169,7 +170,7 @@ inventoryIn.setInventorySlotContents(index, itemstack1); } -@@ -382,6 +474,11 @@ +@@ -382,6 +475,11 @@ } else { @@ -181,7 +182,7 @@ ItemStack itemstack = entity.getItem().copy(); ItemStack itemstack1 = putStackInInventoryAllSlots(source, destination, itemstack, (EnumFacing)null); -@@ -491,7 +588,7 @@ +@@ -491,7 +589,7 @@ } } @@ -190,7 +191,7 @@ } } -@@ -525,6 +622,7 @@ +@@ -525,6 +623,7 @@ int j = MathHelper.floor(y); int k = MathHelper.floor(z); BlockPos blockpos = new BlockPos(i, j, k); diff --git a/patches/net/minecraft/tileentity/TileEntityNote.java.patch b/patches/net/minecraft/tileentity/TileEntityNote.java.patch index 1c89e7ee..002d5960 100644 --- a/patches/net/minecraft/tileentity/TileEntityNote.java.patch +++ b/patches/net/minecraft/tileentity/TileEntityNote.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/tileentity/TileEntityNote.java +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityNote.java -@@ -44,7 +44,7 @@ +@@ -8,6 +8,7 @@ + import net.minecraft.util.math.BlockPos; + import net.minecraft.util.math.MathHelper; + import net.minecraft.world.World; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; + + public class TileEntityNote extends TileEntity + { +@@ -44,7 +45,7 @@ { IBlockState iblockstate = worldIn.getBlockState(posIn.down()); Material material = iblockstate.getMaterial(); @@ -9,13 +17,13 @@ if (material == Material.ROCK) { -@@ -93,7 +93,11 @@ +@@ -93,7 +94,11 @@ i = 9; } - worldIn.addBlockEvent(posIn, Blocks.NOTEBLOCK, i, this.note); + // worldIn.addBlockEvent(posIn, Blocks.NOTEBLOCK, i, this.note); -+ org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(this.world, posIn.getX(), posIn.getY(), posIn.getZ(), i, this.note); ++ org.bukkit.event.block.NotePlayEvent event = CraftEventFactory.callNotePlayEvent(this.world, posIn.getX(), posIn.getY(), posIn.getZ(), i, this.note); + if (!event.isCancelled()) { + worldIn.addBlockEvent(posIn, Blocks.NOTEBLOCK, event.getInstrument().getType(), event.getNote().getId()); + } diff --git a/patches/net/minecraft/tileentity/TileEntityShulkerBox.java.patch b/patches/net/minecraft/tileentity/TileEntityShulkerBox.java.patch index 2b089444..9b4f835f 100644 --- a/patches/net/minecraft/tileentity/TileEntityShulkerBox.java.patch +++ b/patches/net/minecraft/tileentity/TileEntityShulkerBox.java.patch @@ -4,7 +4,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.entity.CraftHumanEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; public class TileEntityShulkerBox extends TileEntityLockableLoot implements ITickable, ISidedInventory diff --git a/patches/net/minecraft/tileentity/TileEntitySign.java.patch b/patches/net/minecraft/tileentity/TileEntitySign.java.patch index 623f9020..f4b45300 100644 --- a/patches/net/minecraft/tileentity/TileEntitySign.java.patch +++ b/patches/net/minecraft/tileentity/TileEntitySign.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/tileentity/TileEntitySign.java +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntitySign.java -@@ -24,9 +24,11 @@ +@@ -19,14 +19,19 @@ + import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; + import net.minecraftforge.fml.relauncher.SideOnly; ++import org.bukkit.craftbukkit.v1_12_R1.command.CraftBlockCommandSender; ++import org.bukkit.craftbukkit.v1_12_R1.command.ProxiedNativeCommandSender; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; + + public class TileEntitySign extends TileEntity { public final ITextComponent[] signText = new ITextComponent[] {new TextComponentString(""), new TextComponentString(""), new TextComponentString(""), new TextComponentString("")}; public int lineBeingEdited = -1; @@ -13,7 +21,7 @@ public NBTTagCompound writeToNBT(NBTTagCompound compound) { -@@ -38,6 +40,10 @@ +@@ -38,6 +43,10 @@ compound.setString("Text" + (i + 1), s); } @@ -24,7 +32,7 @@ this.stats.writeStatsToNBT(compound); return compound; } -@@ -61,6 +67,10 @@ +@@ -61,6 +70,10 @@ { return permLevel <= 2; //Forge: Fixes MC-75630 - Exploit with signs and command blocks } @@ -35,7 +43,7 @@ public BlockPos getPosition() { return TileEntitySign.this.pos; -@@ -79,19 +89,38 @@ +@@ -79,19 +92,38 @@ } }; @@ -60,7 +68,7 @@ + ITextComponent ichatbasecomponent = ITextComponent.Serializer.jsonToComponent(s); + + if (oldSign) { -+ signText[i] = org.bukkit.craftbukkit.util.CraftChatMessage.fromString(s)[0]; ++ signText[i] = CraftChatMessage.fromString(s)[0]; + continue; + } + // CraftBukkit end @@ -80,7 +88,7 @@ } this.stats.readStatsFromNBT(compound); -@@ -131,7 +160,10 @@ +@@ -131,7 +163,10 @@ public void setPlayer(EntityPlayer playerIn) { @@ -92,7 +100,7 @@ } public EntityPlayer getPlayer() -@@ -158,6 +190,11 @@ +@@ -158,6 +193,11 @@ { return permLevel <= 2; } @@ -104,15 +112,15 @@ public BlockPos getPosition() { return TileEntitySign.this.pos; -@@ -201,7 +238,12 @@ +@@ -201,7 +241,12 @@ if (clickevent.getAction() == ClickEvent.Action.RUN_COMMAND) { - playerIn.getServer().getCommandManager().executeCommand(icommandsender, clickevent.getValue()); + // playerIn.getServer().getCommandManager().executeCommand(icommandsender, clickevent.getValue()); -+ CommandBlockBaseLogic.executeSafely(icommandsender, new org.bukkit.craftbukkit.command.ProxiedNativeCommandSender( ++ CommandBlockBaseLogic.executeSafely(icommandsender, new ProxiedNativeCommandSender( + icommandsender, -+ new org.bukkit.craftbukkit.command.CraftBlockCommandSender(icommandsender), ++ new CraftBlockCommandSender(icommandsender), + playerIn.getBukkitEntity() + ), clickevent.getValue()); } diff --git a/patches/net/minecraft/util/FoodStats.java.patch b/patches/net/minecraft/util/FoodStats.java.patch index 75a50938..016f6d7a 100644 --- a/patches/net/minecraft/util/FoodStats.java.patch +++ b/patches/net/minecraft/util/FoodStats.java.patch @@ -12,7 +12,7 @@ import net.minecraft.world.EnumDifficulty; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.entity.FoodLevelChangeEvent; public class FoodStats @@ -70,7 +70,7 @@ + { + this.foodLevel = Math.max(this.foodLevel - 1, 0); + } else { -+ org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, Math.max(this.foodLevel - 1, 0)); ++ org.bukkit.event.entity.FoodLevelChangeEvent event = CraftEventFactory.callFoodLevelChangeEvent(player, Math.max(this.foodLevel - 1, 0)); + + if (!event.isCancelled()) { + this.foodLevel = event.getFoodLevel(); diff --git a/patches/net/minecraft/village/MerchantRecipe.java.patch b/patches/net/minecraft/village/MerchantRecipe.java.patch index 8ad9c640..2fe03adb 100644 --- a/patches/net/minecraft/village/MerchantRecipe.java.patch +++ b/patches/net/minecraft/village/MerchantRecipe.java.patch @@ -4,7 +4,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -+import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMerchantRecipe; public class MerchantRecipe { diff --git a/patches/net/minecraft/world/Explosion.java.patch b/patches/net/minecraft/world/Explosion.java.patch index c2cba4a5..3076573b 100644 --- a/patches/net/minecraft/world/Explosion.java.patch +++ b/patches/net/minecraft/world/Explosion.java.patch @@ -16,7 +16,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.Location; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.event.block.BlockExplodeEvent; +import org.bukkit.event.entity.EntityExplodeEvent; @@ -159,7 +159,7 @@ - this.world.setBlockState(blockpos1, Blocks.FIRE.getDefaultState()); + // this.world.setBlockState(blockpos1, Blocks.FIRE.getDefaultState()); + // CraftBukkit start - Ignition by explosion -+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(this.world, blockpos1.getX(), blockpos1.getY(), blockpos1.getZ(), this).isCancelled()) { ++ if (!CraftEventFactory.callBlockIgniteEvent(this.world, blockpos1.getX(), blockpos1.getY(), blockpos1.getZ(), this).isCancelled()) { + this.world.setBlockState(blockpos1, Blocks.FIRE.getDefaultState()); + } + // CraftBukkit end diff --git a/patches/net/minecraft/world/World.java.patch b/patches/net/minecraft/world/World.java.patch index e27c121a..0b69913d 100644 --- a/patches/net/minecraft/world/World.java.patch +++ b/patches/net/minecraft/world/World.java.patch @@ -23,7 +23,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.crash.CrashReport; -@@ -25,45 +16,63 @@ +@@ -25,45 +16,62 @@ import net.minecraft.crash.ICrashReportDetail; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -82,16 +82,15 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.bukkit.Bukkit; -+import org.bukkit.craftbukkit.CraftServer; -+import org.bukkit.craftbukkit.CraftWorld; -+import org.bukkit.craftbukkit.event.CraftEventFactory; -+import org.bukkit.craftbukkit.util.CraftMagicNumbers; ++import org.bukkit.craftbukkit.v1_12_R1.CraftServer; ++import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.entity.NPC; +import org.bukkit.event.block.BlockCanBuildEvent; +import org.bukkit.event.block.BlockPhysicsEvent; +import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.generator.ChunkGenerator; -+import org.magmafoundation.magma.api.ServerAPI; +import javax.annotation.Nullable; +import java.util.*; @@ -100,7 +99,16 @@ public abstract class World implements IBlockAccess, net.minecraftforge.common.capabilities.ICapabilityProvider { /** -@@ -94,36 +103,151 @@ +@@ -77,7 +85,7 @@ + protected boolean scheduledUpdatesAreImmediate; + public final List loadedEntityList = Lists.newArrayList(); + protected final List unloadedEntityList = Lists.newArrayList(); +- public final List loadedTileEntityList = Lists.newArrayList(); ++ public List loadedTileEntityList = Lists.newArrayList(); + public final List tickableTileEntities = Lists.newArrayList(); + private final List addedTileEntityList = Lists.newArrayList(); + private final List tileEntitiesToBeRemoved = Lists.newArrayList(); +@@ -94,36 +102,151 @@ public float thunderingStrength; private int lastLightningBolt; public final Random rand = new Random(); @@ -259,7 +267,7 @@ this.eventListeners = Lists.newArrayList(this.pathListener); this.calendar = Calendar.getInstance(); this.worldScoreboard = new Scoreboard(); -@@ -136,7 +260,10 @@ +@@ -136,7 +259,10 @@ this.provider = providerIn; this.isRemote = client; this.worldBorder = providerIn.createWorldBorder(); @@ -271,7 +279,7 @@ } public World init() -@@ -298,7 +425,7 @@ +@@ -298,7 +424,7 @@ } } @@ -280,7 +288,7 @@ public Chunk getChunkFromBlockCoords(BlockPos pos) { -@@ -317,6 +444,26 @@ +@@ -317,6 +443,26 @@ public boolean setBlockState(BlockPos pos, IBlockState newState, int flags) { @@ -307,7 +315,7 @@ if (this.isOutsideBuildHeight(pos)) { return false; -@@ -437,6 +584,11 @@ +@@ -437,6 +583,11 @@ { if (this.worldInfo.getTerrainType() != WorldType.DEBUG_ALL_BLOCK_STATES) { @@ -319,7 +327,7 @@ this.notifyNeighborsOfStateChange(pos, blockType, p_175722_3_); } } -@@ -548,6 +700,17 @@ +@@ -548,6 +699,17 @@ try { @@ -337,7 +345,7 @@ iblockstate.neighborChanged(this, pos, blockIn, fromPos); } catch (Throwable throwable) -@@ -586,6 +749,11 @@ +@@ -586,6 +748,11 @@ { iblockstate.getBlock().observedNeighborChange(iblockstate, this, pos, p_190529_2_, p_190529_3_); } @@ -349,7 +357,7 @@ catch (Throwable throwable) { CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Exception while updating neighbours"); -@@ -669,6 +837,41 @@ +@@ -669,6 +836,41 @@ } } @@ -391,7 +399,7 @@ public int getLightFromNeighbors(BlockPos pos) { return this.getLight(pos, true); -@@ -902,6 +1105,17 @@ +@@ -902,6 +1104,17 @@ public IBlockState getBlockState(BlockPos pos) { @@ -409,7 +417,7 @@ if (this.isOutsideBuildHeight(pos)) { return Blocks.AIR.getDefaultState(); -@@ -1178,14 +1392,83 @@ +@@ -1178,14 +1391,83 @@ public boolean spawnEntity(Entity entityIn) { @@ -498,7 +506,7 @@ { flag = true; } -@@ -1196,18 +1479,19 @@ +@@ -1196,18 +1478,19 @@ } else { @@ -524,7 +532,7 @@ return true; } } -@@ -1219,6 +1503,8 @@ +@@ -1219,6 +1502,8 @@ ((IWorldEventListener)this.eventListeners.get(i)).onEntityAdded(entityIn); } entityIn.onAddedToWorld(); @@ -533,7 +541,7 @@ } public void onEntityRemoved(Entity entityIn) -@@ -1228,6 +1514,8 @@ +@@ -1228,6 +1513,8 @@ ((IWorldEventListener)this.eventListeners.get(i)).onEntityRemoved(entityIn); } entityIn.onRemovedFromWorld(); @@ -542,7 +550,7 @@ } public void removeEntity(Entity entityIn) -@@ -1271,7 +1559,16 @@ +@@ -1271,7 +1558,16 @@ this.getChunkFromChunkCoords(i, j).removeEntity(entityIn); } @@ -560,7 +568,7 @@ this.onEntityRemoved(entityIn); } -@@ -1674,7 +1971,11 @@ +@@ -1674,7 +1970,11 @@ for (int i = 0; i < this.weatherEffects.size(); ++i) { Entity entity = this.weatherEffects.get(i); @@ -573,7 +581,7 @@ try { if(entity.updateBlocked) continue; -@@ -1701,7 +2002,7 @@ +@@ -1701,7 +2001,7 @@ removeEntity(entity); } else @@ -582,7 +590,7 @@ } if (entity.isDead) -@@ -1770,7 +2071,7 @@ +@@ -1770,7 +2070,7 @@ removeEntity(entity2); } else @@ -591,7 +599,7 @@ } } -@@ -1802,13 +2103,15 @@ +@@ -1802,13 +2102,15 @@ { for (Object tile : tileEntitiesToBeRemoved) { @@ -608,7 +616,7 @@ this.loadedTileEntityList.removeAll(remove); this.tileEntitiesToBeRemoved.clear(); } -@@ -1848,7 +2151,7 @@ +@@ -1848,7 +2150,7 @@ this.removeTileEntity(tileentity.getPos()); } else @@ -617,7 +625,7 @@ } } } -@@ -1879,10 +2182,12 @@ +@@ -1879,10 +2181,12 @@ if (!tileentity1.isInvalid()) { @@ -630,7 +638,7 @@ if (this.isBlockLoaded(tileentity1.getPos())) { -@@ -1890,6 +2195,12 @@ +@@ -1890,6 +2194,12 @@ IBlockState iblockstate = chunk.getBlockState(tileentity1.getPos()); chunk.addTileEntity(tileentity1.getPos(), tileentity1); this.notifyBlockUpdate(tileentity1.getPos(), iblockstate, iblockstate, 3); @@ -643,7 +651,7 @@ } } } -@@ -1973,6 +2284,14 @@ +@@ -1973,6 +2283,14 @@ } } @@ -658,7 +666,7 @@ entityIn.lastTickPosX = entityIn.posX; entityIn.lastTickPosY = entityIn.posY; entityIn.lastTickPosZ = entityIn.posZ; -@@ -1991,6 +2310,7 @@ +@@ -1991,6 +2309,7 @@ { if(!entityIn.updateBlocked) entityIn.onUpdate(); @@ -666,7 +674,7 @@ } } -@@ -2451,6 +2771,7 @@ +@@ -2451,6 +2770,7 @@ } toInvalidate.forEach(TileEntity::invalidate); @@ -674,7 +682,7 @@ this.addedTileEntityList.add(tileEntityIn); } else -@@ -2659,6 +2980,13 @@ +@@ -2659,6 +2979,13 @@ } this.rainingStrength = MathHelper.clamp(this.rainingStrength, 0.0F, 1.0F); @@ -688,7 +696,7 @@ } } } -@@ -2846,10 +3174,11 @@ +@@ -2846,10 +3173,11 @@ } } @@ -704,7 +712,7 @@ return false; } else -@@ -3139,7 +3468,16 @@ +@@ -3139,7 +3467,16 @@ for (Entity entity4 : this.loadedEntityList) { @@ -722,7 +730,7 @@ { ++j2; } -@@ -3154,6 +3492,9 @@ +@@ -3154,6 +3491,9 @@ { if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.EntityJoinWorldEvent(entity4, this))) { @@ -732,7 +740,7 @@ loadedEntityList.add(entity4); this.onEntityAdded(entity4); } -@@ -3170,19 +3511,26 @@ +@@ -3170,19 +3510,26 @@ IBlockState iblockstate1 = this.getBlockState(pos); AxisAlignedBB axisalignedbb = skipCollisionCheck ? null : blockIn.getDefaultState().getCollisionBoundingBox(this, pos); @@ -762,7 +770,7 @@ } public int getSeaLevel() -@@ -3347,6 +3695,12 @@ +@@ -3347,6 +3694,12 @@ { EntityPlayer entityplayer1 = this.playerEntities.get(j2); @@ -775,7 +783,7 @@ if (p_190525_9_.apply(entityplayer1)) { double d1 = entityplayer1.getDistanceSq(x, y, z); -@@ -3594,6 +3948,16 @@ +@@ -3594,6 +3947,16 @@ { } @@ -792,7 +800,7 @@ public float getThunderStrength(float delta) { return (this.prevThunderingStrength + (this.thunderingStrength - this.prevThunderingStrength) * delta) * this.getRainStrength(delta); -@@ -3882,7 +4246,7 @@ +@@ -3882,7 +4245,7 @@ int j2 = x * 16 + 8 - blockpos1.getX(); int k2 = z * 16 + 8 - blockpos1.getZ(); int l2 = 128; diff --git a/patches/net/minecraft/world/WorldServer.java.patch b/patches/net/minecraft/world/WorldServer.java.patch index 8ab235c7..791c7f5d 100644 --- a/patches/net/minecraft/world/WorldServer.java.patch +++ b/patches/net/minecraft/world/WorldServer.java.patch @@ -38,7 +38,7 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.IProgressUpdate; import net.minecraft.util.IThreadListener; -@@ -77,16 +73,20 @@ +@@ -77,16 +73,23 @@ import net.minecraft.world.storage.WorldInfo; import net.minecraft.world.storage.WorldSavedDataCallableSave; import net.minecraft.world.storage.loot.LootTableManager; @@ -48,8 +48,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; ++import org.bukkit.craftbukkit.v1_12_R1.generator.*; +import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.event.weather.LightningStrikeEvent; ++import org.bukkit.craftbukkit.v1_12_R1.CraftTravelAgent; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public class WorldServer extends World implements IThreadListener { @@ -60,7 +63,7 @@ private final PlayerChunkMap playerChunkMap; private final Set pendingTickListEntriesHashSet = Sets.newHashSet(); private final TreeSet pendingTickListEntriesTreeSet = new TreeSet(); -@@ -97,7 +97,7 @@ +@@ -97,7 +100,7 @@ private final Teleporter worldTeleporter; private final WorldEntitySpawner entitySpawner = new WorldEntitySpawner(); protected final VillageSiege villageSiege = new VillageSiege(this); @@ -69,7 +72,7 @@ private int blockEventCacheIndex; private final List pendingTickListEntriesThisTick = Lists.newArrayList(); -@@ -105,22 +105,62 @@ +@@ -105,22 +108,62 @@ protected Set doneChunks = new java.util.HashSet(); public List customTeleporters = new ArrayList(); @@ -88,7 +91,7 @@ + this.provider.setWorld(this); + this.provider.setDimension(providerDim); + this.chunkProvider = this.createChunkProvider(); -+ this.worldTeleporter = new org.bukkit.craftbukkit.CraftTravelAgent(this); //// CraftBukkit ++ this.worldTeleporter = new CraftTravelAgent(this); //// CraftBukkit + this.calculateInitialSkylight(); + this.calculateInitialWeather(); + this.getWorldBorder().setSize(server.getMaxWorldSize()); @@ -133,7 +136,7 @@ net.minecraftforge.common.DimensionManager.setWorld(dimensionId, this, mcServer); } -@@ -140,7 +180,7 @@ +@@ -140,7 +183,7 @@ this.villageCollection = villagecollection; this.villageCollection.setWorldsForAll(this); } @@ -142,7 +145,7 @@ this.worldScoreboard = new ServerScoreboard(this.mcServer); ScoreboardSaveData scoreboardsavedata = (ScoreboardSaveData)this.mapStorage.getOrLoadData(ScoreboardSaveData.class, "scoreboard"); -@@ -152,8 +192,18 @@ +@@ -152,8 +195,18 @@ scoreboardsavedata.setScoreboard(this.worldScoreboard); ((ServerScoreboard)this.worldScoreboard).addDirtyRunnable(new WorldSavedDataCallableSave(scoreboardsavedata)); @@ -162,7 +165,7 @@ this.functionManager = new FunctionManager(new File(new File(this.saveHandler.getWorldDirectory(), "data"), "functions"), this.mcServer); this.getWorldBorder().setCenter(this.worldInfo.getBorderCenterX(), this.worldInfo.getBorderCenterZ()); this.getWorldBorder().setDamageAmount(this.worldInfo.getBorderDamagePerBlock()); -@@ -171,9 +221,145 @@ +@@ -171,9 +224,145 @@ } this.initCapabilities(); @@ -308,7 +311,7 @@ public void tick() { super.tick(); -@@ -198,9 +384,12 @@ +@@ -198,9 +387,12 @@ this.profiler.startSection("mobSpawner"); @@ -323,7 +326,7 @@ } this.profiler.endStartSection("chunkSource"); -@@ -212,7 +401,7 @@ +@@ -212,7 +404,7 @@ this.setSkylightSubtracted(j); } @@ -332,7 +335,7 @@ if (this.getGameRules().getBoolean("doDaylightCycle")) { -@@ -236,6 +425,7 @@ +@@ -236,6 +428,7 @@ } this.profiler.endSection(); this.sendQueuedBlockEvents(); @@ -340,7 +343,7 @@ } @Nullable -@@ -268,7 +458,7 @@ +@@ -268,7 +461,7 @@ { ++i; } @@ -349,7 +352,7 @@ { ++j; } -@@ -298,19 +488,26 @@ +@@ -298,19 +491,26 @@ this.provider.resetRainAndThunder(); } @@ -378,7 +381,7 @@ } else { -@@ -346,7 +543,7 @@ +@@ -346,7 +546,7 @@ this.worldInfo.setSpawnZ(j); } @@ -387,7 +390,7 @@ { return this.getChunkProvider().chunkExists(x, z); } -@@ -355,7 +552,7 @@ +@@ -355,7 +555,7 @@ { this.profiler.startSection("playerCheckLight"); @@ -396,7 +399,7 @@ { int i = this.rand.nextInt(this.playerEntities.size()); EntityPlayer entityplayer = this.playerEntities.get(i); -@@ -392,12 +589,14 @@ +@@ -392,12 +592,14 @@ { this.profiler.startSection("getChunk"); Chunk chunk = iterator.next(); @@ -411,7 +414,7 @@ this.profiler.endStartSection("thunder"); if (this.provider.canDoLightning(chunk) && flag && flag1 && this.rand.nextInt(100000) == 0) -@@ -416,7 +615,7 @@ +@@ -416,7 +618,7 @@ entityskeletonhorse.setTrap(true); entityskeletonhorse.setGrowingAge(0); entityskeletonhorse.setPosition((double)blockpos.getX(), (double)blockpos.getY(), (double)blockpos.getZ()); @@ -420,24 +423,24 @@ this.addWeatherEffect(new EntityLightningBolt(this, (double)blockpos.getX(), (double)blockpos.getY(), (double)blockpos.getZ(), true)); } else -@@ -438,12 +637,14 @@ +@@ -438,12 +640,14 @@ if (this.isAreaLoaded(blockpos2, 1)) // Forge: check area to avoid loading neighbors in unloaded chunks if (this.canBlockFreezeNoWater(blockpos2)) { - this.setBlockState(blockpos2, Blocks.ICE.getDefaultState()); + // this.setBlockState(blockpos2, Blocks.ICE.getDefaultState()); -+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockpos2, Blocks.ICE.getDefaultState(), null); ++ CraftEventFactory.handleBlockFormEvent(this, blockpos2, Blocks.ICE.getDefaultState(), null); } if (flag && this.canSnowAt(blockpos1, true)) { - this.setBlockState(blockpos1, Blocks.SNOW_LAYER.getDefaultState()); + // this.setBlockState(blockpos1, Blocks.SNOW_LAYER.getDefaultState()); -+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockpos1, Blocks.SNOW_LAYER.getDefaultState(), null); ++ CraftEventFactory.handleBlockFormEvent(this, blockpos1, Blocks.SNOW_LAYER.getDefaultState(), null); } if (flag && this.getBiome(blockpos2).canRain()) -@@ -481,8 +682,15 @@ +@@ -481,8 +685,15 @@ } } } @@ -454,7 +457,7 @@ this.profiler.endSection(); } } -@@ -611,6 +819,7 @@ +@@ -611,6 +822,7 @@ this.provider.onWorldUpdateEntities(); super.updateEntities(); @@ -462,7 +465,7 @@ } protected void tickPlayers() -@@ -686,15 +895,20 @@ +@@ -686,15 +898,20 @@ { int i = this.pendingTickListEntriesTreeSet.size(); @@ -489,7 +492,7 @@ } this.profiler.startSection("cleaning"); -@@ -756,7 +970,6 @@ +@@ -756,7 +973,6 @@ return !this.pendingTickListEntriesTreeSet.isEmpty(); } } @@ -497,7 +500,7 @@ @Nullable public List getPendingBlockUpdates(Chunk chunkIn, boolean remove) -@@ -796,7 +1009,8 @@ +@@ -796,7 +1012,8 @@ { if (remove) { @@ -507,7 +510,7 @@ { this.pendingTickListEntriesHashSet.remove(nextticklistentry); } -@@ -806,7 +1020,7 @@ +@@ -806,7 +1023,7 @@ if (list == null) { @@ -516,7 +519,7 @@ } list.add(nextticklistentry); -@@ -817,21 +1031,6 @@ +@@ -817,21 +1034,6 @@ return list; } @@ -538,7 +541,7 @@ private boolean canSpawnNPCs() { return this.mcServer.getCanSpawnNPCs(); -@@ -845,9 +1044,62 @@ +@@ -845,9 +1047,62 @@ protected IChunkProvider createChunkProvider() { IChunkLoader ichunkloader = this.saveHandler.getChunkLoader(this.provider); @@ -546,16 +549,16 @@ + // Magma - if provider is vanilla, proceed to create a bukkit compatible chunk generator + if (this.provider.getClass().toString().length() <= 3 || this.provider.getClass().toString().contains("net.minecraft")) { + // CraftBukkit start -+ org.bukkit.craftbukkit.generator.InternalChunkGenerator gen; ++ InternalChunkGenerator gen; + + if (this.generator != null) { -+ gen = new org.bukkit.craftbukkit.generator.CustomChunkGenerator(this, this.getSeed(), this.generator); ++ gen = new CustomChunkGenerator(this, this.getSeed(), this.generator); + } else if (this.provider instanceof WorldProviderHell) { -+ gen = new org.bukkit.craftbukkit.generator.NetherChunkGenerator(this, this.getSeed()); ++ gen = new NetherChunkGenerator(this, this.getSeed()); + } else if (this.provider instanceof WorldProviderEnd) { -+ gen = new org.bukkit.craftbukkit.generator.SkyLandsChunkGenerator(this, this.getSeed()); ++ gen = new SkyLandsChunkGenerator(this, this.getSeed()); + } else { -+ gen = new org.bukkit.craftbukkit.generator.NormalChunkGenerator(this, this.getSeed()); ++ gen = new NormalChunkGenerator(this, this.getSeed()); + } + + this.chunkProvider = new ChunkProviderServer(this, ichunkloader, gen); @@ -602,7 +605,7 @@ public boolean isBlockModifiable(EntityPlayer player, BlockPos pos) { return super.isBlockModifiable(player, pos); -@@ -929,6 +1181,23 @@ +@@ -929,6 +1184,23 @@ int j = this.provider.getAverageGroundLevel(); int k = 8; @@ -626,7 +629,7 @@ if (blockpos != null) { i = blockpos.getX(); -@@ -941,7 +1210,7 @@ +@@ -941,7 +1213,7 @@ int l = 0; @@ -635,7 +638,7 @@ { i += random.nextInt(64) - random.nextInt(64); k += random.nextInt(64) - random.nextInt(64); -@@ -992,6 +1261,7 @@ +@@ -992,6 +1264,7 @@ if (chunkproviderserver.canSave()) { @@ -643,7 +646,7 @@ if (progressCallback != null) { progressCallback.displaySavingString("Saving level"); -@@ -1006,14 +1276,6 @@ +@@ -1006,14 +1279,6 @@ chunkproviderserver.saveChunks(all); net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Save(this)); @@ -658,7 +661,7 @@ } } -@@ -1039,6 +1301,12 @@ +@@ -1039,6 +1304,12 @@ } } @@ -671,7 +674,7 @@ this.worldInfo.setBorderSize(this.getWorldBorder().getDiameter()); this.worldInfo.getBorderCenterX(this.getWorldBorder().getCenterX()); this.worldInfo.getBorderCenterZ(this.getWorldBorder().getCenterZ()); -@@ -1058,6 +1326,12 @@ +@@ -1058,6 +1329,12 @@ return this.canAddEntity(entityIn) ? super.spawnEntity(entityIn) : false; } @@ -684,7 +687,7 @@ public void loadEntities(Collection entityCollection) { for (Entity entity : Lists.newArrayList(entityCollection)) -@@ -1074,7 +1348,6 @@ +@@ -1074,7 +1351,6 @@ { if (entityIn.isDead) { @@ -692,7 +695,7 @@ return false; } else -@@ -1085,7 +1358,7 @@ +@@ -1085,7 +1361,7 @@ { Entity entity = this.entitiesByUuid.get(uuid); @@ -701,7 +704,7 @@ { this.unloadedEntityList.remove(entity); } -@@ -1093,7 +1366,6 @@ +@@ -1093,7 +1369,6 @@ { if (!(entityIn instanceof EntityPlayer)) { @@ -709,7 +712,7 @@ return false; } -@@ -1141,9 +1413,15 @@ +@@ -1141,9 +1416,15 @@ public boolean addWeatherEffect(Entity entityIn) { @@ -726,7 +729,7 @@ return true; } else -@@ -1164,11 +1442,12 @@ +@@ -1164,11 +1445,12 @@ public Explosion newExplosion(@Nullable Entity entityIn, double x, double y, double z, float strength, boolean isFlaming, boolean isSmoking) { @@ -743,7 +746,7 @@ if (!isSmoking) { explosion.clearAffectedBlockPositions(); -@@ -1211,7 +1490,8 @@ +@@ -1211,7 +1493,8 @@ { if (this.fireBlockEvent(blockeventdata)) { @@ -753,7 +756,7 @@ } } -@@ -1298,11 +1578,19 @@ +@@ -1298,11 +1581,19 @@ public void spawnParticle(EnumParticleTypes particleType, boolean longDistance, double xCoord, double yCoord, double zCoord, int numberOfParticles, double xOffset, double yOffset, double zOffset, double particleSpeed, int... particleArguments) { @@ -773,7 +776,7 @@ this.sendPacketWithinDistance(entityplayermp, longDistance, xCoord, yCoord, zCoord, spacketparticles); } } -@@ -1367,4 +1655,5 @@ +@@ -1367,4 +1658,5 @@ { } } diff --git a/patches/net/minecraft/world/biome/Biome.java.patch b/patches/net/minecraft/world/biome/Biome.java.patch index bd2a8005..8a214de7 100644 --- a/patches/net/minecraft/world/biome/Biome.java.patch +++ b/patches/net/minecraft/world/biome/Biome.java.patch @@ -1,10 +1,19 @@ --- ../src-base/minecraft/net/minecraft/world/biome/Biome.java +++ ../src-work/minecraft/net/minecraft/world/biome/Biome.java +@@ -1,7 +1,7 @@ + package net.minecraft.world.biome; + + import com.google.common.collect.Lists; +-import java.util.Collections; ++ + import java.util.List; + import java.util.Random; + import javax.annotation.Nullable; @@ -49,6 +49,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; public abstract class Biome extends net.minecraftforge.registries.IForgeRegistryEntry.Impl { diff --git a/patches/net/minecraft/world/chunk/Chunk.java.patch b/patches/net/minecraft/world/chunk/Chunk.java.patch index a478dbae..7130d6b1 100644 --- a/patches/net/minecraft/world/chunk/Chunk.java.patch +++ b/patches/net/minecraft/world/chunk/Chunk.java.patch @@ -25,15 +25,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ClassInheritanceMultiMap; import net.minecraft.util.EnumFacing; -@@ -40,6 +45,7 @@ +@@ -40,6 +45,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.Server; ++import org.bukkit.craftbukkit.v1_12_R1.CraftChunk; ++import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; public class Chunk implements net.minecraftforge.common.capabilities.ICapabilityProvider { -@@ -50,13 +56,13 @@ +@@ -50,13 +58,13 @@ private final int[] precipitationHeightMap; private final boolean[] updateSkylightColumns; private boolean loaded; @@ -51,7 +53,7 @@ private boolean isTerrainPopulated; private boolean isLightPopulated; private boolean ticked; -@@ -68,7 +74,36 @@ +@@ -68,7 +76,36 @@ private int queuedLightChecks; private final ConcurrentLinkedQueue tileEntityPosQueue; public boolean unloadQueued; @@ -88,11 +90,11 @@ public Chunk(World worldIn, int x, int z) { this.storageArrays = new ExtendedBlockStorage[16]; -@@ -92,8 +127,13 @@ +@@ -92,8 +129,13 @@ Arrays.fill(this.precipitationHeightMap, -999); Arrays.fill(this.blockBiomeArray, (byte) - 1); capabilities = net.minecraftforge.event.ForgeEventFactory.gatherCapabilities(this); -+ this.bukkitChunk = new org.bukkit.craftbukkit.CraftChunk(this); ++ this.bukkitChunk = new CraftChunk(this); + this.chunkKey = ChunkPos.asLong(this.x, this.z); } @@ -102,7 +104,7 @@ public Chunk(World worldIn, ChunkPrimer primer, int x, int z) { this(worldIn, x, z); -@@ -271,6 +311,7 @@ +@@ -271,6 +313,7 @@ this.isGapLightingUpdated = true; } @@ -110,7 +112,7 @@ private void recheckGaps(boolean onlyOne) { this.world.profiler.startSection("recheckGaps"); -@@ -565,12 +606,12 @@ +@@ -565,12 +608,12 @@ { if (block1 != block) //Only fire block breaks when the block changes. block1.breakBlock(this.world, pos, iblockstate); @@ -125,7 +127,7 @@ if (te != null && te.shouldRefresh(this.world, pos, iblockstate, state)) this.world.removeTileEntity(pos); } -@@ -608,6 +649,7 @@ +@@ -608,6 +651,7 @@ } } @@ -133,7 +135,7 @@ // If capturing blocks, only run block physics for TE's. Non-TE's are handled in ForgeHooks.onPlaceItemIntoWorld if (!this.world.isRemote && block1 != block && (!this.world.captureBlockSnapshots || block.hasTileEntity(state))) { -@@ -616,7 +658,7 @@ +@@ -616,7 +660,7 @@ if (block.hasTileEntity(state)) { @@ -142,7 +144,7 @@ if (tileentity1 == null) { -@@ -743,6 +785,20 @@ +@@ -743,6 +787,20 @@ entityIn.chunkCoordZ = this.z; this.entityLists[k].add(entityIn); this.markDirty(); // Forge - ensure chunks are marked to save after an entity add @@ -163,7 +165,7 @@ } public void removeEntity(Entity entityIn) -@@ -764,6 +820,22 @@ +@@ -764,6 +822,22 @@ this.entityLists[index].remove(entityIn); this.markDirty(); // Forge - ensure chunks are marked to save after entity removals @@ -186,7 +188,7 @@ } public boolean canSeeSky(BlockPos pos) -@@ -783,9 +855,12 @@ +@@ -783,9 +857,12 @@ } @Nullable @@ -201,7 +203,7 @@ if (tileentity != null && tileentity.isInvalid()) { -@@ -795,12 +870,12 @@ +@@ -795,12 +872,12 @@ if (tileentity == null) { @@ -216,19 +218,19 @@ { this.tileEntityPosQueue.add(pos.toImmutable()); } -@@ -834,6 +909,11 @@ +@@ -834,6 +911,11 @@ tileEntityIn.validate(); this.tileEntities.put(pos, tileEntityIn); + } else { + System.out.println("Attempted to place a tile entity (" + tileEntityIn + ") at " + tileEntityIn.getPos().getX() + "," + tileEntityIn.getPos().getY() + "," + tileEntityIn.getPos().getZ() -+ + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getBlockState(pos).getBlock()) + ") where there was no entity tile!"); ++ + " (" + CraftMagicNumbers.getMaterial(getBlockState(pos).getBlock()) + ") where there was no entity tile!"); + System.out.println("Chunk coordinates: " + (this.x * 16) + "," + (this.z * 16)); + new Exception().printStackTrace(); } } -@@ -864,7 +944,7 @@ +@@ -864,7 +946,7 @@ public void onUnload() { @@ -237,7 +239,7 @@ this.loaded = false; for (TileEntity tileentity : this.tileEntities.values()) -@@ -874,7 +954,14 @@ +@@ -874,7 +956,14 @@ for (ClassInheritanceMultiMap classinheritancemultimap : this.entityLists) { @@ -253,7 +255,7 @@ } net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.ChunkEvent.Unload(this)); } -@@ -955,7 +1042,7 @@ +@@ -955,7 +1044,7 @@ return true; } @@ -262,7 +264,7 @@ } public Random getRandomWithSeed(long seed) -@@ -1001,6 +1088,63 @@ +@@ -1001,6 +1090,63 @@ } } @@ -326,7 +328,7 @@ protected void populate(IChunkGenerator generator) { if (populating != null && net.minecraftforge.common.ForgeModContainer.logCascadingWorldGeneration) logCascadingWorldGeneration(); -@@ -1017,6 +1161,26 @@ +@@ -1017,6 +1163,26 @@ { this.checkLight(); generator.populate(this.x, this.z); @@ -353,7 +355,7 @@ net.minecraftforge.fml.common.registry.GameRegistry.generateWorld(this.x, this.z, this.world, generator, this.world.getChunkProvider()); this.markDirty(); } -@@ -1075,7 +1239,7 @@ +@@ -1075,7 +1241,7 @@ { BlockPos blockpos = this.tileEntityPosQueue.poll(); @@ -362,7 +364,7 @@ { TileEntity tileentity = this.createNewTileEntity(blockpos); this.world.setTileEntity(blockpos, tileentity); -@@ -1086,7 +1250,7 @@ +@@ -1086,7 +1252,7 @@ public boolean isPopulated() { diff --git a/patches/net/minecraft/world/storage/MapData.java.patch b/patches/net/minecraft/world/storage/MapData.java.patch index f7a449d7..c64c46a9 100644 --- a/patches/net/minecraft/world/storage/MapData.java.patch +++ b/patches/net/minecraft/world/storage/MapData.java.patch @@ -8,17 +8,19 @@ import javax.annotation.Nullable; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.player.EntityPlayer; -@@ -15,6 +16,9 @@ +@@ -15,6 +16,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -+import org.bukkit.craftbukkit.CraftServer; -+import org.bukkit.craftbukkit.CraftWorld; -+import org.bukkit.craftbukkit.map.CraftMapView; ++import org.bukkit.craftbukkit.v1_12_R1.CraftServer; ++import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; ++import org.bukkit.craftbukkit.v1_12_R1.map.CraftMapView; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; ++import org.bukkit.craftbukkit.v1_12_R1.map.RenderData; public class MapData extends WorldSavedData { -@@ -25,13 +29,19 @@ +@@ -25,13 +31,19 @@ public boolean unlimitedTracking; public byte scale; public byte[] colors = new byte[16384]; @@ -40,7 +42,7 @@ } public void calculateMapCenter(double x, double z, int mapScale) -@@ -45,7 +55,31 @@ +@@ -45,7 +57,31 @@ public void readFromNBT(NBTTagCompound nbt) { @@ -73,7 +75,7 @@ this.xCenter = nbt.getInteger("xCenter"); this.zCenter = nbt.getInteger("zCenter"); this.scale = nbt.getByte("scale"); -@@ -97,6 +131,25 @@ +@@ -97,6 +133,25 @@ public NBTTagCompound writeToNBT(NBTTagCompound compound) { @@ -99,7 +101,7 @@ compound.setInteger("dimension", this.dimension); compound.setInteger("xCenter", this.xCenter); compound.setInteger("zCenter", this.zCenter); -@@ -113,7 +166,7 @@ +@@ -113,7 +168,7 @@ { if (!this.playersHashMap.containsKey(player)) { @@ -108,7 +110,7 @@ this.playersHashMap.put(player, mapdata$mapinfo); this.playersArrayList.add(mapdata$mapinfo); } -@@ -125,7 +178,7 @@ +@@ -125,7 +180,7 @@ for (int i = 0; i < this.playersArrayList.size(); ++i) { @@ -117,7 +119,7 @@ if (!mapdata$mapinfo1.player.isDead && (mapdata$mapinfo1.player.inventory.hasItemStack(mapStack) || mapStack.isOnItemFrame())) { -@@ -268,7 +321,7 @@ +@@ -268,7 +323,7 @@ @Nullable public Packet getMapPacket(ItemStack mapStack, World worldIn, EntityPlayer player) { @@ -126,7 +128,7 @@ return mapdata$mapinfo == null ? null : mapdata$mapinfo.getPacket(mapStack); } -@@ -276,19 +329,19 @@ +@@ -276,19 +331,19 @@ { super.markDirty(); @@ -150,11 +152,11 @@ this.playersHashMap.put(player, mapdata$mapinfo); this.playersArrayList.add(mapdata$mapinfo); } -@@ -315,14 +368,25 @@ +@@ -315,14 +370,25 @@ @Nullable public Packet getPacket(ItemStack stack) { -+ org.bukkit.craftbukkit.map.RenderData render = MapData.this.mapView.render((org.bukkit.craftbukkit.entity.CraftPlayer) this.player.getBukkitEntity()); ++ RenderData render = MapData.this.mapView.render((CraftPlayer) this.player.getBukkitEntity()); + + java.util.Collection icons = new java.util.ArrayList<>(); + diff --git a/patches/net/minecraft/world/storage/SaveHandler.java.patch b/patches/net/minecraft/world/storage/SaveHandler.java.patch index a2c9bb90..b29f00d6 100644 --- a/patches/net/minecraft/world/storage/SaveHandler.java.patch +++ b/patches/net/minecraft/world/storage/SaveHandler.java.patch @@ -16,7 +16,7 @@ import net.minecraft.world.gen.structure.template.TemplateManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -+import org.bukkit.craftbukkit.entity.CraftPlayer; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; public class SaveHandler implements ISaveHandler, IPlayerFileData { diff --git a/patches/net/minecraftforge/common/ForgeHooks.java.patch b/patches/net/minecraftforge/common/ForgeHooks.java.patch index 014161b7..c15ff110 100644 --- a/patches/net/minecraftforge/common/ForgeHooks.java.patch +++ b/patches/net/minecraftforge/common/ForgeHooks.java.patch @@ -45,7 +45,15 @@ import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraftforge.event.DifficultyChangeEvent; import net.minecraftforge.event.ForgeEventFactory; -@@ -450,7 +441,7 @@ +@@ -164,6 +155,7 @@ + + import org.apache.commons.io.FilenameUtils; + import org.apache.commons.io.IOUtils; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; + + public class ForgeHooks + { +@@ -450,7 +442,7 @@ } else { @@ -54,7 +62,7 @@ if (resourcelocation == null || !EntityList.ENTITY_EGGS.containsKey(resourcelocation)) { -@@ -472,7 +463,7 @@ +@@ -472,7 +464,7 @@ } else if (this.objectMouseOver.typeOfHit == RayTraceResult.Type.ENTITY) { @@ -63,7 +71,7 @@ } LOGGER.warn("Picking on: [{}] {} gave null item", new Object[] {this.objectMouseOver.typeOfHit, s}); -@@ -816,27 +807,8 @@ +@@ -816,27 +808,8 @@ public static int onBlockBreakEvent(World world, GameType gameType, EntityPlayerMP entityPlayer, BlockPos pos) { @@ -92,7 +100,7 @@ { SPacketBlockChange packet = new SPacketBlockChange(world, pos); packet.blockState = Blocks.AIR.getDefaultState(); -@@ -846,11 +818,11 @@ +@@ -846,11 +819,11 @@ // Post the block break event IBlockState state = world.getBlockState(pos); BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, pos, state, entityPlayer); @@ -106,7 +114,7 @@ { // Let the client know the block still exists entityPlayer.connection.sendPacket(new SPacketBlockChange(world, pos)); -@@ -865,6 +837,11 @@ +@@ -865,6 +838,11 @@ entityPlayer.connection.sendPacket(pkt); } } @@ -118,15 +126,15 @@ } return event.isCanceled() ? -1 : event.getExpToDrop(); } -@@ -929,6 +906,7 @@ +@@ -929,6 +907,7 @@ blocksnapshot.restore(true, false); world.restoringBlockSnapshots = false; } -+ ((org.bukkit.craftbukkit.entity.CraftPlayer) player.getBukkitEntity()).updateInventory(); ++ ((CraftPlayer) player.getBukkitEntity()).updateInventory(); } else { -@@ -953,6 +931,29 @@ +@@ -953,6 +932,29 @@ world.markAndNotifyBlock(snap.getPos(), null, oldBlock, newBlock, updateFlag); } player.addStat(StatList.getObjectUseStats(itemstack.getItem())); @@ -156,7 +164,7 @@ } } world.capturedBlockSnapshots.clear(); -@@ -992,7 +993,7 @@ +@@ -992,7 +994,7 @@ } /** diff --git a/patches/net/minecraftforge/common/ForgeVersion.java.patch b/patches/net/minecraftforge/common/ForgeVersion.java.patch index dac4f3b9..4fccc445 100644 --- a/patches/net/minecraftforge/common/ForgeVersion.java.patch +++ b/patches/net/minecraftforge/common/ForgeVersion.java.patch @@ -9,7 +9,15 @@ // This is the minecraft version we're building for - used in various places in Forge/FML code public static final String mcVersion = "1.12.2"; // This is the MCP data version we're using -@@ -367,4 +367,3 @@ +@@ -357,7 +357,6 @@ + + private static Map results = new ConcurrentHashMap(); + private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null); +- + public static CheckResult getResult(ModContainer mod) + { + if (mod == null) return PENDING_CHECK; +@@ -367,4 +366,3 @@ return ret == null ? PENDING_CHECK : ret; } } diff --git a/patches/net/minecraftforge/event/world/BlockEvent.java.patch b/patches/net/minecraftforge/event/world/BlockEvent.java.patch index bd43e3bc..e240fba7 100644 --- a/patches/net/minecraftforge/event/world/BlockEvent.java.patch +++ b/patches/net/minecraftforge/event/world/BlockEvent.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraftforge/event/world/BlockEvent.java +++ ../src-work/minecraft/net/minecraftforge/event/world/BlockEvent.java -@@ -19,29 +19,26 @@ +@@ -19,29 +19,27 @@ package net.minecraftforge.event.world; @@ -25,7 +25,8 @@ import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; -+import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlockState; -import com.google.common.collect.ImmutableList; - @@ -36,7 +37,7 @@ public class BlockEvent extends Event { -@@ -125,16 +122,17 @@ +@@ -125,16 +123,17 @@ super(world, pos, state); this.player = player; @@ -60,7 +61,7 @@ } public EntityPlayer getPlayer() -@@ -204,8 +202,7 @@ +@@ -204,8 +203,7 @@ */ @Cancelable @Deprecated // Remove in 1.13 @@ -70,14 +71,14 @@ private final EntityPlayer player; private final EnumHand hand; -@@ -213,17 +210,31 @@ +@@ -213,17 +211,31 @@ super(blockSnapshot, placedAgainst, player); this.player = player; this.hand = hand; - if (DEBUG) - { + // Cauldron start - handle event on bukkit side -+ org.bukkit.craftbukkit.block.CraftBlockState blockstate = org.bukkit.craftbukkit.block.CraftBlockState.getBlockState(getWorld(), getPos().getX(), getPos().getY(), getPos().getZ()); ++ CraftBlockState blockstate = CraftBlockState.getBlockState(getWorld(), getPos().getX(), getPos().getY(), getPos().getZ()); + org.bukkit.event.block.BlockPlaceEvent bukkitEvent = CraftEventFactory.callBlockPlaceEvent(getWorld(), player, hand, blockstate, getPos().getX(), getPos().getY(), getPos().getZ()); + if (bukkitEvent.isCancelled() || !bukkitEvent.canBuild()) { + this.setCanceled(true); diff --git a/patches/net/minecraftforge/event/world/ExplosionEvent.java.patch b/patches/net/minecraftforge/event/world/ExplosionEvent.java.patch index 4a6d37a1..0f79fad4 100644 --- a/patches/net/minecraftforge/event/world/ExplosionEvent.java.patch +++ b/patches/net/minecraftforge/event/world/ExplosionEvent.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraftforge/event/world/ExplosionEvent.java +++ ../src-work/minecraft/net/minecraftforge/event/world/ExplosionEvent.java -@@ -19,16 +19,23 @@ +@@ -19,16 +19,26 @@ package net.minecraftforge.event.world; @@ -23,13 +23,16 @@ +import net.minecraftforge.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Event; +import org.bukkit.event.entity.ExplosionPrimeEvent; ++import org.bukkit.craftbukkit.v1_12_R1.CraftServer; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; ++import org.bukkit.craftbukkit.v1_12_R1.entity.CraftTNTPrimed; +import java.util.List; + /** ExplosionEvent triggers when an explosion happens in the world.
*
* ExplosionEvent.Start is fired before the explosion actually occurs.
-@@ -43,9 +50,15 @@ +@@ -43,9 +53,15 @@ { private final World world; private final Explosion explosion; @@ -45,7 +48,7 @@ this.world = world; this.explosion = explosion; } -@@ -69,10 +82,40 @@ +@@ -69,10 +85,40 @@ @Cancelable public static class Start extends ExplosionEvent { @@ -57,13 +60,13 @@ super(world, explosion); + // CraftBukkit start + // float f = 4.0F; -+ org.bukkit.craftbukkit.CraftServer server = world.getServer(); -+ org.bukkit.craftbukkit.entity.CraftEntity ce = null; ++ CraftServer server = world.getServer(); ++ CraftEntity ce = null; + if (explosion.exploder != null && explosion.exploder instanceof EntityLivingBase) { -+ ce = new org.bukkit.craftbukkit.entity.CraftTNTPrimed(server, new EntityTNTPrimed(world, explosion.x, explosion.y, explosion.z, (EntityLivingBase) explosion.exploder)); ++ ce = new CraftTNTPrimed(server, new EntityTNTPrimed(world, explosion.x, explosion.y, explosion.z, (EntityLivingBase) explosion.exploder)); + } + if (ce == null) { -+ ce = new org.bukkit.craftbukkit.entity.CraftTNTPrimed(server, new EntityTNTPrimed(world, explosion.x, explosion.y, explosion.z, exploder_fake)); ++ ce = new CraftTNTPrimed(server, new EntityTNTPrimed(world, explosion.x, explosion.y, explosion.z, exploder_fake)); + } + event = new ExplosionPrimeEvent(ce, 8.0F, true); + server.getPluginManager().callEvent(event); diff --git a/patches/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java.patch b/patches/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java.patch index 12dfa14b..3b537665 100644 --- a/patches/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java.patch +++ b/patches/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java.patch @@ -18,9 +18,9 @@ import com.google.gson.JsonObject; import org.apache.commons.lang3.tuple.Pair; +import org.bukkit.Bukkit; -+import org.bukkit.craftbukkit.event.CraftEventFactory; -+import org.bukkit.craftbukkit.inventory.CraftInventory; -+import org.bukkit.craftbukkit.inventory.CraftInventoryView; ++import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; ++import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryView; +import org.bukkit.event.inventory.InventoryType; import javax.annotation.Nullable; diff --git a/src/main/java/com/destroystokyo/paper/MCUtil.java b/src/main/java/com/destroystokyo/paper/MCUtil.java index b66dcd26..08722c31 100644 --- a/src/main/java/com/destroystokyo/paper/MCUtil.java +++ b/src/main/java/com/destroystokyo/paper/MCUtil.java @@ -11,8 +11,8 @@ import net.minecraft.world.chunk.Chunk; import org.apache.commons.lang.exception.ExceptionUtils; import org.bukkit.Location; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.util.Waitable; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.util.Waitable; import org.spigotmc.AsyncCatcher; import javax.annotation.Nonnull; diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java index 1cc26f0e..435ab9bf 100644 --- a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java @@ -3,7 +3,7 @@ import com.destroystokyo.paper.event.server.ServerExceptionEvent; import com.destroystokyo.paper.exception.ServerSchedulerException; import com.google.common.base.Preconditions; -import org.bukkit.craftbukkit.scheduler.CraftTask; +import org.bukkit.craftbukkit.v1_12_R1.scheduler.CraftTask; /** * Reporting wrapper to catch exceptions not natively diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java index bd050b9b..e2b922f4 100644 --- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java @@ -6,7 +6,7 @@ import com.mojang.authlib.properties.PropertyMap; import net.minecraft.server.MinecraftServer; import net.minecraft.server.management.PlayerProfileCache; -import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; import org.spigotmc.SpigotConfig; import javax.annotation.Nonnull; diff --git a/src/main/java/org/bukkit/block/CraftCustomContainer.java b/src/main/java/org/bukkit/block/CraftCustomContainer.java index a6ae5ede..035c9c41 100644 --- a/src/main/java/org/bukkit/block/CraftCustomContainer.java +++ b/src/main/java/org/bukkit/block/CraftCustomContainer.java @@ -1,9 +1,9 @@ package org.bukkit.block; import net.minecraft.inventory.IInventory; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.block.CraftBlockState; -import org.bukkit.craftbukkit.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlockState; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; diff --git a/src/main/java/org/bukkit/command/CommandWrapper.java b/src/main/java/org/bukkit/command/CommandWrapper.java index 85de4424..632287e2 100644 --- a/src/main/java/org/bukkit/command/CommandWrapper.java +++ b/src/main/java/org/bukkit/command/CommandWrapper.java @@ -9,9 +9,9 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.CommandBlockBaseLogic; import net.minecraft.util.math.BlockPos; -import org.bukkit.craftbukkit.command.CraftBlockCommandSender; -import org.bukkit.craftbukkit.command.CraftFunctionCommandSender; -import org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender; +import org.bukkit.craftbukkit.v1_12_R1.command.CraftBlockCommandSender; +import org.bukkit.craftbukkit.v1_12_R1.command.CraftFunctionCommandSender; +import org.bukkit.craftbukkit.v1_12_R1.command.CraftRemoteConsoleCommandSender; import org.magmafoundation.magma.api.ServerAPI; import javax.annotation.Nullable; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftArt.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftArt.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/CraftArt.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftArt.java index cea66129..fdd36eba 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftArt.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftArt.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import net.minecraft.entity.item.EntityPainting.EnumArt; import org.bukkit.Art; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftChunk.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/CraftChunk.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftChunk.java index bf89868b..cf6e7dc0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftChunk.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import java.lang.ref.WeakReference; import java.util.Arrays; @@ -13,7 +13,7 @@ import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockState; -import org.bukkit.craftbukkit.block.CraftBlock; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlock; import org.bukkit.entity.Entity; import org.bukkit.ChunkSnapshot; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftChunkSnapshot.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftChunkSnapshot.java index 79236484..30b73a9c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftChunkSnapshot.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import org.bukkit.ChunkSnapshot; import org.bukkit.Material; import net.minecraft.world.biome.Biome; -import org.bukkit.craftbukkit.block.CraftBlock; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlock; /** * Represents a static, thread-safe snapshot of chunk of blocks diff --git a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftCrashReport.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftCrashReport.java index a39d02d6..228f9e09 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftCrashReport.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftEffect.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/CraftEffect.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftEffect.java index 1576f9b1..18dd2efb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftEffect.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import org.apache.commons.lang3.Validate; import org.bukkit.Effect; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEquipmentSlot.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftEquipmentSlot.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/CraftEquipmentSlot.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftEquipmentSlot.java index 53e53bb8..38bc2e99 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftEquipmentSlot.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftEquipmentSlot.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import net.minecraft.inventory.EntityEquipmentSlot; import org.bukkit.inventory.EquipmentSlot; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftIpBanEntry.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftIpBanEntry.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/CraftIpBanEntry.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftIpBanEntry.java index a35ffcb0..11cc2804 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftIpBanEntry.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftIpBanEntry.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import java.io.IOException; import java.util.Date; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftIpBanList.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftIpBanList.java index 4b6adc24..8cf1efb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftIpBanList.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftOfflinePlayer.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftOfflinePlayer.java index e6601f61..1dfb6ad0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftOfflinePlayer.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import com.mojang.authlib.GameProfile; import java.io.File; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftParticle.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftParticle.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/CraftParticle.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftParticle.java index 79dd7ff4..189362e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftParticle.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftParticle.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import net.minecraft.util.EnumParticleTypes; import org.bukkit.Particle; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftProfileBanEntry.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftProfileBanEntry.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/CraftProfileBanEntry.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftProfileBanEntry.java index e74babbf..7af286a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftProfileBanEntry.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftProfileBanEntry.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftProfileBanList.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftProfileBanList.java index 901add7d..b5c03775 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftProfileBanList.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import java.io.IOException; import java.util.Date; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftServer.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/CraftServer.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftServer.java index 24576fad..d866b232 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftServer.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import java.awt.image.BufferedImage; import java.io.File; @@ -32,7 +32,6 @@ import net.minecraft.command.CommandSenderWrapper; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.EntityTracker; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Enchantments; import net.minecraft.init.Items; @@ -44,30 +43,21 @@ import net.minecraft.server.dedicated.DedicatedPlayerList; import net.minecraft.server.dedicated.DedicatedServer; import net.minecraft.server.dedicated.PendingCommand; -import net.minecraft.server.dedicated.PropertyManager; import net.minecraft.server.management.PlayerList; import net.minecraft.server.management.UserListEntry; -import net.minecraft.util.IProgressUpdate; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.RegistryNamespaced; import net.minecraft.util.text.translation.I18n; -import net.minecraft.world.EnumDifficulty; import net.minecraft.world.GameType; import net.minecraft.world.MinecraftException; -import net.minecraft.world.ServerWorldEventHandler; import net.minecraft.world.WorldServer; import net.minecraft.world.WorldSettings; import net.minecraft.world.WorldType; -import net.minecraft.world.chunk.storage.AnvilSaveConverter; -import net.minecraft.world.chunk.storage.AnvilSaveHandler; import net.minecraft.world.chunk.storage.RegionFile; import net.minecraft.world.chunk.storage.RegionFileCache; -import net.minecraft.world.storage.ISaveFormat; -import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.MapData; import net.minecraft.world.storage.MapStorage; import net.minecraft.world.storage.SaveHandler; -import net.minecraft.world.storage.WorldInfo; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -98,33 +88,33 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.serialization.ConfigurationSerialization; import org.bukkit.conversations.Conversable; -import org.bukkit.craftbukkit.boss.CraftBossBar; -import org.bukkit.craftbukkit.command.CraftSimpleCommandMap; -import org.bukkit.craftbukkit.command.UnknownCommandEvent; -import org.bukkit.craftbukkit.command.VanillaCommandWrapper; -import org.bukkit.craftbukkit.entity.CraftPlayer; -import org.bukkit.craftbukkit.generator.CraftChunkData; -import org.bukkit.craftbukkit.help.SimpleHelpMap; -import org.bukkit.craftbukkit.inventory.CraftFurnaceRecipe; -import org.bukkit.craftbukkit.inventory.CraftInventoryCustom; -import org.bukkit.craftbukkit.inventory.CraftItemFactory; -import org.bukkit.craftbukkit.inventory.CraftMerchantCustom; -import org.bukkit.craftbukkit.inventory.CraftRecipe; -import org.bukkit.craftbukkit.inventory.CraftShapedRecipe; -import org.bukkit.craftbukkit.inventory.CraftShapelessRecipe; -import org.bukkit.craftbukkit.inventory.RecipeIterator; -import org.bukkit.craftbukkit.map.CraftMapView; -import org.bukkit.craftbukkit.metadata.EntityMetadataStore; -import org.bukkit.craftbukkit.metadata.PlayerMetadataStore; -import org.bukkit.craftbukkit.metadata.WorldMetadataStore; -import org.bukkit.craftbukkit.potion.CraftPotionBrewer; -import org.bukkit.craftbukkit.scheduler.CraftScheduler; -import org.bukkit.craftbukkit.scoreboard.CraftScoreboardManager; -import org.bukkit.craftbukkit.util.CraftIconCache; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.util.DatFileFilter; -import org.bukkit.craftbukkit.util.Versioning; -import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.help.SimpleHelpMap; +import org.bukkit.craftbukkit.v1_12_R1.boss.CraftBossBar; +import org.bukkit.craftbukkit.v1_12_R1.command.CraftSimpleCommandMap; +import org.bukkit.craftbukkit.v1_12_R1.command.UnknownCommandEvent; +import org.bukkit.craftbukkit.v1_12_R1.command.VanillaCommandWrapper; +import org.bukkit.craftbukkit.v1_12_R1.generator.CraftChunkData; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftFurnaceRecipe; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryCustom; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemFactory; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMerchantCustom; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftRecipe; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftShapedRecipe; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftShapelessRecipe; +import org.bukkit.craftbukkit.v1_12_R1.inventory.RecipeIterator; +import org.bukkit.craftbukkit.v1_12_R1.map.CraftMapView; +import org.bukkit.craftbukkit.v1_12_R1.metadata.EntityMetadataStore; +import org.bukkit.craftbukkit.v1_12_R1.metadata.PlayerMetadataStore; +import org.bukkit.craftbukkit.v1_12_R1.metadata.WorldMetadataStore; +import org.bukkit.craftbukkit.v1_12_R1.potion.CraftPotionBrewer; +import org.bukkit.craftbukkit.v1_12_R1.scheduler.CraftScheduler; +import org.bukkit.craftbukkit.v1_12_R1.scoreboard.CraftScoreboardManager; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftIconCache; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.DatFileFilter; +import org.bukkit.craftbukkit.v1_12_R1.util.Versioning; +import org.bukkit.craftbukkit.v1_12_R1.util.permissions.CraftDefaultPermissions; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryType; @@ -154,9 +144,7 @@ import org.bukkit.plugin.java.JavaPluginLoader; import org.bukkit.plugin.messaging.Messenger; import org.bukkit.potion.Potion; -import org.bukkit.potion.PotionEffectType; import org.bukkit.plugin.messaging.StandardMessenger; -import org.bukkit.scheduler.BukkitWorker; import org.bukkit.util.StringUtil; import org.bukkit.util.permissions.DefaultPermissions; import org.magmafoundation.magma.Magma; @@ -167,7 +155,6 @@ import org.apache.commons.lang3.Validate; import com.google.common.base.Charsets; -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; @@ -181,7 +168,7 @@ import io.netty.handler.codec.base64.Base64; //import jline.console.ConsoleReader; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftNamespacedKey; import org.bukkit.event.server.TabCompleteEvent; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftSound.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/CraftSound.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftSound.java index a273e397..0eeacad3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftSound.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import com.google.common.base.Preconditions; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftStatistic.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/CraftStatistic.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftStatistic.java index f5b00263..75263e62 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftStatistic.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import net.minecraft.block.Block; import net.minecraft.entity.EntityList; @@ -9,12 +9,12 @@ import net.minecraft.util.ResourceLocation; import org.bukkit.Statistic; import org.bukkit.Material; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; import org.bukkit.entity.EntityType; import com.google.common.base.CaseFormat; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; public class CraftStatistic { private static final BiMap statistics; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftTravelAgent.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftTravelAgent.java index 44aae5ca..cc90da1f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftTravelAgent.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Teleporter; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftWorld.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/CraftWorld.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftWorld.java index 4b9a794b..4bcc14b3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftWorld.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import com.google.common.base.Preconditions; import java.io.File; @@ -121,9 +121,6 @@ import net.minecraft.util.math.ChunkPos; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.MinecraftException; -import net.minecraft.world.WorldProviderEnd; -import net.minecraft.world.WorldProviderHell; -import net.minecraft.world.WorldProviderSurface; import net.minecraft.world.WorldServer; import net.minecraft.world.gen.ChunkProviderServer; import net.minecraft.world.gen.feature.WorldGenBigMushroom; @@ -156,14 +153,15 @@ import org.bukkit.block.Biome; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import org.bukkit.block.BlockState; -import org.bukkit.craftbukkit.block.CraftBlock; -import org.bukkit.craftbukkit.block.CraftBlockState; -import org.bukkit.craftbukkit.entity.*; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.metadata.BlockMetadataStore; -import org.bukkit.craftbukkit.potion.CraftPotionUtil; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftItem; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftLightningStrike; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.metadata.BlockMetadataStore; +import org.bukkit.craftbukkit.v1_12_R1.potion.CraftPotionUtil; import org.bukkit.entity.*; import org.bukkit.entity.Entity; import org.bukkit.entity.minecart.CommandMinecart; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftWorldBorder.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftWorldBorder.java index 773ea2d8..b17dec8b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/CraftWorldBorder.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import com.google.common.base.Preconditions; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/org/bukkit/craftbukkit/LoggerOutputStream.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/LoggerOutputStream.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/LoggerOutputStream.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/LoggerOutputStream.java index 93526ab6..7198652c 100644 --- a/src/main/java/org/bukkit/craftbukkit/LoggerOutputStream.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/LoggerOutputStream.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/Main.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/Main.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/Main.java index 86599bf2..46813a70 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/Main.java @@ -1,13 +1,10 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Arrays; -import java.util.Calendar; -import java.util.Date; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; import jline.UnsupportedTerminal; diff --git a/src/main/java/org/bukkit/craftbukkit/Overridden.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/Overridden.java similarity index 89% rename from src/main/java/org/bukkit/craftbukkit/Overridden.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/Overridden.java index 1c19c69f..3bc69e89 100644 --- a/src/main/java/org/bukkit/craftbukkit/Overridden.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/Overridden.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/bukkit/craftbukkit/TrigMath.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/TrigMath.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/TrigMath.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/TrigMath.java index 6d613c53..6dfd9644 100644 --- a/src/main/java/org/bukkit/craftbukkit/TrigMath.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/TrigMath.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit; +package org.bukkit.craftbukkit.v1_12_R1; /** * Credits for this class goes to user aioobe on stackoverflow.com diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/advancement/CraftAdvancement.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/advancement/CraftAdvancement.java index d6b17e36..5b6b01d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/advancement/CraftAdvancement.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.advancement; +package org.bukkit.craftbukkit.v1_12_R1.advancement; import java.util.Collection; import java.util.Collections; import net.minecraft.advancements.Advancement; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftNamespacedKey; public class CraftAdvancement implements org.bukkit.advancement.Advancement { diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/advancement/CraftAdvancementProgress.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/advancement/CraftAdvancementProgress.java index a3261cb6..af392c97 100644 --- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/advancement/CraftAdvancementProgress.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.advancement; +package org.bukkit.craftbukkit.v1_12_R1.advancement; import com.google.common.collect.Lists; import java.util.Collection; diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/attribute/CraftAttributeInstance.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/attribute/CraftAttributeInstance.java index 8c1e1ac7..54a67a2a 100644 --- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/attribute/CraftAttributeInstance.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.attribute; +package org.bukkit.craftbukkit.v1_12_R1.attribute; import com.google.common.base.Preconditions; import java.util.ArrayList; diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/attribute/CraftAttributeMap.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/attribute/CraftAttributeMap.java index 1504df4c..4eaa3503 100644 --- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/attribute/CraftAttributeMap.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.attribute; +package org.bukkit.craftbukkit.v1_12_R1.attribute; import com.google.common.base.Preconditions; import net.minecraft.entity.ai.attributes.AbstractAttributeMap; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBanner.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBanner.java index efbc6fc5..547bcdbe 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBanner.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBeacon.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBeacon.java index fd94b473..11c51f74 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBeacon.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import java.util.ArrayList; import java.util.Collection; @@ -10,7 +10,7 @@ import org.bukkit.Material; import org.bukkit.block.Beacon; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.inventory.CraftInventoryBeacon; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryBeacon; import org.bukkit.entity.LivingEntity; import org.bukkit.inventory.BeaconInventory; import org.bukkit.potion.PotionEffect; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBed.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBed.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/block/CraftBed.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBed.java index 8771f65b..d23e92b7 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBed.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBed.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import com.google.common.base.Preconditions; import net.minecraft.item.EnumDyeColor; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBlock.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBlock.java index 698c91d6..c58765ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBlock.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import java.util.ArrayList; import java.util.Collection; @@ -27,10 +27,10 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.*; -import org.bukkit.craftbukkit.CraftChunk; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBlockEntityState.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBlockEntityState.java index c941c711..53e1276e 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBlockEntityState.java @@ -1,11 +1,11 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import org.bukkit.Material; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; public class CraftBlockEntityState extends CraftBlockState { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBlockState.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBlockState.java index 4feb471b..54db870a 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBlockState.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; @@ -8,14 +8,12 @@ import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.block.Block; -import org.bukkit.Chunk; import org.bukkit.Material; import org.bukkit.World; -import org.bukkit.block.Block; import org.bukkit.block.BlockState; -import org.bukkit.craftbukkit.CraftChunk; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; import org.bukkit.material.Attachable; import org.bukkit.material.MaterialData; import org.bukkit.metadata.MetadataValue; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBrewingStand.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBrewingStand.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/block/CraftBrewingStand.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBrewingStand.java index ba1afbaa..80dac383 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBrewingStand.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftBrewingStand.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityBrewingStand; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BrewingStand; -import org.bukkit.craftbukkit.inventory.CraftInventoryBrewer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryBrewer; import org.bukkit.inventory.BrewerInventory; public class CraftBrewingStand extends CraftContainer implements BrewingStand { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftChest.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/block/CraftChest.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftChest.java index 7c746ecf..aa2ae41f 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftChest.java @@ -1,13 +1,13 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.math.BlockPos; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Chest; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.inventory.CraftInventory; -import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryDoubleChest; import org.bukkit.inventory.Inventory; public class CraftChest extends CraftLootable implements Chest { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftCommandBlock.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftCommandBlock.java index 0aef832a..0be48e2a 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftCommandBlock.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityCommandBlock; import org.bukkit.Material; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftComparator.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftComparator.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/block/CraftComparator.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftComparator.java index 0ef5cc6d..4c1d055c 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftComparator.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftComparator.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityComparator; import org.bukkit.Material; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftContainer.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftContainer.java index 184b3fd4..09b96c9a 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftContainer.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityLockable; import net.minecraft.world.LockCode; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftCreatureSpawner.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftCreatureSpawner.java index 54dba247..80d5e41e 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftCreatureSpawner.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import com.google.common.base.Preconditions; import net.minecraft.tileentity.TileEntityMobSpawner; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDaylightDetector.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftDaylightDetector.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/block/CraftDaylightDetector.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftDaylightDetector.java index 8be5685d..6cca5502 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDaylightDetector.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftDaylightDetector.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityDaylightDetector; import org.bukkit.Material; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftDispenser.java similarity index 87% rename from src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftDispenser.java index de76d58a..2b7e6be1 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftDispenser.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.block.BlockDispenser; import net.minecraft.init.Blocks; @@ -7,9 +7,9 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Dispenser; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.inventory.CraftInventory; -import org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_12_R1.projectiles.CraftBlockProjectileSource; import org.bukkit.inventory.Inventory; import org.bukkit.projectiles.BlockProjectileSource; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDropper.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftDropper.java similarity index 88% rename from src/main/java/org/bukkit/craftbukkit/block/CraftDropper.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftDropper.java index efa6ce7b..15f59513 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDropper.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftDropper.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.block.BlockDropper; import net.minecraft.init.Blocks; @@ -7,8 +7,8 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Dropper; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; import org.bukkit.inventory.Inventory; public class CraftDropper extends CraftLootable implements Dropper { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftEnchantingTable.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftEnchantingTable.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/block/CraftEnchantingTable.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftEnchantingTable.java index da8eef1f..39c12858 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftEnchantingTable.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftEnchantingTable.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityEnchantmentTable; import org.bukkit.Material; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftEndGateway.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftEndGateway.java index cd75b55c..4f249d24 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftEndGateway.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import java.util.Objects; import net.minecraft.tileentity.TileEntityEndGateway; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftEnderChest.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftEnderChest.java index 9a44b680..b710ed58 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftEnderChest.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityEnderChest; import org.bukkit.Material; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFlowerPot.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftFlowerPot.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/block/CraftFlowerPot.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftFlowerPot.java index aae87c61..fbf8a00f 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFlowerPot.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftFlowerPot.java @@ -1,11 +1,11 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFlowerPot; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.FlowerPot; -import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; import org.bukkit.material.MaterialData; public class CraftFlowerPot extends CraftBlockEntityState implements FlowerPot { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftFurnace.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftFurnace.java index c39383fb..f27b45c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftFurnace.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityFurnace; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Furnace; -import org.bukkit.craftbukkit.inventory.CraftInventoryFurnace; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryFurnace; import org.bukkit.inventory.FurnaceInventory; public class CraftFurnace extends CraftContainer implements Furnace { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftHopper.java similarity index 87% rename from src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftHopper.java index 5c3ee84d..a106b925 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftHopper.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityHopper; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Hopper; -import org.bukkit.craftbukkit.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; import org.bukkit.inventory.Inventory; public class CraftHopper extends CraftLootable implements Hopper { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftJukebox.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftJukebox.java index c7a89e83..1e0548ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftJukebox.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.block.BlockJukebox; import net.minecraft.block.BlockJukebox.TileEntityJukebox; @@ -10,8 +10,8 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Jukebox; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; public class CraftJukebox extends CraftBlockEntityState implements Jukebox { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftLootable.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftLootable.java index 28f3d811..a9372ddd 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftLootable.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityLockableLoot; import org.bukkit.Material; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftNoteBlock.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftNoteBlock.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/block/CraftNoteBlock.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftNoteBlock.java index 4018774e..77a4a70e 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftNoteBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftNoteBlock.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntityNote; import net.minecraft.util.math.BlockPos; @@ -7,8 +7,8 @@ import org.bukkit.Note; import org.bukkit.block.Block; import org.bukkit.block.NoteBlock; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; public class CraftNoteBlock extends CraftBlockEntityState implements NoteBlock { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftShulkerBox.java similarity index 86% rename from src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftShulkerBox.java index 0b9aac43..f4a9dc8a 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftShulkerBox.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.block.BlockShulkerBox; import net.minecraft.tileentity.TileEntityShulkerBox; @@ -6,8 +6,8 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.ShulkerBox; -import org.bukkit.craftbukkit.inventory.CraftInventory; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; import org.bukkit.inventory.Inventory; public class CraftShulkerBox extends CraftLootable implements ShulkerBox { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftSign.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/block/CraftSign.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftSign.java index bfe41f98..9819eaba 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftSign.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import net.minecraft.tileentity.TileEntitySign; import net.minecraft.util.text.ITextComponent; @@ -6,7 +6,7 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Sign; -import org.bukkit.craftbukkit.util.CraftChatMessage; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; public class CraftSign extends CraftBlockEntityState implements Sign { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftSkull.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftSkull.java index 6b238e1e..5ce55b6a 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftSkull.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftStructureBlock.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftStructureBlock.java index 274912b6..ad7fc2c2 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/block/CraftStructureBlock.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.block; +package org.bukkit.craftbukkit.v1_12_R1.block; import com.google.common.base.Preconditions; import net.minecraft.tileentity.TileEntityStructure; @@ -11,7 +11,7 @@ import org.bukkit.block.structure.Mirror; import org.bukkit.block.structure.StructureRotation; import org.bukkit.block.structure.UsageMode; -import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftLivingEntity; import org.bukkit.entity.LivingEntity; import org.bukkit.util.BlockVector; diff --git a/src/main/java/org/bukkit/craftbukkit/boss/CraftBossBar.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/boss/CraftBossBar.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/boss/CraftBossBar.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/boss/CraftBossBar.java index 8cbab6c9..aa3ccd17 100644 --- a/src/main/java/org/bukkit/craftbukkit/boss/CraftBossBar.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/boss/CraftBossBar.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.boss; +package org.bukkit.craftbukkit.v1_12_R1.boss; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -10,8 +10,8 @@ import org.bukkit.boss.BarFlag; import org.bukkit.boss.BarStyle; import org.bukkit.boss.BossBar; -import org.bukkit.craftbukkit.entity.CraftPlayer; -import org.bukkit.craftbukkit.util.CraftChatMessage; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; import org.bukkit.entity.Player; import java.util.EnumSet; diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/chunkio/ChunkIOExecutor.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/chunkio/ChunkIOExecutor.java index 3ac5c3e8..38d6e02a 100644 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/chunkio/ChunkIOExecutor.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.chunkio; +package org.bukkit.craftbukkit.v1_12_R1.chunkio; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.storage.AnvilChunkLoader; import net.minecraft.world.gen.ChunkProviderServer; -import org.bukkit.craftbukkit.util.AsynchronousExecutor; +import org.bukkit.craftbukkit.v1_12_R1.util.AsynchronousExecutor; public class ChunkIOExecutor { static final int BASE_THREADS = 1; diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/chunkio/ChunkIOProvider.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/chunkio/ChunkIOProvider.java index c10c76a7..3220067d 100644 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/chunkio/ChunkIOProvider.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.chunkio; +package org.bukkit.craftbukkit.v1_12_R1.chunkio; import java.io.IOException; @@ -6,7 +6,7 @@ import net.minecraft.util.math.ChunkPos; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.storage.AnvilChunkLoader; -import org.bukkit.craftbukkit.util.AsynchronousExecutor; +import org.bukkit.craftbukkit.v1_12_R1.util.AsynchronousExecutor; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/QueuedChunk.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/chunkio/QueuedChunk.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/chunkio/QueuedChunk.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/chunkio/QueuedChunk.java index ae7218d9..99270a21 100644 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/QueuedChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/chunkio/QueuedChunk.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.chunkio; +package org.bukkit.craftbukkit.v1_12_R1.chunkio; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.chunk.storage.AnvilChunkLoader; diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ColouredConsoleSender.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ColouredConsoleSender.java index 2a1d4aee..78c43285 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ColouredConsoleSender.java @@ -1,10 +1,9 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import jline.Terminal; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.craftbukkit.command.CraftConsoleCommandSender; import org.fusesource.jansi.Ansi; import java.util.EnumMap; diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ConsoleCommandCompleter.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ConsoleCommandCompleter.java index 3023eceb..ce0a8761 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ConsoleCommandCompleter.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import java.util.Collections; import java.util.List; @@ -6,8 +6,8 @@ import java.util.logging.Level; import jline.console.completer.Completer; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.util.Waitable; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.util.Waitable; import org.bukkit.event.server.TabCompleteEvent; public class ConsoleCommandCompleter implements Completer { diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftBlockCommandSender.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftBlockCommandSender.java index 6aef689a..8251888b 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftBlockCommandSender.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import net.minecraft.command.ICommandSender; import net.minecraft.util.text.ITextComponent; import org.bukkit.block.Block; import org.bukkit.command.BlockCommandSender; -import org.bukkit.craftbukkit.util.CraftChatMessage; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; /** * Represents input from a command block diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftConsoleCommandSender.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftConsoleCommandSender.java index 9abcf92d..c56f7c55 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftConsoleCommandSender.java @@ -1,11 +1,11 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import org.bukkit.ChatColor; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.conversations.Conversation; import org.bukkit.conversations.ConversationAbandonedEvent; import org.bukkit.conversations.ManuallyAbandonedConversationCanceller; -import org.bukkit.craftbukkit.conversations.ConversationTracker; +import org.bukkit.craftbukkit.v1_12_R1.conversations.ConversationTracker; /** * Represents CLI input from a console diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftFunctionCommandSender.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftFunctionCommandSender.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/command/CraftFunctionCommandSender.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftFunctionCommandSender.java index 48722e1e..97310221 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftFunctionCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftFunctionCommandSender.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import net.minecraft.command.ICommandSender; import net.minecraft.util.text.ITextComponent; -import org.bukkit.craftbukkit.util.CraftChatMessage; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; public class CraftFunctionCommandSender extends ServerCommandSender { diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftRemoteConsoleCommandSender.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftRemoteConsoleCommandSender.java index 411ee036..3827844d 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftRemoteConsoleCommandSender.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import net.minecraft.network.rcon.RConConsoleSource; import net.minecraft.util.text.TextComponentString; diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftSimpleCommandMap.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftSimpleCommandMap.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/command/CraftSimpleCommandMap.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftSimpleCommandMap.java index d2349c9d..6097a2a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftSimpleCommandMap.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/CraftSimpleCommandMap.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import net.minecraft.command.ICommandSender; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.command.SimpleCommandMap; import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; import java.util.Arrays; import java.util.regex.Pattern; diff --git a/src/main/java/org/bukkit/craftbukkit/command/ModCustomCommand.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ModCustomCommand.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/command/ModCustomCommand.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ModCustomCommand.java index 432a4335..43993d46 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ModCustomCommand.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ModCustomCommand.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import java.util.List; diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ProxiedNativeCommandSender.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ProxiedNativeCommandSender.java index 4032050f..a2ee2d31 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ProxiedNativeCommandSender.java @@ -1,5 +1,5 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import java.util.Set; diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ServerCommandSender.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ServerCommandSender.java index 64e51cd0..fb9e4461 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/ServerCommandSender.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import org.bukkit.Bukkit; import org.bukkit.Server; diff --git a/src/main/java/org/bukkit/craftbukkit/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/UnknownCommandEvent.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/command/UnknownCommandEvent.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/UnknownCommandEvent.java index 6b141f21..d6aba3c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/UnknownCommandEvent.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/UnknownCommandEvent.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import org.bukkit.command.CommandSender; import org.bukkit.event.Event; diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/VanillaCommandWrapper.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/VanillaCommandWrapper.java index 91fa78bd..3330e9a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/command/VanillaCommandWrapper.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.command; +package org.bukkit.craftbukkit.v1_12_R1.command; import java.util.Iterator; import java.util.List; @@ -18,7 +18,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.WorldServer; import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.Level; import org.bukkit.Location; @@ -28,9 +27,9 @@ import org.bukkit.command.ProxiedCommandSender; import org.bukkit.command.RemoteConsoleCommandSender; import org.bukkit.command.defaults.BukkitCommand; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.entity.CraftMinecartCommand; -import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftMinecartCommand; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.entity.minecart.CommandMinecart; diff --git a/src/main/java/org/bukkit/craftbukkit/conversations/ConversationTracker.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/conversations/ConversationTracker.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/conversations/ConversationTracker.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/conversations/ConversationTracker.java index eefa68a6..0321636d 100644 --- a/src/main/java/org/bukkit/craftbukkit/conversations/ConversationTracker.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/conversations/ConversationTracker.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.conversations; +package org.bukkit.craftbukkit.v1_12_R1.conversations; import java.util.LinkedList; import java.util.logging.Level; diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/enchantments/CraftEnchantment.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/enchantments/CraftEnchantment.java index 5db5ec39..35a7a11a 100644 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/enchantments/CraftEnchantment.java @@ -1,6 +1,6 @@ -package org.bukkit.craftbukkit.enchantments; +package org.bukkit.craftbukkit.v1_12_R1.enchantments; -import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.EnchantmentTarget; import org.bukkit.enchantments.EnchantmentWrapper; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/AbstractProjectile.java similarity index 82% rename from src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/AbstractProjectile.java index 7773624d..02bbaf2c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/AbstractProjectile.java @@ -1,6 +1,6 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Projectile; public abstract class AbstractProjectile extends CraftEntity implements Projectile { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAbstractHorse.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAbstractHorse.java index 62a524a7..1c626229 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAbstractHorse.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import java.util.UUID; import net.minecraft.entity.passive.EntityHorse; import org.apache.commons.lang3.Validate; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.inventory.CraftInventoryAbstractHorse; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryAbstractHorse; import org.bukkit.entity.AbstractHorse; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.Horse; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAgeable.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAgeable.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftAgeable.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAgeable.java index 77c3ff34..93daea04 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAgeable.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAgeable.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.EntityAgeable; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Ageable; public class CraftAgeable extends CraftCreature implements Ageable { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAmbient.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAmbient.java index cf02c6d4..62c04c0e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAmbient.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityAmbientCreature; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Ambient; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAnimals.java similarity index 81% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAnimals.java index 5396d283..ed70a219 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAnimals.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityAnimal; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Animals; public class CraftAnimals extends CraftAgeable implements Animals { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAreaEffectCloud.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAreaEffectCloud.java index 02c9c692..d1434f80 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftAreaEffectCloud.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import java.util.List; @@ -9,9 +9,9 @@ import org.apache.commons.lang3.Validate; import org.bukkit.Color; import org.bukkit.Particle; -import org.bukkit.craftbukkit.CraftParticle; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.potion.CraftPotionUtil; +import org.bukkit.craftbukkit.v1_12_R1.CraftParticle; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.potion.CraftPotionUtil; import org.bukkit.entity.AreaEffectCloud; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftArmorStand.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftArmorStand.java index 35b18633..4250b4f6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftArmorStand.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.util.math.Rotations; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftArrow.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftArrow.java index 076194bf..8224b19e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftArrow.java @@ -1,11 +1,11 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.google.common.base.Preconditions; import net.minecraft.entity.projectile.EntityArrow; import org.apache.commons.lang3.Validate; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Arrow; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftBat.java similarity index 87% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftBat.java index bea942df..30864274 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftBat.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityBat; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Bat; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBlaze.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftBlaze.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftBlaze.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftBlaze.java index a766e19e..f4905076 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBlaze.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftBlaze.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityBlaze; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Blaze; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftBoat.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftBoat.java index 304a6a5b..d553d088 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftBoat.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityBoat; import org.bukkit.TreeSpecies; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Boat; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCaveSpider.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCaveSpider.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftCaveSpider.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCaveSpider.java index 4c0db1b5..dcd8e44d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCaveSpider.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCaveSpider.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityCaveSpider; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.CaveSpider; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftChestedHorse.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftChestedHorse.java similarity index 87% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftChestedHorse.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftChestedHorse.java index 93b67d11..7a5b5b0f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftChestedHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftChestedHorse.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.AbstractChestHorse; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.ChestedHorse; public abstract class CraftChestedHorse extends CraftAbstractHorse implements ChestedHorse { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftChicken.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftChicken.java index 1971f10c..2c0a30ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftChicken.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityChicken; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Chicken; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftComplexLivingEntity.java similarity index 83% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftComplexLivingEntity.java index fe1a6d88..70d76a32 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftComplexLivingEntity.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.EntityLiving; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.ComplexLivingEntity; public abstract class CraftComplexLivingEntity extends CraftLivingEntity implements ComplexLivingEntity { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexPart.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftComplexPart.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftComplexPart.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftComplexPart.java index 325d3316..8d9c018b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexPart.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftComplexPart.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.MultiPartEntityPart; import net.minecraft.entity.boss.EntityDragon; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.ComplexEntityPart; import org.bukkit.entity.ComplexLivingEntity; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCow.java similarity index 83% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCow.java index 5748e3cd..e0c7e63e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCow.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityCow; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Cow; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCreature.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCreature.java index 4ed8b455..0ae4648c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCreature.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.EntityCreature; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Creature; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCreeper.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCreeper.java index 66d586f7..0f89a4d9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCreeper.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.google.common.base.Preconditions; import net.minecraft.entity.monster.EntityCreeper; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Creeper; import org.bukkit.entity.EntityType; import org.bukkit.event.entity.CreeperPowerEvent; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCustomEntity.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCustomEntity.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftCustomEntity.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCustomEntity.java index fdf27e8d..659105fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCustomEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCustomEntity.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.Entity; import net.minecraftforge.fml.common.registry.EntityRegistry; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; public class CraftCustomEntity extends CraftEntity { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCustomProjectile.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCustomProjectile.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftCustomProjectile.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCustomProjectile.java index d0f92987..de1b2bf9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCustomProjectile.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftCustomProjectile.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.mojang.authlib.GameProfile; import net.minecraft.entity.Entity; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Projectile; import org.bukkit.projectiles.ProjectileSource; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDonkey.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftDonkey.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftDonkey.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftDonkey.java index c0533bea..f87af029 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDonkey.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftDonkey.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityDonkey; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Donkey; import org.bukkit.entity.EntityType; import org.bukkit.entity.Horse.Variant; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDragonFireball.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftDragonFireball.java similarity index 81% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftDragonFireball.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftDragonFireball.java index f8194510..00974e99 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDragonFireball.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftDragonFireball.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntityDragonFireball; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.DragonFireball; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEgg.java similarity index 83% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEgg.java index 7d2b0ad9..960aaffc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEgg.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntityEgg; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Egg; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftElderGuardian.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftElderGuardian.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftElderGuardian.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftElderGuardian.java index 5990d157..dd27518f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftElderGuardian.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftElderGuardian.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityElderGuardian; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.ElderGuardian; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderCrystal.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderCrystal.java index 509055b7..745e84fe 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderCrystal.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.util.math.BlockPos; import org.bukkit.Location; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EnderCrystal; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderDragon.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderDragon.java index a1c07a53..b665323c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderDragon.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; @@ -8,7 +8,7 @@ import net.minecraft.entity.MultiPartEntityPart; import net.minecraft.entity.boss.EntityDragon; import net.minecraft.entity.boss.dragon.phase.PhaseList; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.ComplexEntityPart; import org.bukkit.entity.EnderDragon; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragonPart.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderDragonPart.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragonPart.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderDragonPart.java index d26b87ec..8a0e0467 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragonPart.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderDragonPart.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.MultiPartEntityPart; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EnderDragon; import org.bukkit.entity.EnderDragonPart; import org.bukkit.entity.Entity; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderPearl.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderPearl.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftEnderPearl.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderPearl.java index 1e4885f0..92e204a6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderPearl.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderPearl.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityEnderPearl; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EnderPearl; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderSignal.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderSignal.java index 124a036c..755f4f24 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderSignal.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.google.common.base.Preconditions; import net.minecraft.entity.item.EntityEnderEye; import net.minecraft.util.math.BlockPos; import org.bukkit.Location; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EnderSignal; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderman.java similarity index 87% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderman.java index efbd706a..88906a6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEnderman.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.monster.EntityEnderman; import org.bukkit.Material; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Enderman; import org.bukkit.entity.EntityType; import org.bukkit.material.MaterialData; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEndermite.java similarity index 83% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEndermite.java index eba1f4f5..879b2d74 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEndermite.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityEndermite; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Endermite; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEntity.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEntity.java index bc7a5e6c..01f85667 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEntity.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -94,8 +94,8 @@ import org.bukkit.Server; import org.bukkit.World; import org.bukkit.block.PistonMoveReaction; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.metadata.MetadataValue; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEvoker.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEvoker.java index bf61dcb8..a61fd689 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEvoker.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityEvoker; import net.minecraft.entity.monster.EntitySpellcasterIllager; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Evoker; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvokerFangs.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEvokerFangs.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftEvokerFangs.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEvokerFangs.java index 48504fcb..3daabe7b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvokerFangs.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftEvokerFangs.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityEvokerFangs; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.EvokerFangs; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftExperienceOrb.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftExperienceOrb.java index 186d117a..e7488ad7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftExperienceOrb.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityXPOrb; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.ExperienceOrb; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFallingBlock.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFallingBlock.java index d6e1b7ea..ec096305 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFallingBlock.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityFallingBlock; import org.bukkit.Material; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.FallingBlock; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFireball.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFireball.java index 36e8f546..fbd76558 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFireball.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntityFireball; import net.minecraft.util.math.MathHelper; import org.apache.commons.lang3.Validate; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Fireball; import org.bukkit.projectiles.ProjectileSource; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFirework.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFirework.java index 6dbbd218..ba50d3dc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFirework.java @@ -1,11 +1,11 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityFireworkRocket; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import org.bukkit.Material; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; import org.bukkit.entity.EntityType; import org.bukkit.entity.Firework; import org.bukkit.inventory.meta.FireworkMeta; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFish.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFish.java index 1b3d3ea2..52edbeb9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFish.java @@ -1,11 +1,11 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityFishHook; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import org.apache.commons.lang3.Validate; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Fish; import org.bukkit.projectiles.ProjectileSource; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFlying.java similarity index 81% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFlying.java index 8ab0ced7..634704a6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftFlying.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.EntityFlying; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Flying; public class CraftFlying extends CraftLivingEntity implements Flying { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGhast.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGhast.java index 23e5e28b..5d174cb7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGhast.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityGhast; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Ghast; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGiant.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGiant.java index 23bc1a9f..19c95fda 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGiant.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityGiantZombie; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Giant; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGolem.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGolem.java similarity index 81% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftGolem.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGolem.java index 450f54ab..935928b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGolem.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGolem.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityGolem; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Golem; public class CraftGolem extends CraftCreature implements Golem { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGuardian.java similarity index 87% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGuardian.java index 21d58fd8..621c44fb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftGuardian.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityGuardian; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Guardian; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHanging.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHanging.java index 42d9b440..55d26ab8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHanging.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.EntityHanging; import net.minecraft.util.EnumFacing; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Hanging; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHorse.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHorse.java index 9ef880e8..fde0745e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHorse.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityHorse; import org.apache.commons.lang3.Validate; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.inventory.CraftInventoryHorse; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryHorse; import org.bukkit.entity.EntityType; import org.bukkit.entity.Horse; import org.bukkit.inventory.HorseInventory; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHumanEntity.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHumanEntity.java index cfde7c1b..5bc11b36 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHumanEntity.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.google.common.base.Preconditions; @@ -34,6 +34,8 @@ import net.minecraft.util.text.TextComponentString; import org.bukkit.GameMode; import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; import org.bukkit.inventory.MainHand; import org.bukkit.inventory.Merchant; import org.bukkit.Material; @@ -45,21 +47,20 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.craftbukkit.inventory.CraftContainer; -import org.bukkit.craftbukkit.inventory.CraftInventory; -import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer; -import org.bukkit.craftbukkit.inventory.CraftInventoryView; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.inventory.CraftMerchant; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftContainer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMerchant; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.inventory.EntityEquipment; import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.Plugin; +import org.bukkit.craftbukkit.v1_12_R1.inventory.InventoryWrapper; public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { private CraftInventoryPlayer inventory; @@ -213,7 +214,7 @@ public InventoryView openInventory(Inventory inventory) { InventoryType type = inventory.getType(); Container formerContainer = getHandle().inventoryContainer; - IInventory iinventory = (inventory instanceof CraftInventory) ? ((CraftInventory) inventory).getInventory() : new org.bukkit.craftbukkit.inventory.InventoryWrapper(inventory); + IInventory iinventory = (inventory instanceof CraftInventory) ? ((CraftInventory) inventory).getInventory() : new InventoryWrapper(inventory); switch (type) { case PLAYER: diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHusk.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHusk.java similarity index 81% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftHusk.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHusk.java index f8aa4f29..7426139a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHusk.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftHusk.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityHusk; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Husk; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllager.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftIllager.java similarity index 82% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftIllager.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftIllager.java index 4bd01d87..33f987c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllager.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftIllager.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.AbstractIllager; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Illager; public class CraftIllager extends CraftMonster implements Illager { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftIllusioner.java similarity index 86% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftIllusioner.java index 7d3b17c8..fcfcf3bd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftIllusioner.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityIllusionIllager; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Illusioner; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftIronGolem.java similarity index 88% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftIronGolem.java index 65c353a0..b98a0568 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftIronGolem.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityIronGolem; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.IronGolem; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftItem.java similarity index 86% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftItem.java index d0d28627..0af8780c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftItem.java @@ -1,12 +1,12 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import org.bukkit.entity.EntityType; import org.bukkit.entity.Item; import org.bukkit.inventory.ItemStack; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; public class CraftItem extends CraftEntity implements Item { private final EntityItem item; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftItemFrame.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftItemFrame.java index 226fd621..fbd72642 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftItemFrame.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.item.ItemStack; @@ -9,9 +9,9 @@ import org.bukkit.Rotation; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; import org.bukkit.entity.EntityType; import org.bukkit.entity.ItemFrame; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLargeFireball.java similarity index 88% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLargeFireball.java index 8bec7381..068a7407 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLargeFireball.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntityLargeFireball; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.LargeFireball; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLeash.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLeash.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftLeash.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLeash.java index dcc58e53..fb5f2cda 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLeash.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLeash.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.EntityLeashKnot; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.LeashHitch; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLightningStrike.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLightningStrike.java index 57a520f3..4ad1640f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLightningStrike.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.effect.EntityLightningBolt; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.LightningStrike; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLingeringPotion.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLingeringPotion.java similarity index 87% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftLingeringPotion.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLingeringPotion.java index 93b7aa48..650c53bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLingeringPotion.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLingeringPotion.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntityPotion; import org.apache.commons.lang3.Validate; import org.bukkit.Material; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; import org.bukkit.entity.EntityType; import org.bukkit.entity.LingeringPotion; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLivingEntity.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLivingEntity.java index dc3e63b6..35937564 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLivingEntity.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import java.util.ArrayList; import java.util.Collection; @@ -39,11 +39,11 @@ import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.inventory.CraftEntityEquipment; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.potion.CraftPotionUtil; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftEntityEquipment; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.potion.CraftPotionUtil; import org.bukkit.entity.Arrow; import org.bukkit.entity.DragonFireball; import org.bukkit.entity.Egg; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLlama.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLlama.java index 374e4365..4f7b2edf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLlama.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.google.common.base.Preconditions; import net.minecraft.entity.passive.EntityLlama; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.inventory.CraftInventoryLlama; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryLlama; import org.bukkit.entity.EntityType; import org.bukkit.entity.Horse; import org.bukkit.entity.Llama; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLlamaSpit.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLlamaSpit.java index db7ff69c..2eee4c75 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftLlamaSpit.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntityLlamaSpit; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.LlamaSpit; import org.bukkit.projectiles.ProjectileSource; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMagmaCube.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMagmaCube.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMagmaCube.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMagmaCube.java index 1a9a4ad8..9c02feb3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMagmaCube.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMagmaCube.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityMagmaCube; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.MagmaCube; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecart.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecart.java index 97ab3417..427d2ce6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecart.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.init.Blocks; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Minecart; import org.bukkit.material.MaterialData; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartChest.java similarity index 82% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartChest.java index 58e866ad..188c84ff 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartChest.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityMinecartChest; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; import org.bukkit.entity.EntityType; import org.bukkit.entity.minecart.StorageMinecart; import org.bukkit.inventory.Inventory; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartCommand.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartCommand.java index 5b2bbde8..a7a2e6f7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartCommand.java @@ -1,11 +1,11 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import java.util.Set; import net.minecraft.entity.item.EntityMinecartCommandBlock; import org.bukkit.Bukkit; import org.bukkit.Server; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.minecart.CommandMinecart; import org.bukkit.permissions.PermissibleBase; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartFurnace.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartFurnace.java index a9186611..d916a5ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartFurnace.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityMinecartFurnace; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.minecart.PoweredMinecart; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartHopper.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartHopper.java index 5d5d2f49..bd416b5a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartHopper.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityMinecartHopper; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; import org.bukkit.entity.EntityType; import org.bukkit.entity.minecart.HopperMinecart; import org.bukkit.inventory.Inventory; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartMobSpawner.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartMobSpawner.java index 0aa75f8e..f4ceb91a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartMobSpawner.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityMinecartMobSpawner; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.minecart.SpawnerMinecart; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartRideable.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartRideable.java similarity index 83% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartRideable.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartRideable.java index 8c8450a0..098288b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartRideable.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartRideable.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityMinecartEmpty; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.minecart.RideableMinecart; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartTNT.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartTNT.java similarity index 83% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartTNT.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartTNT.java index 266ff445..32dbc066 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartTNT.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMinecartTNT.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityMinecartTNT; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.minecart.ExplosiveMinecart; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMonster.java similarity index 81% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMonster.java index 31865be8..cc35b377 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMonster.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityMob; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Monster; public class CraftMonster extends CraftCreature implements Monster { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMule.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMule.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMule.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMule.java index 4b07f30b..d6edaf94 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMule.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMule.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityMule; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Horse.Variant; import org.bukkit.entity.Mule; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMushroomCow.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMushroomCow.java index 93a9a0d5..2cd2ea47 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftMushroomCow.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityMooshroom; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.MushroomCow; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftOcelot.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftOcelot.java similarity index 89% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftOcelot.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftOcelot.java index f0524da9..9785ff61 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftOcelot.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftOcelot.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityOcelot; import org.apache.commons.lang3.Validate; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Ocelot; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPainting.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPainting.java index b92613fc..dbe0857a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPainting.java @@ -1,13 +1,13 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityPainting; import net.minecraft.entity.item.EntityPainting.EnumArt; import net.minecraft.world.WorldServer; import org.bukkit.Art; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.CraftArt; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.CraftArt; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; import org.bukkit.entity.EntityType; import org.bukkit.entity.Painting; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftParrot.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftParrot.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftParrot.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftParrot.java index d3724080..7df642bd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftParrot.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftParrot.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.google.common.base.Preconditions; import net.minecraft.entity.passive.EntityParrot; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Parrot; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPig.java similarity index 87% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPig.java index 46a69d3b..bcb98f08 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPig.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityPig; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Pig; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPigZombie.java similarity index 89% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPigZombie.java index 19bbfc73..f7edd948 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPigZombie.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityPigZombie; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.PigZombie; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPlayer.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPlayer.java index 548181f0..038e2f6e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPlayer.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; @@ -81,22 +81,23 @@ import org.bukkit.conversations.Conversation; import org.bukkit.conversations.ConversationAbandonedEvent; import org.bukkit.conversations.ManuallyAbandonedConversationCanceller; -import org.bukkit.craftbukkit.CraftParticle; -import org.bukkit.craftbukkit.block.CraftSign; -import org.bukkit.craftbukkit.conversations.ConversationTracker; -import org.bukkit.craftbukkit.CraftEffect; -import org.bukkit.craftbukkit.CraftOfflinePlayer; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftSound; -import org.bukkit.craftbukkit.CraftStatistic; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.advancement.CraftAdvancement; -import org.bukkit.craftbukkit.advancement.CraftAdvancementProgress; -import org.bukkit.craftbukkit.map.CraftMapView; -import org.bukkit.craftbukkit.map.RenderData; -import org.bukkit.craftbukkit.scoreboard.CraftScoreboard; -import org.bukkit.craftbukkit.util.CraftChatMessage; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftSign; +import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.CraftParticle; +import org.bukkit.craftbukkit.v1_12_R1.conversations.ConversationTracker; +import org.bukkit.craftbukkit.v1_12_R1.CraftEffect; +import org.bukkit.craftbukkit.v1_12_R1.CraftOfflinePlayer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftSound; +import org.bukkit.craftbukkit.v1_12_R1.CraftStatistic; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.advancement.CraftAdvancement; +import org.bukkit.craftbukkit.v1_12_R1.advancement.CraftAdvancementProgress; +import org.bukkit.craftbukkit.v1_12_R1.map.CraftMapView; +import org.bukkit.craftbukkit.v1_12_R1.map.RenderData; +import org.bukkit.craftbukkit.v1_12_R1.scoreboard.CraftScoreboard; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerRegisterChannelEvent; @@ -111,6 +112,7 @@ import org.bukkit.scoreboard.Scoreboard; import javax.annotation.Nullable; + import org.spigotmc.AsyncCatcher; import org.spigotmc.SpigotConfig; @@ -997,7 +999,7 @@ public int applyMending(int amount) { orb.posY = handle.posY; orb.posZ = handle.posZ; int i = Math.min(orb.xpToDurability(amount), itemstack.getItemDamage()); - org.bukkit.event.player.PlayerItemMendEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemMendEvent(handle, orb, itemstack, i); + org.bukkit.event.player.PlayerItemMendEvent event = CraftEventFactory.callPlayerItemMendEvent(handle, orb, itemstack, i); i = event.getRepairAmount(); orb.isDead = true; if (!event.isCancelled()) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPolarBear.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPolarBear.java index d6f222ab..7ea9a7f5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftPolarBear.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityPolarBear; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.PolarBear; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftProjectile.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftProjectile.java index b9e70b83..fdf5779e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftProjectile.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.projectile.EntityThrowable; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Projectile; import org.bukkit.projectiles.ProjectileSource; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftRabbit.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftRabbit.java index fe60d245..62c221ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftRabbit.java @@ -1,12 +1,12 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.ai.EntityAITasks; import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.world.World; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Rabbit; -import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; public class CraftRabbit extends CraftAnimals implements Rabbit { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSheep.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSheep.java index c527b890..663759c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSheep.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; import org.bukkit.DyeColor; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Sheep; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftShulker.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftShulker.java index 7fc1daeb..b80171ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftShulker.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.google.common.base.Preconditions; import net.minecraft.entity.monster.EntityShulker; import org.bukkit.DyeColor; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Shulker; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftShulkerBullet.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftShulkerBullet.java index 633e5b40..01cda483 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftShulkerBullet.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntityShulkerBullet; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.ShulkerBullet; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSilverfish.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSilverfish.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSilverfish.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSilverfish.java index 952e6d1b..59fb1475 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSilverfish.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSilverfish.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntitySilverfish; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Silverfish; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSkeleton.java similarity index 89% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSkeleton.java index fc57ba99..30a207e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSkeleton.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.AbstractSkeleton; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Skeleton; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSkeletonHorse.java similarity index 86% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSkeletonHorse.java index 46fdf81d..170186f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSkeletonHorse.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntitySkeletonHorse; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Horse.Variant; import org.bukkit.entity.SkeletonHorse; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSlime.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSlime.java index 49675cad..c05fec53 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSlime.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntitySlime; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Slime; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSmallFireball.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSmallFireball.java similarity index 86% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSmallFireball.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSmallFireball.java index 8a5a6795..e1b61a41 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSmallFireball.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSmallFireball.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntitySmallFireball; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.SmallFireball; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSnowball.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSnowball.java index 409c4264..6fe75d52 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSnowball.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntitySnowball; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Snowball; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSnowman.java similarity index 88% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSnowman.java index 9e893071..52faa06f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSnowman.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntitySnowman; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Snowman; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSpectralArrow.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSpectralArrow.java similarity index 89% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSpectralArrow.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSpectralArrow.java index 8c7af562..3232f2f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSpectralArrow.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSpectralArrow.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntitySpectralArrow; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.SpectralArrow; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSpellcaster.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSpellcaster.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSpellcaster.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSpellcaster.java index d227ff60..3b611b3b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSpellcaster.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSpellcaster.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import com.google.common.base.Preconditions; import net.minecraft.entity.monster.EntitySpellcasterIllager; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Spellcaster; public class CraftSpellcaster extends CraftIllager implements Spellcaster { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSpider.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSpider.java index b6bde570..dac7eae9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSpider.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntitySpider; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Spider; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSplashPotion.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSplashPotion.java similarity index 87% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSplashPotion.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSplashPotion.java index dc244d96..3337b0c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSplashPotion.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSplashPotion.java @@ -1,10 +1,10 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntityPotion; import org.apache.commons.lang3.Validate; import org.bukkit.Material; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; import org.bukkit.entity.EntityType; import org.bukkit.entity.SplashPotion; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSquid.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSquid.java index 0eb8fbf9..4c21be3d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftSquid.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntitySquid; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Squid; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftStray.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftStray.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftStray.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftStray.java index 4b0e542f..32ce0701 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftStray.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftStray.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityStray; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Stray; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftTNTPrimed.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftTNTPrimed.java index ebbb47a8..11ea2322 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftTNTPrimed.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityTNTPrimed; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.TNTPrimed; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftTameableAnimal.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftTameableAnimal.java index 33109a6b..b28d62f7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftTameableAnimal.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityTameable; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.Creature; import org.bukkit.entity.Tameable; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownExpBottle.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftThrownExpBottle.java similarity index 86% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftThrownExpBottle.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftThrownExpBottle.java index 052113ab..689848c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownExpBottle.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftThrownExpBottle.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.item.EntityExpBottle; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.ThrownExpBottle; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftThrownPotion.java similarity index 82% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftThrownPotion.java index 6c8ef903..abf5b5b4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftThrownPotion.java @@ -1,12 +1,12 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import java.util.Collection; import net.minecraft.entity.projectile.EntityPotion; import net.minecraft.potion.PotionUtils; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.potion.CraftPotionUtil; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.potion.CraftPotionUtil; import org.bukkit.entity.ThrownPotion; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftTippedArrow.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftTippedArrow.java index b51738a7..1aae6f7e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftTippedArrow.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import java.util.List; @@ -6,8 +6,8 @@ import net.minecraft.potion.Potion; import org.apache.commons.lang3.Validate; import org.bukkit.Color; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.potion.CraftPotionUtil; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.potion.CraftPotionUtil; import org.bukkit.entity.EntityType; import org.bukkit.entity.TippedArrow; import org.bukkit.potion.PotionData; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVehicle.java similarity index 77% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVehicle.java index 2202fb48..9ac2bb00 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVehicle.java @@ -1,6 +1,6 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Vehicle; public abstract class CraftVehicle extends CraftEntity implements Vehicle { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVex.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVex.java index d0334c02..a673ec1a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVex.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityVex; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Vex; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVillager.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVillager.java index 8aa23ac4..c88f8938 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVillager.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import java.util.HashMap; import java.util.List; @@ -7,9 +7,9 @@ import net.minecraft.entity.passive.EntityVillager; import org.apache.commons.lang3.Validate; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.inventory.CraftInventory; -import org.bukkit.craftbukkit.inventory.CraftMerchant; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMerchant; import org.bukkit.entity.EntityType; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Villager; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVillagerZombie.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVillagerZombie.java index 04e1b875..90331089 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVillagerZombie.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityZombieVillager; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Villager; import org.bukkit.entity.ZombieVillager; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVindicator.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVindicator.java index 352e088d..529b1710 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftVindicator.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityVindicator; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Vindicator; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWaterMob.java similarity index 82% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWaterMob.java index ff80170d..2fdcdfb7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWaterMob.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityWaterMob; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.WaterMob; public class CraftWaterMob extends CraftLivingEntity implements WaterMob { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWeather.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWeather.java similarity index 85% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftWeather.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWeather.java index 8af0f7d6..e1b05562 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWeather.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWeather.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.effect.EntityWeatherEffect; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Weather; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWitch.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWitch.java index be9a59be..ae956d7f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWitch.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityWitch; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Witch; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWither.java similarity index 84% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWither.java index cd7469f2..da6d9a42 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWither.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.boss.EntityWither; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Wither; import org.bukkit.entity.EntityType; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkeleton.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWitherSkeleton.java similarity index 86% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkeleton.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWitherSkeleton.java index 0e9939c7..575eba34 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkeleton.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWitherSkeleton.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityWitherSkeleton; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.WitherSkeleton; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkull.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWitherSkull.java similarity index 89% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkull.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWitherSkull.java index 7f71b167..0007f04e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWitherSkull.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.projectile.EntityWitherSkull; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.WitherSkull; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWolf.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWolf.java index 38a680dd..83895175 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftWolf.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.item.EnumDyeColor; import org.bukkit.DyeColor; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Wolf; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftZombie.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftZombie.java index d24ac76a..ca5f9415 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftZombie.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.monster.EntityZombieVillager; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Villager; import org.bukkit.entity.Zombie; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombieHorse.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftZombieHorse.java similarity index 86% rename from src/main/java/org/bukkit/craftbukkit/entity/CraftZombieHorse.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftZombieHorse.java index 989e7bc6..27ffc529 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombieHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/entity/CraftZombieHorse.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.entity; +package org.bukkit.craftbukkit.v1_12_R1.entity; import net.minecraft.entity.passive.EntityZombieHorse; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Horse.Variant; import org.bukkit.entity.ZombieHorse; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/event/CraftEventFactory.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/event/CraftEventFactory.java index c26a64c5..65bf0fe7 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/event/CraftEventFactory.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.event; +package org.bukkit.craftbukkit.v1_12_R1.event; import com.destroystokyo.paper.event.entity.EntityZapEvent; import com.google.common.base.Function; @@ -44,19 +44,20 @@ import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.BlockState; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftStatistic; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.block.CraftBlock; -import org.bukkit.craftbukkit.block.CraftBlockState; -import org.bukkit.craftbukkit.entity.CraftEntity; -import org.bukkit.craftbukkit.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.entity.CraftPlayer; -import org.bukkit.craftbukkit.inventory.CraftInventoryCrafting; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.inventory.CraftMetaBook; -import org.bukkit.craftbukkit.util.CraftDamageSource; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlockState; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftDamageSource; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftSound; +import org.bukkit.craftbukkit.v1_12_R1.CraftStatistic; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventoryCrafting; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMetaBook; import org.bukkit.entity.*; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; @@ -485,7 +486,7 @@ private static void populateFields(EntityLivingBase victim, EntityDeathEvent eve event.setReviveHealth(event.getEntity().getAttribute(org.bukkit.attribute.Attribute.GENERIC_MAX_HEALTH).getValue()); event.setShouldPlayDeathSound(!victim.silentDeath && !victim.isSilent()); SoundEvent soundEffect = victim.getDeathSoundEffect(); - event.setDeathSound(soundEffect != null ? org.bukkit.craftbukkit.CraftSound.getSoundByEffect(soundEffect) : null); + event.setDeathSound(soundEffect != null ? CraftSound.getSoundByEffect(soundEffect) : null); event.setDeathSoundCategory(org.bukkit.SoundCategory.valueOf(victim.getSoundCategory().name())); event.setDeathSoundVolume(victim.getDeathSoundVolume()); event.setDeathSoundPitch(victim.getDeathSoundPitch()); @@ -498,7 +499,7 @@ private static void playDeathSound(EntityLivingBase victim, EntityDeathEvent eve double x = event.getEntity().getLocation().getX(); double y = event.getEntity().getLocation().getY(); double z = event.getEntity().getLocation().getZ(); - SoundEvent soundEffect = org.bukkit.craftbukkit.CraftSound.getSoundEffect(event.getDeathSound()); + SoundEvent soundEffect = CraftSound.getSoundEffect(event.getDeathSound()); SoundCategory soundCategory = SoundCategory.valueOf(event.getDeathSoundCategory().name()); victim.world.playSound(source, x, y, z, soundEffect, soundCategory, event.getDeathSoundVolume(), event.getDeathSoundPitch()); } diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/CraftChunkData.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/CraftChunkData.java index 01264a7e..90323be7 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/CraftChunkData.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.bukkit.craftbukkit.generator; +package org.bukkit.craftbukkit.v1_12_R1.generator; import java.util.Arrays; import org.bukkit.Material; diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/CustomChunkGenerator.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/CustomChunkGenerator.java index d231d344..f0a1cc39 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/CustomChunkGenerator.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.generator; +package org.bukkit.craftbukkit.v1_12_R1.generator; import java.util.List; import java.util.Random; @@ -13,9 +13,9 @@ import net.minecraft.world.chunk.storage.ExtendedBlockStorage; import net.minecraft.world.gen.structure.MapGenStronghold; import org.bukkit.block.Biome; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlock; import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.ChunkGenerator; -import org.bukkit.craftbukkit.block.CraftBlock; public class CustomChunkGenerator extends InternalChunkGenerator { private final ChunkGenerator generator; diff --git a/src/main/java/org/bukkit/craftbukkit/generator/InternalChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/InternalChunkGenerator.java similarity index 83% rename from src/main/java/org/bukkit/craftbukkit/generator/InternalChunkGenerator.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/InternalChunkGenerator.java index f329eedf..aa9d2370 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/InternalChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/InternalChunkGenerator.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.generator; +package org.bukkit.craftbukkit.v1_12_R1.generator; import net.minecraft.world.gen.IChunkGenerator; import org.bukkit.generator.ChunkGenerator; diff --git a/src/main/java/org/bukkit/craftbukkit/generator/NetherChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/NetherChunkGenerator.java similarity index 82% rename from src/main/java/org/bukkit/craftbukkit/generator/NetherChunkGenerator.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/NetherChunkGenerator.java index 20cf3799..5777cc58 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/NetherChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/NetherChunkGenerator.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.generator; +package org.bukkit.craftbukkit.v1_12_R1.generator; import net.minecraft.world.World; diff --git a/src/main/java/org/bukkit/craftbukkit/generator/NormalChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/NormalChunkGenerator.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/generator/NormalChunkGenerator.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/NormalChunkGenerator.java index cd69abf0..3d20aabe 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/NormalChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/NormalChunkGenerator.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.generator; +package org.bukkit.craftbukkit.v1_12_R1.generator; import java.util.ArrayList; import java.util.List; @@ -11,7 +11,7 @@ import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.gen.IChunkGenerator; -import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; import org.bukkit.generator.BlockPopulator; public class NormalChunkGenerator extends InternalChunkGenerator { diff --git a/src/main/java/org/bukkit/craftbukkit/generator/SkyLandsChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/SkyLandsChunkGenerator.java similarity index 82% rename from src/main/java/org/bukkit/craftbukkit/generator/SkyLandsChunkGenerator.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/SkyLandsChunkGenerator.java index fca430f0..902c3975 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/SkyLandsChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/generator/SkyLandsChunkGenerator.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.generator; +package org.bukkit.craftbukkit.v1_12_R1.generator; import net.minecraft.world.World; diff --git a/src/main/java/org/bukkit/craftbukkit/help/CommandAliasHelpTopic.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/CommandAliasHelpTopic.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/help/CommandAliasHelpTopic.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/CommandAliasHelpTopic.java index 928a2dfd..3272fbac 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/CommandAliasHelpTopic.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/CommandAliasHelpTopic.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.help; +package org.bukkit.craftbukkit.v1_12_R1.help; import org.apache.commons.lang3.Validate; import org.bukkit.ChatColor; diff --git a/src/main/java/org/bukkit/craftbukkit/help/CustomHelpTopic.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/CustomHelpTopic.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/help/CustomHelpTopic.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/CustomHelpTopic.java index 6dee2296..bef9c170 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/CustomHelpTopic.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/CustomHelpTopic.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.help; +package org.bukkit.craftbukkit.v1_12_R1.help; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; diff --git a/src/main/java/org/bukkit/craftbukkit/help/CustomIndexHelpTopic.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/CustomIndexHelpTopic.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/help/CustomIndexHelpTopic.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/CustomIndexHelpTopic.java index 2089a5f5..df5a6b77 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/CustomIndexHelpTopic.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/CustomIndexHelpTopic.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.help; +package org.bukkit.craftbukkit.v1_12_R1.help; import org.bukkit.command.CommandSender; import org.bukkit.help.HelpMap; diff --git a/src/main/java/org/bukkit/craftbukkit/help/HelpTopicAmendment.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/HelpTopicAmendment.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/help/HelpTopicAmendment.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/HelpTopicAmendment.java index 4f0e00ec..65096503 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/HelpTopicAmendment.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/HelpTopicAmendment.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.help; +package org.bukkit.craftbukkit.v1_12_R1.help; /** * A HelpTopicAmendment represents the contents of a topic amendment from the help.yml diff --git a/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/HelpYamlReader.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/HelpYamlReader.java index 60a6221b..6de9baac 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/HelpYamlReader.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.help; +package org.bukkit.craftbukkit.v1_12_R1.help; import org.bukkit.ChatColor; import org.bukkit.Server; diff --git a/src/main/java/org/bukkit/craftbukkit/help/MultipleCommandAliasHelpTopic.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/MultipleCommandAliasHelpTopic.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/help/MultipleCommandAliasHelpTopic.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/MultipleCommandAliasHelpTopic.java index 6f4b22b9..c4cc1eba 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/MultipleCommandAliasHelpTopic.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/MultipleCommandAliasHelpTopic.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.help; +package org.bukkit.craftbukkit.v1_12_R1.help; import org.bukkit.ChatColor; import org.bukkit.command.Command; diff --git a/src/main/java/org/bukkit/craftbukkit/help/MultipleCommandAliasHelpTopicFactory.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/MultipleCommandAliasHelpTopicFactory.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/help/MultipleCommandAliasHelpTopicFactory.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/MultipleCommandAliasHelpTopicFactory.java index 36ddc976..b05627b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/MultipleCommandAliasHelpTopicFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/MultipleCommandAliasHelpTopicFactory.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.help; +package org.bukkit.craftbukkit.v1_12_R1.help; import org.bukkit.command.MultipleCommandAlias; import org.bukkit.help.HelpTopic; diff --git a/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/SimpleHelpMap.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/SimpleHelpMap.java index c7daccd5..aa006494 100644 --- a/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/help/SimpleHelpMap.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.help; +package org.bukkit.craftbukkit.v1_12_R1.help; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -6,8 +6,8 @@ import org.bukkit.command.*; import org.bukkit.command.defaults.BukkitCommand; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.command.VanillaCommandWrapper; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.command.VanillaCommandWrapper; import org.bukkit.help.*; import java.util.*; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftContainer.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftContainer.java index f972e96a..8dd2199d 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftContainer.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.SPacketOpenWindow; import net.minecraft.util.text.TextComponentString; -import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftCustomModRecipe.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftCustomModRecipe.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftCustomModRecipe.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftCustomModRecipe.java index ffd689cc..4a8098d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftCustomModRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftCustomModRecipe.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.item.crafting.IRecipe; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftEntityEquipment.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftEntityEquipment.java index cc87d8a8..e34e593c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftEntityEquipment.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.entity.EntityLiving; import net.minecraft.inventory.EntityEquipmentSlot; -import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftLivingEntity; import org.bukkit.entity.Entity; import org.bukkit.inventory.EntityEquipment; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftFurnaceRecipe.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftFurnaceRecipe.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftFurnaceRecipe.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftFurnaceRecipe.java index 9ce5fc2e..9a2e8716 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftFurnaceRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftFurnaceRecipe.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.item.crafting.FurnaceRecipes; import org.bukkit.inventory.FurnaceRecipe; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventory.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventory.java index dfec100f..d9b96277 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventory.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryAbstractHorse.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryAbstractHorse.java index 977c30fa..46de2418 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryAbstractHorse.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.inventory.IInventory; import org.bukkit.inventory.AbstractHorseInventory; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryAnvil.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryAnvil.java index 067459ff..c1d59b97 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryAnvil.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.inventory.ContainerRepair; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryBeacon.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryBeacon.java similarity index 89% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryBeacon.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryBeacon.java index e471f752..a10df8b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryBeacon.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryBeacon.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.tileentity.TileEntityBeacon; import org.bukkit.inventory.BeaconInventory; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryBrewer.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryBrewer.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryBrewer.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryBrewer.java index ee365618..7b0c4b68 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryBrewer.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryBrewer.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.inventory.IInventory; import org.bukkit.block.BrewingStand; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryCrafting.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryCrafting.java index edd1a649..c857cfe8 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryCrafting.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryCustom.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryCustom.java index a0e0f361..bbe4fcbf 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryCustom.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.ArrayList; import java.util.Iterator; @@ -13,7 +13,7 @@ import net.minecraft.util.text.TextComponentString; import org.apache.commons.lang3.Validate; import org.bukkit.Location; -import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.InventoryHolder; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryDoubleChest.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryDoubleChest.java index b4f4c51a..adf7ddc8 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryDoubleChest.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.inventory.InventoryLargeChest; import net.minecraft.world.ILockableContainer; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryEnchanting.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryEnchanting.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryEnchanting.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryEnchanting.java index e589143e..68781893 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryEnchanting.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryEnchanting.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.inventory.IInventory; import org.bukkit.inventory.EnchantingInventory; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryFurnace.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryFurnace.java index 5c6b392a..c58a0b26 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryFurnace.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.tileentity.TileEntityFurnace; import org.bukkit.block.Furnace; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryHorse.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryHorse.java index b5e96762..bc40e29a 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryHorse.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.inventory.IInventory; import org.bukkit.inventory.HorseInventory; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryLlama.java similarity index 90% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryLlama.java index 020382d5..c3245d59 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryLlama.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.inventory.IInventory; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryMerchant.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryMerchant.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryMerchant.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryMerchant.java index b5effd6d..faa20226 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryMerchant.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryMerchant.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.inventory.InventoryMerchant; import org.bukkit.inventory.MerchantInventory; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryPlayer.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryPlayer.java index fa9ee554..cbe27ce0 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryPlayer.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import com.google.common.base.Preconditions; @@ -7,7 +7,7 @@ import net.minecraft.network.play.server.SPacketHeldItemChange; import net.minecraft.network.play.server.SPacketSetSlot; import org.apache.commons.lang3.Validate; -import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.EntityEquipment; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryView.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryView.java index 8052563d..2891e7a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftInventoryView.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.inventory.Container; import org.bukkit.GameMode; -import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType.SlotType; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftItemFactory.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftItemFactory.java index 0c57c67c..5f9da202 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftItemFactory.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.Collection; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftItemStack.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftItemStack.java index be3a85f1..32f7be59 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftItemStack.java @@ -1,8 +1,8 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; -import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS; -import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS_ID; -import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS_LVL; +import static org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMetaItem.ENCHANTMENTS; +import static org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMetaItem.ENCHANTMENTS_ID; +import static org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMetaItem.ENCHANTMENTS_LVL; import java.util.Map; @@ -14,13 +14,13 @@ import org.apache.commons.lang3.Validate; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import com.google.common.collect.ImmutableMap; -import org.bukkit.craftbukkit.enchantments.CraftEnchantment; +import org.bukkit.craftbukkit.v1_12_R1.enchantments.CraftEnchantment; @DelegateDeserialization(ItemStack.class) public final class CraftItemStack extends ItemStack { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchant.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMerchant.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchant.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMerchant.java index 60b773b3..ace5dd69 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchant.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMerchant.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import com.google.common.collect.Lists; import java.util.Collections; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMerchantCustom.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMerchantCustom.java index a9be18d2..ec3d12ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMerchantCustom.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import net.minecraft.entity.IMerchant; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMerchantRecipe.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMerchantRecipe.java index bb626955..0b4a28b4 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMerchantRecipe.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import com.google.common.base.Preconditions; import java.util.List; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBanner.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBanner.java index c2d618b8..9328b781 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBanner.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -12,7 +12,7 @@ import org.bukkit.block.banner.Pattern; import org.bukkit.block.banner.PatternType; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; import org.bukkit.inventory.meta.BannerMeta; @DelegateDeserialization(CraftMetaItem.SerializableMeta.class) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBlockState.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBlockState.java index 309064c6..e4933c60 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBlockState.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; @@ -33,30 +33,30 @@ import org.bukkit.Material; import org.bukkit.block.BlockState; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.block.CraftBanner; -import org.bukkit.craftbukkit.block.CraftBeacon; -import org.bukkit.craftbukkit.block.CraftBlockEntityState; -import org.bukkit.craftbukkit.block.CraftBrewingStand; -import org.bukkit.craftbukkit.block.CraftChest; -import org.bukkit.craftbukkit.block.CraftCommandBlock; -import org.bukkit.craftbukkit.block.CraftComparator; -import org.bukkit.craftbukkit.block.CraftCreatureSpawner; -import org.bukkit.craftbukkit.block.CraftDaylightDetector; -import org.bukkit.craftbukkit.block.CraftDispenser; -import org.bukkit.craftbukkit.block.CraftDropper; -import org.bukkit.craftbukkit.block.CraftEnchantingTable; -import org.bukkit.craftbukkit.block.CraftEndGateway; -import org.bukkit.craftbukkit.block.CraftEnderChest; -import org.bukkit.craftbukkit.block.CraftFlowerPot; -import org.bukkit.craftbukkit.block.CraftFurnace; -import org.bukkit.craftbukkit.block.CraftHopper; -import org.bukkit.craftbukkit.block.CraftJukebox; -import org.bukkit.craftbukkit.block.CraftNoteBlock; -import org.bukkit.craftbukkit.block.CraftShulkerBox; -import org.bukkit.craftbukkit.block.CraftSign; -import org.bukkit.craftbukkit.block.CraftSkull; -import org.bukkit.craftbukkit.block.CraftStructureBlock; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBanner; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBeacon; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlockEntityState; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBrewingStand; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftChest; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftCommandBlock; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftComparator; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftCreatureSpawner; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftDaylightDetector; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftDispenser; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftDropper; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftEnchantingTable; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftEndGateway; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftEnderChest; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftFlowerPot; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftFurnace; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftHopper; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftJukebox; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftNoteBlock; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftShulkerBox; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftSign; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftSkull; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftStructureBlock; import org.bukkit.inventory.meta.BlockStateMeta; @DelegateDeserialization(CraftMetaItem.SerializableMeta.class) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBook.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBook.java index 8e45cce9..f2627870 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBook.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.ArrayList; import java.util.List; @@ -12,15 +12,16 @@ import org.apache.commons.lang3.Validate; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.inventory.meta.BookMeta; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap.Builder; import java.util.AbstractList; -import org.bukkit.craftbukkit.util.CraftChatMessage; + import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.chat.ComponentSerializer; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBookSigned.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBookSigned.java index 5c19760c..b4fefb89 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaBookSigned.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.Map; @@ -8,8 +8,8 @@ import net.minecraft.util.text.ITextComponent; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.inventory.meta.BookMeta; import com.google.common.collect.ImmutableMap.Builder; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCharge.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaCharge.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCharge.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaCharge.java index 3cb4f18a..0639596e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaCharge.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaCharge.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.Map; @@ -6,7 +6,7 @@ import org.bukkit.FireworkEffect; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.inventory.meta.FireworkEffectMeta; import com.google.common.collect.ImmutableMap.Builder; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEnchantedBook.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaEnchantedBook.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEnchantedBook.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaEnchantedBook.java index 7add7be6..90ec6b65 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEnchantedBook.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaEnchantedBook.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.HashMap; import java.util.Map; @@ -6,14 +6,13 @@ import net.minecraft.nbt.NBTTagCompound; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.meta.EnchantmentStorageMeta; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; -@DelegateDeserialization(SerializableMeta.class) +@DelegateDeserialization(CraftMetaItem.SerializableMeta.class) class CraftMetaEnchantedBook extends CraftMetaItem implements EnchantmentStorageMeta { static final ItemMetaKey STORED_ENCHANTMENTS = new ItemMetaKey("StoredEnchantments", "stored-enchants"); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaFirework.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaFirework.java index 8434c91b..d2e95f21 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaFirework.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.ArrayList; import java.util.Collection; @@ -13,16 +13,13 @@ import org.bukkit.FireworkEffect.Type; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.ItemMetaKey.Specific; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.ItemMetaKey.Specific.To; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; import org.bukkit.inventory.meta.FireworkMeta; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap.Builder; -@DelegateDeserialization(SerializableMeta.class) +@DelegateDeserialization(CraftMetaItem.SerializableMeta.class) class CraftMetaFirework extends CraftMetaItem implements FireworkMeta { /* "Fireworks", "Explosion", "Explosions", "Flight", "Type", "Trail", "Flicker", "Colors", "FadeColors"; @@ -39,19 +36,19 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta { ---- IntArray: FadeColors */ - @Specific(To.NBT) + @ItemMetaKey.Specific(ItemMetaKey.Specific.To.NBT) static final ItemMetaKey FIREWORKS = new ItemMetaKey("Fireworks"); static final ItemMetaKey FLIGHT = new ItemMetaKey("Flight", "power"); static final ItemMetaKey EXPLOSIONS = new ItemMetaKey("Explosions", "firework-effects"); - @Specific(To.NBT) + @ItemMetaKey.Specific(ItemMetaKey.Specific.To.NBT) static final ItemMetaKey EXPLOSION_COLORS = new ItemMetaKey("Colors"); - @Specific(To.NBT) + @ItemMetaKey.Specific(ItemMetaKey.Specific.To.NBT) static final ItemMetaKey EXPLOSION_TYPE = new ItemMetaKey("Type"); - @Specific(To.NBT) + @ItemMetaKey.Specific(ItemMetaKey.Specific.To.NBT) static final ItemMetaKey EXPLOSION_TRAIL = new ItemMetaKey("Trail"); - @Specific(To.NBT) + @ItemMetaKey.Specific(ItemMetaKey.Specific.To.NBT) static final ItemMetaKey EXPLOSION_FLICKER = new ItemMetaKey("Flicker"); - @Specific(To.NBT) + @ItemMetaKey.Specific(ItemMetaKey.Specific.To.NBT) static final ItemMetaKey EXPLOSION_FADE = new ItemMetaKey("FadeColors"); private List effects; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaItem.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaItem.java index 709b0d20..9031f68b 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaItem.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -23,9 +23,9 @@ import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.configuration.serialization.SerializableAs; -import org.bukkit.craftbukkit.Overridden; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.ItemMetaKey.Specific; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.Overridden; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMetaItem.ItemMetaKey.Specific; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.meta.ItemMeta; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaKnowledgeBook.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaKnowledgeBook.java index 06465bfc..c4c71403 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaKnowledgeBook.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import com.google.common.collect.ImmutableMap.Builder; import java.util.ArrayList; @@ -11,11 +11,10 @@ import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; -import org.bukkit.craftbukkit.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftNamespacedKey; import org.bukkit.inventory.meta.KnowledgeBookMeta; -@DelegateDeserialization(SerializableMeta.class) +@DelegateDeserialization(CraftMetaItem.SerializableMeta.class) public class CraftMetaKnowledgeBook extends CraftMetaItem implements KnowledgeBookMeta { static final ItemMetaKey BOOK_RECIPES = new ItemMetaKey("Recipes"); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaLeatherArmor.java similarity index 88% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaLeatherArmor.java index fa0d25a9..5b771e0f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaLeatherArmor.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaLeatherArmor.java @@ -1,6 +1,4 @@ -package org.bukkit.craftbukkit.inventory; - -import static org.bukkit.craftbukkit.inventory.CraftItemFactory.DEFAULT_LEATHER_COLOR; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.Map; @@ -9,16 +7,15 @@ import org.bukkit.Color; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.inventory.meta.LeatherArmorMeta; import com.google.common.collect.ImmutableMap.Builder; -@DelegateDeserialization(SerializableMeta.class) +@DelegateDeserialization(CraftMetaItem.SerializableMeta.class) class CraftMetaLeatherArmor extends CraftMetaItem implements LeatherArmorMeta { static final ItemMetaKey COLOR = new ItemMetaKey("color"); - private Color color = DEFAULT_LEATHER_COLOR; + private Color color = CraftItemFactory.DEFAULT_LEATHER_COLOR; CraftMetaLeatherArmor(CraftMetaItem meta) { super(meta); @@ -86,11 +83,11 @@ public Color getColor() { } public void setColor(Color color) { - this.color = color == null ? DEFAULT_LEATHER_COLOR : color; + this.color = color == null ? CraftItemFactory.DEFAULT_LEATHER_COLOR : color; } boolean hasColor() { - return !DEFAULT_LEATHER_COLOR.equals(color); + return !CraftItemFactory.DEFAULT_LEATHER_COLOR.equals(color); } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaMap.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaMap.java index 9129ceb5..10840a40 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaMap.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.Map; @@ -8,12 +8,11 @@ import org.bukkit.Color; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.inventory.meta.MapMeta; import com.google.common.collect.ImmutableMap; -@DelegateDeserialization(SerializableMeta.class) +@DelegateDeserialization(CraftMetaItem.SerializableMeta.class) class CraftMetaMap extends CraftMetaItem implements MapMeta { static final ItemMetaKey MAP_SCALING = new ItemMetaKey("map_is_scaling", "scaling"); static final ItemMetaKey MAP_LOC_NAME = new ItemMetaKey("LocName", "display-loc-name"); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaPotion.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaPotion.java index e94eb7f4..510bfc96 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaPotion.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.ArrayList; import java.util.Iterator; @@ -11,19 +11,18 @@ import org.bukkit.Color; import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.potion.CraftPotionUtil; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionType; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; -import org.bukkit.craftbukkit.potion.CraftPotionUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap.Builder; -@DelegateDeserialization(SerializableMeta.class) +@DelegateDeserialization(CraftMetaItem.SerializableMeta.class) class CraftMetaPotion extends CraftMetaItem implements PotionMeta { static final ItemMetaKey AMPLIFIER = new ItemMetaKey("Amplifier", "amplifier"); static final ItemMetaKey AMBIENT = new ItemMetaKey("Ambient", "ambient"); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaSkull.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaSkull.java index 2685952b..d51a9727 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaSkull.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.Map; @@ -12,14 +12,13 @@ import org.bukkit.Material; import org.bukkit.OfflinePlayer; import org.bukkit.configuration.serialization.DelegateDeserialization; -import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; import org.bukkit.inventory.meta.SkullMeta; import com.google.common.collect.ImmutableMap.Builder; import com.mojang.authlib.GameProfile; -@DelegateDeserialization(SerializableMeta.class) +@DelegateDeserialization(CraftMetaItem.SerializableMeta.class) class CraftMetaSkull extends CraftMetaItem implements SkullMeta { @ItemMetaKey.Specific(ItemMetaKey.Specific.To.NBT) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaSpawnEgg.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaSpawnEgg.java index 5bcbf79f..aea92217 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaSpawnEgg.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap.Builder; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftRecipe.java similarity index 70% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftRecipe.java index d3e03e24..31aacc06 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftRecipe.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import org.bukkit.inventory.Recipe; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftShapedRecipe.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftShapedRecipe.java index 0fa1c490..5ec79d41 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftShapedRecipe.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.Map; @@ -7,7 +7,7 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.common.registry.ForgeRegistries; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftNamespacedKey; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapedRecipe; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftShapelessRecipe.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftShapelessRecipe.java index 01e982c2..92b16a87 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/CraftShapelessRecipe.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.List; @@ -7,7 +7,7 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.common.registry.ForgeRegistries; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftNamespacedKey; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapelessRecipe; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/InventoryIterator.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/InventoryIterator.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/inventory/InventoryIterator.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/InventoryIterator.java index e3b5f42a..3a77996f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/InventoryIterator.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/InventoryIterator.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.ListIterator; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/InventoryWrapper.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/InventoryWrapper.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/inventory/InventoryWrapper.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/InventoryWrapper.java index 5425d4f6..48ce0a32 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/InventoryWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/InventoryWrapper.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; @@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import org.bukkit.Location; -import org.bukkit.craftbukkit.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.util.CraftChatMessage; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/RecipeIterator.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/RecipeIterator.java index daab0f8e..6b5f167b 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/inventory/RecipeIterator.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.inventory; +package org.bukkit.craftbukkit.v1_12_R1.inventory; import java.util.Iterator; diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/CraftMapCanvas.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/CraftMapCanvas.java index e59097c8..ee6e88b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/CraftMapCanvas.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.map; +package org.bukkit.craftbukkit.v1_12_R1.map; import java.awt.Image; import java.util.Arrays; diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/CraftMapRenderer.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/CraftMapRenderer.java index ef45215c..879a54d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/CraftMapRenderer.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.map; +package org.bukkit.craftbukkit.v1_12_R1.map; import net.minecraft.world.storage.MapData; import net.minecraft.world.storage.MapDecoration; diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/CraftMapView.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/CraftMapView.java index ccb9cbc3..0c16f5a1 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/CraftMapView.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.map; +package org.bukkit.craftbukkit.v1_12_R1.map; import java.util.ArrayList; import java.util.Arrays; @@ -10,8 +10,8 @@ import net.minecraft.world.storage.MapData; import org.bukkit.Bukkit; import org.bukkit.World; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; import org.bukkit.map.MapRenderer; import org.bukkit.map.MapView; diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/RenderData.java similarity index 86% rename from src/main/java/org/bukkit/craftbukkit/map/RenderData.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/RenderData.java index 256a1317..0be56420 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/map/RenderData.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.map; +package org.bukkit.craftbukkit.v1_12_R1.map; import java.util.ArrayList; import org.bukkit.map.MapCursor; diff --git a/src/main/java/org/bukkit/craftbukkit/metadata/BlockMetadataStore.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/BlockMetadataStore.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/metadata/BlockMetadataStore.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/BlockMetadataStore.java index 544cf1c8..92bec9d1 100644 --- a/src/main/java/org/bukkit/craftbukkit/metadata/BlockMetadataStore.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/BlockMetadataStore.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.metadata; +package org.bukkit.craftbukkit.v1_12_R1.metadata; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/src/main/java/org/bukkit/craftbukkit/metadata/EntityMetadataStore.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/EntityMetadataStore.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/metadata/EntityMetadataStore.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/EntityMetadataStore.java index 35c484f4..ef9f1d22 100644 --- a/src/main/java/org/bukkit/craftbukkit/metadata/EntityMetadataStore.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/EntityMetadataStore.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.metadata; +package org.bukkit.craftbukkit.v1_12_R1.metadata; import org.bukkit.entity.Entity; import org.bukkit.metadata.MetadataStore; diff --git a/src/main/java/org/bukkit/craftbukkit/metadata/PlayerMetadataStore.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/PlayerMetadataStore.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/metadata/PlayerMetadataStore.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/PlayerMetadataStore.java index f4010b3a..32a1cf51 100644 --- a/src/main/java/org/bukkit/craftbukkit/metadata/PlayerMetadataStore.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/PlayerMetadataStore.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.metadata; +package org.bukkit.craftbukkit.v1_12_R1.metadata; import org.bukkit.OfflinePlayer; import org.bukkit.metadata.MetadataStore; diff --git a/src/main/java/org/bukkit/craftbukkit/metadata/WorldMetadataStore.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/WorldMetadataStore.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/metadata/WorldMetadataStore.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/WorldMetadataStore.java index dd37ed29..c6ab5750 100644 --- a/src/main/java/org/bukkit/craftbukkit/metadata/WorldMetadataStore.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/metadata/WorldMetadataStore.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.metadata; +package org.bukkit.craftbukkit.v1_12_R1.metadata; import org.bukkit.World; import org.bukkit.metadata.MetadataStore; diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/potion/CraftPotionBrewer.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/potion/CraftPotionBrewer.java index a61dbd4a..9979e26b 100644 --- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/potion/CraftPotionBrewer.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.potion; +package org.bukkit.craftbukkit.v1_12_R1.potion; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/potion/CraftPotionEffectType.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/potion/CraftPotionEffectType.java index 3213928a..591bcd40 100644 --- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/potion/CraftPotionEffectType.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.potion; +package org.bukkit.craftbukkit.v1_12_R1.potion; import net.minecraft.potion.Potion; import org.bukkit.Color; diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/potion/CraftPotionUtil.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/potion/CraftPotionUtil.java index 7efec186..e67ecee9 100644 --- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/potion/CraftPotionUtil.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.potion; +package org.bukkit.craftbukkit.v1_12_R1.potion; import com.google.common.base.Preconditions; import com.google.common.collect.BiMap; diff --git a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/projectiles/CraftBlockProjectileSource.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/projectiles/CraftBlockProjectileSource.java index 0d7a815d..e03403cb 100644 --- a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/projectiles/CraftBlockProjectileSource.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.projectiles; +package org.bukkit.craftbukkit.v1_12_R1.projectiles; import java.util.Random; @@ -26,8 +26,8 @@ import org.apache.commons.lang3.Validate; import org.bukkit.Material; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.potion.CraftPotionUtil; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.potion.CraftPotionUtil; import org.bukkit.entity.Arrow; import org.bukkit.entity.Egg; import org.bukkit.entity.EnderPearl; diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncDebugger.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftAsyncDebugger.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncDebugger.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftAsyncDebugger.java index d80ae50d..19eade29 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncDebugger.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftAsyncDebugger.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scheduler; +package org.bukkit.craftbukkit.v1_12_R1.scheduler; import org.bukkit.plugin.Plugin; diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftAsyncScheduler.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftAsyncScheduler.java index 2d4ba222..ba11615b 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftAsyncScheduler.java @@ -21,7 +21,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package org.bukkit.craftbukkit.scheduler; +package org.bukkit.craftbukkit.v1_12_R1.scheduler; import com.destroystokyo.paper.ServerSchedulerReportingWrapper; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftAsyncTask.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftAsyncTask.java index fb50a4a7..e3e2dbcf 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftAsyncTask.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scheduler; +package org.bukkit.craftbukkit.v1_12_R1.scheduler; import java.util.Iterator; import java.util.LinkedList; @@ -27,7 +27,7 @@ public boolean isSync() { public void run() { final Thread thread = Thread.currentThread(); synchronized(workers) { - if (getPeriod() == CraftTask.CANCEL) { + if (getPeriod() == CANCEL) { // Never continue running after cancelled. // Checking this with the lock is important! return; @@ -99,7 +99,7 @@ LinkedList getWorkers() { boolean cancel0() { synchronized (workers) { // Synchronizing here prevents race condition for a completing task - setPeriod(CraftTask.CANCEL); + setPeriod(CANCEL); if (workers.isEmpty()) { runners.remove(getTaskId()); } diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftFuture.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftFuture.java similarity index 72% rename from src/main/java/org/bukkit/craftbukkit/scheduler/CraftFuture.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftFuture.java index bb990e51..7ef736af 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftFuture.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftFuture.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scheduler; +package org.bukkit.craftbukkit.v1_12_R1.scheduler; import java.util.concurrent.Callable; import java.util.concurrent.CancellationException; @@ -16,21 +16,21 @@ class CraftFuture extends CraftTask implements Future { private Exception exception = null; CraftFuture(final Callable callable, final Plugin plugin, final int id) { - super(plugin, null, id, CraftTask.NO_REPEATING); + super(plugin, null, id, NO_REPEATING); this.callable = callable; } public synchronized boolean cancel(final boolean mayInterruptIfRunning) { - if (getPeriod() != CraftTask.NO_REPEATING) { + if (getPeriod() != NO_REPEATING) { return false; } - setPeriod(CraftTask.CANCEL); + setPeriod(CANCEL); return true; } public boolean isDone() { final long period = this.getPeriod(); - return period != CraftTask.NO_REPEATING && period != CraftTask.PROCESS_FOR_FUTURE; + return period != NO_REPEATING && period != PROCESS_FOR_FUTURE; } public T get() throws CancellationException, InterruptedException, ExecutionException { @@ -46,10 +46,10 @@ public synchronized T get(long timeout, final TimeUnit unit) throws InterruptedE long period = this.getPeriod(); long timestamp = timeout > 0 ? System.currentTimeMillis() : 0L; while (true) { - if (period == CraftTask.NO_REPEATING || period == CraftTask.PROCESS_FOR_FUTURE) { + if (period == NO_REPEATING || period == PROCESS_FOR_FUTURE) { this.wait(timeout); period = this.getPeriod(); - if (period == CraftTask.NO_REPEATING || period == CraftTask.PROCESS_FOR_FUTURE) { + if (period == NO_REPEATING || period == PROCESS_FOR_FUTURE) { if (timeout == 0L) { continue; } @@ -60,26 +60,26 @@ public synchronized T get(long timeout, final TimeUnit unit) throws InterruptedE throw new TimeoutException(); } } - if (period == CraftTask.CANCEL) { + if (period == CANCEL) { throw new CancellationException(); } - if (period == CraftTask.DONE_FOR_FUTURE) { + if (period == DONE_FOR_FUTURE) { if (exception == null) { return value; } throw new ExecutionException(exception); } - throw new IllegalStateException("Expected " + CraftTask.NO_REPEATING + " to " + CraftTask.DONE_FOR_FUTURE + ", got " + period); + throw new IllegalStateException("Expected " + NO_REPEATING + " to " + DONE_FOR_FUTURE + ", got " + period); } } @Override public void run() { synchronized (this) { - if (getPeriod() == CraftTask.CANCEL) { + if (getPeriod() == CANCEL) { return; } - setPeriod(CraftTask.PROCESS_FOR_FUTURE); + setPeriod(PROCESS_FOR_FUTURE); } try { value = callable.call(); @@ -87,17 +87,17 @@ public void run() { exception = e; } finally { synchronized (this) { - setPeriod(CraftTask.DONE_FOR_FUTURE); + setPeriod(DONE_FOR_FUTURE); this.notifyAll(); } } } synchronized boolean cancel0() { - if (getPeriod() != CraftTask.NO_REPEATING) { + if (getPeriod() != NO_REPEATING) { return false; } - setPeriod(CraftTask.CANCEL); + setPeriod(CANCEL); notifyAll(); return true; } diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftScheduler.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftScheduler.java index bd26c9ca..526c7718 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftScheduler.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scheduler; +package org.bukkit.craftbukkit.v1_12_R1.scheduler; import org.apache.commons.lang3.Validate; import org.bukkit.plugin.IllegalPluginAccessException; diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftTask.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftTask.java index bffaee38..c55c115a 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scheduler/CraftTask.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scheduler; +package org.bukkit.craftbukkit.v1_12_R1.scheduler; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftCriteria.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftCriteria.java index e494a042..39e171aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftCriteria.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scoreboard; +package org.bukkit.craftbukkit.v1_12_R1.scoreboard; import java.util.Map; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftObjective.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftObjective.java index 8936d4e7..63f7518b 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftObjective.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scoreboard; +package org.bukkit.craftbukkit.v1_12_R1.scoreboard; import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.Scoreboard; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScore.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScore.java index ab9db245..fed6bdf7 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScore.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scoreboard; +package org.bukkit.craftbukkit.v1_12_R1.scoreboard; import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.Scoreboard; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboard.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboard.java index 508628e5..9e0f7959 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboard.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scoreboard; +package org.bukkit.craftbukkit.v1_12_R1.scoreboard; import com.google.common.base.Function; import net.minecraft.scoreboard.ScoreObjective; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardComponent.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboardComponent.java similarity index 88% rename from src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardComponent.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboardComponent.java index d26d09d4..d6134289 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardComponent.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboardComponent.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scoreboard; +package org.bukkit.craftbukkit.v1_12_R1.scoreboard; abstract class CraftScoreboardComponent { private CraftScoreboard scoreboard; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboardManager.java similarity index 96% rename from src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboardManager.java index b3164dc4..634298ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboardManager.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scoreboard; +package org.bukkit.craftbukkit.v1_12_R1.scoreboard; import java.util.Collection; import java.util.HashMap; @@ -18,8 +18,8 @@ import net.minecraft.server.MinecraftServer; import org.apache.commons.lang3.Validate; -import org.bukkit.craftbukkit.entity.CraftPlayer; -import org.bukkit.craftbukkit.util.WeakCollection; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.util.WeakCollection; import org.bukkit.entity.Player; import org.bukkit.scoreboard.ScoreboardManager; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboardTranslations.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboardTranslations.java index 35db2f94..cf92da49 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftScoreboardTranslations.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scoreboard; +package org.bukkit.craftbukkit.v1_12_R1.scoreboard; import net.minecraft.scoreboard.Scoreboard; import org.bukkit.scoreboard.DisplaySlot; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftTeam.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftTeam.java index 6bf2f75b..c8af5642 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/scoreboard/CraftTeam.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.scoreboard; +package org.bukkit.craftbukkit.v1_12_R1.scoreboard; import java.util.Set; @@ -7,13 +7,13 @@ import org.apache.commons.lang3.Validate; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage; import org.bukkit.scoreboard.NameTagVisibility; import org.bukkit.scoreboard.Team; import com.google.common.collect.ImmutableSet; import org.bukkit.ChatColor; -import org.bukkit.craftbukkit.util.CraftChatMessage; final class CraftTeam extends CraftScoreboardComponent implements Team { private final ScorePlayerTeam team; diff --git a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/AsynchronousExecutor.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/AsynchronousExecutor.java index 7994c1b2..5830dced 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/AsynchronousExecutor.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.util.HashMap; import java.util.LinkedList; diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/BlockStateListPopulator.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/BlockStateListPopulator.java index d3fc469d..9c8df2af 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/BlockStateListPopulator.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftChatMessage.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftChatMessage.java index 5acf3c2c..b6db4dcf 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftChatMessage.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftDamageSource.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftDamageSource.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/util/CraftDamageSource.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftDamageSource.java index 92f36cb1..332f1adc 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftDamageSource.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftDamageSource.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import net.minecraft.util.DamageSource; diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftIconCache.java similarity index 86% rename from src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftIconCache.java index 1a6e77c4..ea2fa4d8 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftIconCache.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import org.bukkit.util.CachedServerIcon; diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftMagicNumbers.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftMagicNumbers.java index 2cfd0361..e95ef71c 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftMagicNumbers.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import com.google.common.base.Charsets; import com.google.common.collect.Lists; @@ -22,8 +22,8 @@ import org.bukkit.Statistic; import org.bukkit.UnsafeValues; import org.bukkit.advancement.Advancement; -import org.bukkit.craftbukkit.CraftStatistic; -import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_12_R1.CraftStatistic; +import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftItemStack; import org.bukkit.inventory.ItemStack; import org.bukkit.util.StringUtil; diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftNamespacedKey.java similarity index 93% rename from src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftNamespacedKey.java index 08f213c3..bbf88843 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/CraftNamespacedKey.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import net.minecraft.util.ResourceLocation; import org.bukkit.NamespacedKey; diff --git a/src/main/java/org/bukkit/craftbukkit/util/DatFileFilter.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/DatFileFilter.java similarity index 81% rename from src/main/java/org/bukkit/craftbukkit/util/DatFileFilter.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/DatFileFilter.java index 712c44f1..71e5fe48 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/DatFileFilter.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/DatFileFilter.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.io.File; import java.io.FilenameFilter; diff --git a/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/ForwardLogHandler.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/ForwardLogHandler.java index 74ce4b2e..72030cdf 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/ForwardLogHandler.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/HashTreeSet.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/HashTreeSet.java index 80a5c29f..a2a0c210 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/HashTreeSet.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.util.Collection; import java.util.HashSet; diff --git a/src/main/java/org/bukkit/craftbukkit/util/LazyHashSet.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LazyHashSet.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/util/LazyHashSet.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LazyHashSet.java index 2ae000d4..dd5c15e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/LazyHashSet.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LazyHashSet.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/org/bukkit/craftbukkit/util/LazyPlayerSet.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LazyPlayerSet.java similarity index 94% rename from src/main/java/org/bukkit/craftbukkit/util/LazyPlayerSet.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LazyPlayerSet.java index 65181682..9e4d1ec5 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/LazyPlayerSet.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LazyPlayerSet.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/org/bukkit/craftbukkit/util/LongHash.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LongHash.java similarity index 87% rename from src/main/java/org/bukkit/craftbukkit/util/LongHash.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LongHash.java index 691cafd0..bde5a3aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/LongHash.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LongHash.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; public class LongHash { public static long toLong(int msw, int lsw) { diff --git a/src/main/java/org/bukkit/craftbukkit/util/LongHashSet.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LongHashSet.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/util/LongHashSet.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LongHashSet.java index a2135792..4f48e022 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/LongHashSet.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LongHashSet.java @@ -14,7 +14,7 @@ limitations under the License. */ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.util.Arrays; import java.util.Iterator; diff --git a/src/main/java/org/bukkit/craftbukkit/util/LongObjectHashMap.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LongObjectHashMap.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/util/LongObjectHashMap.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LongObjectHashMap.java index 0cd430a3..de3cf88c 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/LongObjectHashMap.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/LongObjectHashMap.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/bukkit/craftbukkit/util/MojangNameLookup.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/MojangNameLookup.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/util/MojangNameLookup.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/MojangNameLookup.java index 93a8f0bd..677c2322 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/MojangNameLookup.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/MojangNameLookup.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import com.google.common.base.Charsets; import com.google.gson.Gson; diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/ServerShutdownThread.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/ServerShutdownThread.java index 9ef32c53..5d2eb80f 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/ServerShutdownThread.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import net.minecraft.server.MinecraftServer; import net.minecraft.world.MinecraftException; diff --git a/src/main/java/org/bukkit/craftbukkit/util/ShortConsoleLogFormatter.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/ShortConsoleLogFormatter.java similarity index 97% rename from src/main/java/org/bukkit/craftbukkit/util/ShortConsoleLogFormatter.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/ShortConsoleLogFormatter.java index 2dbfef96..5eef9024 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ShortConsoleLogFormatter.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/ShortConsoleLogFormatter.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/src/main/java/org/bukkit/craftbukkit/util/StructureGrowDelegate.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/StructureGrowDelegate.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/util/StructureGrowDelegate.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/StructureGrowDelegate.java index c6de9560..c7f1e031 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/StructureGrowDelegate.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/StructureGrowDelegate.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ import net.minecraft.world.World; import org.bukkit.BlockChangeDelegate; import org.bukkit.block.BlockState; -import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; import org.bukkit.material.MaterialData; public class StructureGrowDelegate implements BlockChangeDelegate { diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/TerminalConsoleWriterThread.java similarity index 91% rename from src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/TerminalConsoleWriterThread.java index dd9f4a74..0bba8800 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/TerminalConsoleWriterThread.java @@ -1,9 +1,9 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import com.mojang.util.QueueLogAppender; import jline.console.ConsoleReader; -import org.bukkit.craftbukkit.Main; -import org.bukkit.craftbukkit.command.ColouredConsoleSender; +import org.bukkit.craftbukkit.v1_12_R1.Main; +import org.bukkit.craftbukkit.v1_12_R1.command.ColouredConsoleSender; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/UnsafeList.java similarity index 99% rename from src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/UnsafeList.java index 08d10560..a4529b7c 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/UnsafeList.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/Versioning.java similarity index 50% rename from src/main/java/org/bukkit/craftbukkit/util/Versioning.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/Versioning.java index a50165ad..edcef47a 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/Versioning.java @@ -1,7 +1,7 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; public final class Versioning { public static String getBukkitVersion() { - return "1.12.2-R0.1"; + return "1.12.2-R0.1-SNAPSHOT"; } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/Waitable.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/Waitable.java similarity index 95% rename from src/main/java/org/bukkit/craftbukkit/util/Waitable.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/Waitable.java index 5cd11543..4d5ba455 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Waitable.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/Waitable.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.util.concurrent.ExecutionException; diff --git a/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/WeakCollection.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/WeakCollection.java index 1b781ba8..34396268 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/WeakCollection.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util; +package org.bukkit.craftbukkit.v1_12_R1.util; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/permissions/CommandPermissions.java similarity index 98% rename from src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/permissions/CommandPermissions.java index 71392907..8a85928e 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/permissions/CommandPermissions.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util.permissions; +package org.bukkit.craftbukkit.v1_12_R1.util.permissions; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/permissions/CraftDefaultPermissions.java similarity index 92% rename from src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java rename to src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/permissions/CraftDefaultPermissions.java index a3f534eb..e85c20b2 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_12_R1/util/permissions/CraftDefaultPermissions.java @@ -1,4 +1,4 @@ -package org.bukkit.craftbukkit.util.permissions; +package org.bukkit.craftbukkit.v1_12_R1.util.permissions; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java index bf539628..534379ee 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import org.bukkit.craftbukkit.entity.CraftCustomEntity; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftCustomEntity; import org.bukkit.entity.minecart.CommandMinecart; import org.bukkit.entity.minecart.HopperMinecart; import org.bukkit.entity.minecart.SpawnerMinecart; diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java index 7771f944..bc1bc6ae 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -26,6 +26,7 @@ import org.apache.commons.lang3.Validate; import org.bukkit.plugin.InvalidPluginException; import org.bukkit.plugin.PluginDescriptionFile; +import org.magmafoundation.magma.Magma; import org.magmafoundation.magma.remapper.MagmaRemapper; /** @@ -93,7 +94,7 @@ final class PluginClassLoader extends URLClassLoader { Map relocations = new HashMap<>(); relocations.put("net.minecraft.server", "net.minecraft.server.v1_12_R1"); - jarMapping.loadMappings(new BufferedReader(new InputStreamReader(PluginClassLoader.class.getResourceAsStream("mappings/NMSMappings.srg"))), new MavenShade(relocations), null, false); + jarMapping.loadMappings(new BufferedReader(new InputStreamReader(Magma.class.getClassLoader().getResourceAsStream("mappings/NMSMappings.srg"))), new MavenShade(relocations), null, false); }catch (Exception e){ e.printStackTrace(); } diff --git a/src/main/java/org/magmafoundation/magma/api/PlayerAPI.java b/src/main/java/org/magmafoundation/magma/api/PlayerAPI.java index 90af1fd8..4142df0d 100644 --- a/src/main/java/org/magmafoundation/magma/api/PlayerAPI.java +++ b/src/main/java/org/magmafoundation/magma/api/PlayerAPI.java @@ -2,7 +2,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import java.util.Map; diff --git a/src/main/java/org/magmafoundation/magma/api/ServerAPI.java b/src/main/java/org/magmafoundation/magma/api/ServerAPI.java index 53f66890..b6820668 100644 --- a/src/main/java/org/magmafoundation/magma/api/ServerAPI.java +++ b/src/main/java/org/magmafoundation/magma/api/ServerAPI.java @@ -3,7 +3,7 @@ import io.netty.util.internal.ConcurrentSet; import net.minecraft.server.MinecraftServer; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import java.util.Map; import java.util.Set;