Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for 1.7.10

Browse Source
This commit is contained in:
Olof Larsson 2014-07-13 15:09:58 +02:00
parent ae562b10a9
commit b223a74194
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/massivecore/adapter/InventoryAdapter.java
View File

@ -2,8 +2,8 @@ package com.massivecraft.massivecore.adapter;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventoryCustom; import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryCustom;
import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventoryPlayer; import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryPlayer;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.PlayerInventory;

9
src/com/massivecraft/massivecore/inventory/MassiveCorePlayerInventory.java
View File

@ -1,8 +1,8 @@
package com.massivecraft.massivecore.inventory; package com.massivecraft.massivecore.inventory;
import net.minecraft.server.v1_7_R3.EntityHuman; import net.minecraft.server.v1_7_R4.EntityHuman;
import net.minecraft.server.v1_7_R3.ItemStack; import net.minecraft.server.v1_7_R4.ItemStack;
import net.minecraft.server.v1_7_R3.PlayerInventory; import net.minecraft.server.v1_7_R4.PlayerInventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
@ -15,6 +15,7 @@ import org.bukkit.inventory.InventoryHolder;
* We override internal methods where necessary. * We override internal methods where necessary.
* *
* How to update: * 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. * Make sure there is a no-arg constructor.
* Search for references to "public EntityHuman player". * Search for references to "public EntityHuman player".
* *
@ -28,7 +29,7 @@ import org.bukkit.inventory.InventoryHolder;
* pickup(ItemStack) (2 matches) * pickup(ItemStack) (2 matches)
* PlayerInventory(EntityHuman) * 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(EntityHuman) (2 matches)
* a(float) * a(float)

8
src/com/massivecraft/massivecore/util/IdUtil.java
View File

@ -18,15 +18,15 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.ConcurrentSkipListSet;
import net.minecraft.server.v1_7_R3.DedicatedServer; import net.minecraft.server.v1_7_R4.DedicatedServer;
import net.minecraft.server.v1_7_R3.NBTCompressedStreamTools; import net.minecraft.server.v1_7_R4.NBTCompressedStreamTools;
import net.minecraft.server.v1_7_R3.NBTTagCompound; import net.minecraft.server.v1_7_R4.NBTTagCompound;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; 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.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;

4
src/com/massivecraft/massivecore/util/InventoryUtil.java
View File

@ -4,8 +4,8 @@ import java.util.HashMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventoryCustom; import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryCustom;
import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventoryPlayer; import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryPlayer;
import org.bukkit.entity.HumanEntity; import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;

4
src/com/massivecraft/massivecore/util/LightUtil.java
View File

@ -1,10 +1,10 @@
package com.massivecraft.massivecore.util; 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.World;
import org.bukkit.block.Block; 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() * Find the method by going through CraftBlock.setTypeId()