From b223a741942ebcfb3baaaec66e22786981575176 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sun, 13 Jul 2014 15:09:58 +0200 Subject: [PATCH] Update for 1.7.10 --- .../massivecore/adapter/InventoryAdapter.java | 4 ++-- .../inventory/MassiveCorePlayerInventory.java | 9 +++++---- src/com/massivecraft/massivecore/util/IdUtil.java | 8 ++++---- src/com/massivecraft/massivecore/util/InventoryUtil.java | 4 ++-- src/com/massivecraft/massivecore/util/LightUtil.java | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/com/massivecraft/massivecore/adapter/InventoryAdapter.java b/src/com/massivecraft/massivecore/adapter/InventoryAdapter.java index 15e942bb..3e8e873f 100644 --- a/src/com/massivecraft/massivecore/adapter/InventoryAdapter.java +++ b/src/com/massivecraft/massivecore/adapter/InventoryAdapter.java @@ -2,8 +2,8 @@ package com.massivecraft.massivecore.adapter; import java.lang.reflect.Type; -import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventoryCustom; -import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryCustom; +import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryPlayer; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; diff --git a/src/com/massivecraft/massivecore/inventory/MassiveCorePlayerInventory.java b/src/com/massivecraft/massivecore/inventory/MassiveCorePlayerInventory.java index 380566b2..81335971 100644 --- a/src/com/massivecraft/massivecore/inventory/MassiveCorePlayerInventory.java +++ b/src/com/massivecraft/massivecore/inventory/MassiveCorePlayerInventory.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore.inventory; -import net.minecraft.server.v1_7_R3.EntityHuman; -import net.minecraft.server.v1_7_R3.ItemStack; -import net.minecraft.server.v1_7_R3.PlayerInventory; +import net.minecraft.server.v1_7_R4.EntityHuman; +import net.minecraft.server.v1_7_R4.ItemStack; +import net.minecraft.server.v1_7_R4.PlayerInventory; import org.bukkit.inventory.InventoryHolder; @@ -15,6 +15,7 @@ import org.bukkit.inventory.InventoryHolder; * We override internal methods where necessary. * * How to update: + * https://github.com/Bukkit/CraftBukkit/commits/master/src/main/java/net/minecraft/server/PlayerInventory.java * Make sure there is a no-arg constructor. * Search for references to "public EntityHuman player". * @@ -28,7 +29,7 @@ import org.bukkit.inventory.InventoryHolder; * pickup(ItemStack) (2 matches) * PlayerInventory(EntityHuman) * - * As of 1.6.1 and 1.6.2 and 1.6.4 and 1.7.2 and 1.7.5 and 1.7.8 these are the references: + * As of 1.6.1 and 1.6.2 and 1.6.4 and 1.7.2 and 1.7.5 and 1.7.8 and 1.7.10 these are the references: * * a(EntityHuman) (2 matches) * a(float) diff --git a/src/com/massivecraft/massivecore/util/IdUtil.java b/src/com/massivecraft/massivecore/util/IdUtil.java index a939693d..8133bbf0 100644 --- a/src/com/massivecraft/massivecore/util/IdUtil.java +++ b/src/com/massivecraft/massivecore/util/IdUtil.java @@ -18,15 +18,15 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListSet; -import net.minecraft.server.v1_7_R3.DedicatedServer; -import net.minecraft.server.v1_7_R3.NBTCompressedStreamTools; -import net.minecraft.server.v1_7_R3.NBTTagCompound; +import net.minecraft.server.v1_7_R4.DedicatedServer; +import net.minecraft.server.v1_7_R4.NBTCompressedStreamTools; +import net.minecraft.server.v1_7_R4.NBTTagCompound; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/com/massivecraft/massivecore/util/InventoryUtil.java b/src/com/massivecraft/massivecore/util/InventoryUtil.java index 244f4e06..af13e234 100644 --- a/src/com/massivecraft/massivecore/util/InventoryUtil.java +++ b/src/com/massivecraft/massivecore/util/InventoryUtil.java @@ -4,8 +4,8 @@ import java.util.HashMap; import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventoryCustom; -import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryCustom; +import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryPlayer; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/com/massivecraft/massivecore/util/LightUtil.java b/src/com/massivecraft/massivecore/util/LightUtil.java index 24734e18..c90b3f65 100644 --- a/src/com/massivecraft/massivecore/util/LightUtil.java +++ b/src/com/massivecraft/massivecore/util/LightUtil.java @@ -1,10 +1,10 @@ package com.massivecraft.massivecore.util; -import net.minecraft.server.v1_7_R3.WorldServer; +import net.minecraft.server.v1_7_R4.WorldServer; import org.bukkit.World; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_7_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; /** * Find the method by going through CraftBlock.setTypeId()