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

Work on the ItemStack adapter. Added missing firework flight power. Updated format description document.

Browse Source
This commit is contained in:
Olof Larsson
2013-01-15 07:49:14 +01:00
parent 6b8baafa37
commit d2d5d802dd
4 changed files with 111 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,11 +70,13 @@ public class ItemStackAdapterV2 implements JsonDeserializer<ItemStack>, JsonSeri
public static final String SKULL_OWNER = "skull";
// TODO rename to potion-effects?
public static final String POTION_EFFECTS = "effects";
// We renamed "effects" to "potion-effects".
public static final String POTION_EFFECTS_OLD = "effects";
public static final String POTION_EFFECTS = "potion-effects";
public static final String FIREWORK_EFFECT = "firework-effect";
public static final String FIREWORK_EFFECTS = "firework-effects";
public static final String FIREWORK_FLIGHT = "firework-flight";
public static final String STORED_ENCHANTS = "stored-enchants";
@@ -85,6 +87,7 @@ public class ItemStackAdapterV2 implements JsonDeserializer<ItemStack>, JsonSeri
public static final int DEFAULT_ID;
public static final int DEFAULT_COUNT;
public static final int DEFAULT_DAMAGE;
public static final int DEFAULT_FIREWORK_POWER = 1;
static
{
@@ -504,6 +507,7 @@ public class ItemStackAdapterV2 implements JsonDeserializer<ItemStack>, JsonSeri
else
{
JsonElement element = json.get(POTION_EFFECTS);
if (element == null) element = json.get(POTION_EFFECTS_OLD);
if (element == null) return;
meta.clearCustomEffects();
@@ -557,6 +561,12 @@ public class ItemStackAdapterV2 implements JsonDeserializer<ItemStack>, JsonSeri
// -------------------------------------------- //
public static void transferFireworkMeta(FireworkMeta meta, JsonObject json, boolean meta2json)
{
transferFireworkMetaEffects(meta, json, meta2json);
transferFireworkMetaPower(meta, json, meta2json);
}
public static void transferFireworkMetaEffects(FireworkMeta meta, JsonObject json, boolean meta2json)
{
if (meta2json)
{
@@ -571,6 +581,20 @@ public class ItemStackAdapterV2 implements JsonDeserializer<ItemStack>, JsonSeri
meta.addEffects(convertFireworkEffectList(element));
}
}
public static void transferFireworkMetaPower(FireworkMeta meta, JsonObject json, boolean meta2json)
{
if (meta2json)
{
json.addProperty(FIREWORK_FLIGHT, meta.getPower());
}
else
{
JsonElement element = json.get(FIREWORK_FLIGHT);
if (element == null) return;
meta.setPower(element.getAsInt());
}
}
// -------------------------------------------- //
// SPECIFIC META: ENCHANTMENT STORAGE

13
src/com/massivecraft/mcore5/cmd/HelpCommand.java
View File

@@ -50,9 +50,12 @@ public class HelpCommand extends MCommand
return this.commandChain.get(this.commandChain.size()-1).p();
}
private static HelpCommand instance = new HelpCommand();
public static HelpCommand getInstance()
{
return instance;
}
// -------------------------------------------- //
// INSTANCE
// -------------------------------------------- //
private static HelpCommand i = new HelpCommand();
public static HelpCommand getInstance() { return i; }
public static HelpCommand get() { return i; }
}

2
src/com/massivecraft/mcore5/usys/cmd/CmdUsysMultiverseList.java
View File

@@ -36,6 +36,6 @@ public class CmdUsysMultiverseList extends UsysCommand
// Send them
lines = Txt.parseWrap(lines);
this.sendMessage(Txt.getPage(lines, pageHumanBased, "Multiverse List", sender));
this.sendMessage(Txt.getPage(lines, pageHumanBased, "Multiverse List", sender));
}
}