Initial update to 1.5
This commit is contained in:
parent
478c60156c
commit
2ff98d2ddb
@ -2,7 +2,7 @@ package com.massivecraft.mcore.adapter;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
|
||||
import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventoryCustom;
|
||||
import org.bukkit.craftbukkit.v1_5_R1.inventory.CraftInventoryCustom;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
|
@ -5,12 +5,12 @@ import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.AbstractMap.SimpleEntry;
|
||||
|
||||
import net.minecraft.server.v1_4_R1.BiomeBase;
|
||||
import net.minecraft.server.v1_4_R1.Chunk;
|
||||
import net.minecraft.server.v1_4_R1.WorldServer;
|
||||
import net.minecraft.server.v1_5_R1.BiomeBase;
|
||||
import net.minecraft.server.v1_5_R1.Chunk;
|
||||
import net.minecraft.server.v1_5_R1.WorldServer;
|
||||
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.craftbukkit.v1_4_R1.CraftWorld;
|
||||
import org.bukkit.craftbukkit.v1_5_R1.CraftWorld;
|
||||
|
||||
public class BiomeUtil
|
||||
{
|
||||
|
@ -6,7 +6,7 @@ import java.util.Map;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.SimpleCommandMap;
|
||||
import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_5_R1.CraftServer;
|
||||
|
||||
public class BukkitCommandUtil
|
||||
{
|
||||
|
@ -3,7 +3,7 @@ package com.massivecraft.mcore.util;
|
||||
import java.util.HashMap;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventoryCustom;
|
||||
import org.bukkit.craftbukkit.v1_5_R1.inventory.CraftInventoryCustom;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.InventoryHolder;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
@ -1,10 +1,10 @@
|
||||
package com.massivecraft.mcore.util;
|
||||
|
||||
import net.minecraft.server.v1_4_R1.WorldServer;
|
||||
import net.minecraft.server.v1_5_R1.WorldServer;
|
||||
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.craftbukkit.v1_4_R1.CraftWorld;
|
||||
import org.bukkit.craftbukkit.v1_5_R1.CraftWorld;
|
||||
|
||||
public class LightUtil
|
||||
{
|
||||
|
@ -18,7 +18,7 @@ import java.util.Set;
|
||||
import java.util.SortedSet;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import net.minecraft.server.v1_4_R1.DedicatedServer;
|
||||
import net.minecraft.server.v1_5_R1.DedicatedServer;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
@ -26,7 +26,7 @@ import org.bukkit.Material;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_5_R1.CraftServer;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Projectile;
|
||||
|
@ -7,11 +7,11 @@ import java.util.TreeSet;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.concurrent.ConcurrentSkipListMap;
|
||||
|
||||
import net.minecraft.server.v1_4_R1.EntityPlayer;
|
||||
import net.minecraft.server.v1_4_R1.Packet8UpdateHealth;
|
||||
import net.minecraft.server.v1_5_R1.EntityPlayer;
|
||||
import net.minecraft.server.v1_5_R1.Packet8UpdateHealth;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
|
||||
import org.bukkit.craftbukkit.v1_5_R1.entity.CraftPlayer;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
|
@ -8,7 +8,7 @@ import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.TreeMap;
|
||||
|
||||
import net.minecraft.server.v1_4_R1.MinecraftServer;
|
||||
import net.minecraft.server.v1_5_R1.MinecraftServer;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.GameMode;
|
||||
@ -17,7 +17,7 @@ import org.bukkit.command.BlockCommandSender;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.ConsoleCommandSender;
|
||||
import org.bukkit.command.RemoteConsoleCommandSender;
|
||||
import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_5_R1.CraftServer;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.massivecraft.mcore.MCore;
|
||||
|
@ -25,7 +25,7 @@ public class TextWrapper
|
||||
private static final char COLOR_CHAR = '\u00A7';
|
||||
private static final int CHAT_WINDOW_WIDTH = 320;
|
||||
private static final int CHAT_STRING_LENGTH = 119;
|
||||
private static final String allowedChars = net.minecraft.server.v1_4_R1.SharedConstants.allowedCharacters;
|
||||
private static final String allowedChars = net.minecraft.server.v1_5_R1.SharedConstants.allowedCharacters;
|
||||
|
||||
public static int getCharPixelWidth(char ch)
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
package com.massivecraft.mcore.util;
|
||||
|
||||
import org.bukkit.craftbukkit.v1_4_R1.entity.CraftThrownPotion;
|
||||
import org.bukkit.craftbukkit.v1_5_R1.entity.CraftThrownPotion;
|
||||
import org.bukkit.entity.ThrownPotion;
|
||||
|
||||
// PR to add this feature to the API:
|
||||
|
Loading…
Reference in New Issue
Block a user