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

Version 5 1.1.0 for CB 1.4.5-R0.3

Browse Source
This commit is contained in:
Olof Larsson 2012-12-17 14:51:11 +01:00
parent 73ecbd659a
commit 1e601bea2d
14 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.yml
View File

@ -1,5 +1,5 @@
name: mcore5 name: mcore5
version: 1.0.0 version: 1.1.0
main: com.massivecraft.mcore5.MCore main: com.massivecraft.mcore5.MCore
load: startup load: startup
permissions: permissions:

2
src/com/massivecraft/mcore5/adapter/InventoryAdapter.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.mcore5.adapter;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import org.bukkit.craftbukkit.inventory.CraftInventoryCustom; import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventoryCustom;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

6
src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java
View File

@ -3,10 +3,10 @@ package com.massivecraft.mcore5.adapter;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.Map.Entry; import java.util.Map.Entry;
import net.minecraft.server.NBTBase; import net.minecraft.server.v1_4_5.NBTBase;
import net.minecraft.server.NBTTagCompound; import net.minecraft.server.v1_4_5.NBTTagCompound;
import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_4_5.inventory.CraftItemStack;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

2
src/com/massivecraft/mcore5/adapter/NBType.java
View File

@ -3,7 +3,7 @@ package com.massivecraft.mcore5.adapter;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import net.minecraft.server.NBTBase; import net.minecraft.server.v1_4_5.NBTBase;
import lombok.Getter; import lombok.Getter;

28
src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java
View File

@ -1,23 +1,23 @@
package com.massivecraft.mcore5.adapter; package com.massivecraft.mcore5.adapter;
import net.minecraft.server.NBTBase;
import net.minecraft.server.NBTTagByte;
import net.minecraft.server.NBTTagByteArray;
import net.minecraft.server.NBTTagCompound;
import net.minecraft.server.NBTTagDouble;
import net.minecraft.server.NBTTagEnd;
import net.minecraft.server.NBTTagFloat;
import net.minecraft.server.NBTTagInt;
import net.minecraft.server.NBTTagIntArray;
import net.minecraft.server.NBTTagList;
import net.minecraft.server.NBTTagLong;
import net.minecraft.server.NBTTagShort;
import net.minecraft.server.NBTTagString;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map.Entry; import java.util.Map.Entry;
import net.minecraft.server.v1_4_5.NBTBase;
import net.minecraft.server.v1_4_5.NBTTagByte;
import net.minecraft.server.v1_4_5.NBTTagByteArray;
import net.minecraft.server.v1_4_5.NBTTagCompound;
import net.minecraft.server.v1_4_5.NBTTagDouble;
import net.minecraft.server.v1_4_5.NBTTagEnd;
import net.minecraft.server.v1_4_5.NBTTagFloat;
import net.minecraft.server.v1_4_5.NBTTagInt;
import net.minecraft.server.v1_4_5.NBTTagIntArray;
import net.minecraft.server.v1_4_5.NBTTagList;
import net.minecraft.server.v1_4_5.NBTTagLong;
import net.minecraft.server.v1_4_5.NBTTagShort;
import net.minecraft.server.v1_4_5.NBTTagString;
import com.massivecraft.mcore5.xlib.gson.JsonArray; import com.massivecraft.mcore5.xlib.gson.JsonArray;
import com.massivecraft.mcore5.xlib.gson.JsonElement; import com.massivecraft.mcore5.xlib.gson.JsonElement;
import com.massivecraft.mcore5.xlib.gson.JsonObject; import com.massivecraft.mcore5.xlib.gson.JsonObject;

11
src/com/massivecraft/mcore5/util/BiomeUtil.java
View File

@ -5,11 +5,12 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.AbstractMap.SimpleEntry; import java.util.AbstractMap.SimpleEntry;
import org.bukkit.World; import net.minecraft.server.v1_4_5.BiomeBase;
import org.bukkit.craftbukkit.CraftWorld; import net.minecraft.server.v1_4_5.Chunk;
import net.minecraft.server.v1_4_5.WorldServer;
import net.minecraft.server.BiomeBase; import org.bukkit.World;
import net.minecraft.server.WorldServer; import org.bukkit.craftbukkit.v1_4_5.CraftWorld;
public class BiomeUtil public class BiomeUtil
{ {
@ -44,7 +45,7 @@ public class BiomeUtil
BiomeBase bb = BiomeBase.biomes[id]; BiomeBase bb = BiomeBase.biomes[id];
if (craftWorld.loadChunk(x >> 4, z >> 4, false)) { if (craftWorld.loadChunk(x >> 4, z >> 4, false)) {
net.minecraft.server.Chunk chunk = worldServer.getChunkAtWorldCoords(x, z); Chunk chunk = worldServer.getChunkAtWorldCoords(x, z);
if (chunk != null) { if (chunk != null) {
byte[] biomevals = chunk.m(); byte[] biomevals = chunk.m();

2
src/com/massivecraft/mcore5/util/BukkitCommandUtil.java
View File

@ -6,7 +6,7 @@ import java.util.Map;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.SimpleCommandMap; import org.bukkit.command.SimpleCommandMap;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.v1_4_5.CraftServer;
public class BukkitCommandUtil public class BukkitCommandUtil
{ {

2
src/com/massivecraft/mcore5/util/InventoryUtil.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.mcore5.util; package com.massivecraft.mcore5.util;
import org.bukkit.craftbukkit.inventory.CraftInventoryCustom; import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventoryCustom;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;

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

@ -1,10 +1,10 @@
package com.massivecraft.mcore5.util; package com.massivecraft.mcore5.util;
import net.minecraft.server.WorldServer; import net.minecraft.server.v1_4_5.WorldServer;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.v1_4_5.CraftWorld;
public class LightUtil public class LightUtil
{ {

10
src/com/massivecraft/mcore5/util/PlayerUtil.java
View File

@ -9,13 +9,13 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.minecraft.server.DedicatedServer; import net.minecraft.server.v1_4_5.DedicatedServer;
import net.minecraft.server.EntityPlayer; import net.minecraft.server.v1_4_5.EntityPlayer;
import net.minecraft.server.Packet8UpdateHealth; import net.minecraft.server.v1_4_5.Packet8UpdateHealth;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.v1_4_5.CraftServer;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
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;

6
src/com/massivecraft/mcore5/util/PotionPaketUtil.java
View File

@ -1,9 +1,9 @@
package com.massivecraft.mcore5.util; package com.massivecraft.mcore5.util;
import net.minecraft.server.Packet41MobEffect; import net.minecraft.server.v1_4_5.Packet41MobEffect;
import net.minecraft.server.Packet42RemoveMobEffect; import net.minecraft.server.v1_4_5.Packet42RemoveMobEffect;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;

10
src/com/massivecraft/mcore5/util/SmokeUtil.java
View File

@ -5,15 +5,15 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import net.minecraft.server.ChunkPosition; import net.minecraft.server.v1_4_5.ChunkPosition;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.v1_4_5.MinecraftServer;
import net.minecraft.server.Packet60Explosion; import net.minecraft.server.v1_4_5.Packet60Explosion;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.v1_4_5.CraftServer;
import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.v1_4_5.CraftWorld;
// http://mc.kev009.com/Protocol // http://mc.kev009.com/Protocol
// ----------------------------- // -----------------------------

2
src/com/massivecraft/mcore5/util/TextWrapper.java
View File

@ -25,7 +25,7 @@ public class TextWrapper
private static final char COLOR_CHAR = '\u00A7'; private static final char COLOR_CHAR = '\u00A7';
private static final int CHAT_WINDOW_WIDTH = 320; private static final int CHAT_WINDOW_WIDTH = 320;
private static final int CHAT_STRING_LENGTH = 119; private static final int CHAT_STRING_LENGTH = 119;
private static final String allowedChars = net.minecraft.server.SharedConstants.allowedCharacters; private static final String allowedChars = net.minecraft.server.v1_4_5.SharedConstants.allowedCharacters;
public static int getCharPixelWidth(char ch) public static int getCharPixelWidth(char ch)
{ {

2
src/com/massivecraft/mcore5/util/ThrownPotionUtil.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.mcore5.util; package com.massivecraft.mcore5.util;
import org.bukkit.craftbukkit.entity.CraftThrownPotion; import org.bukkit.craftbukkit.v1_4_5.entity.CraftThrownPotion;
import org.bukkit.entity.ThrownPotion; import org.bukkit.entity.ThrownPotion;
// PR to add this feature to the API: // PR to add this feature to the API: