Skip to content

Commit eea20f9

Browse files
ProgrammerDanProgrammerDan
committed
Removing excessive logging, but left the map logging in place for debugging. Very useful.
1 parent 1d10f96 commit eea20f9

1 file changed

Lines changed: 41 additions & 0 deletions

File tree

‎src/vg/civcraft/mc/civmodcore/itemHandling/ItemMap.java‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ public ItemMap(Collection<ItemStack> stacks) {
105105
*/
106106
public void addItemStack(ItemStack input) {
107107
if (input != null) {
108+
//Bukkit.getServer().getLogger().log(Level.INFO, "Adding {0} as ItemStack", input.toString());
108109
ItemStack is = createMapConformCopy(input);
110+
//Bukkit.getServer().getLogger().log(Level.INFO, " Conform Copy: {0}", is.toString());
109111
if (is == null) {
110112
return;
111113
}
@@ -482,6 +484,7 @@ public LinkedList<ItemStack> getItemStackRepresentation() {
482484
ItemStack toAdd = is.clone();
483485
int addAmount = Math.min(amount, is.getMaxStackSize());
484486
toAdd.setAmount(addAmount);
487+
//Bukkit.getServer().getLogger().log(Level.INFO, "Adding {0} as ItemStack", toAdd.toString());
485488
result.add(toAdd);
486489
amount -= addAmount;
487490
}
@@ -630,6 +633,7 @@ private static ItemStack createMapConformCopy(ItemStack is) {
630633
* @return Cloned ItemStack with amount set to amt and NBT set to map.
631634
*/
632635
public static ItemStack enrichWithNBT(ItemStack is, int amt, Map<String, Object> map) {
636+
Bukkit.getServer().getLogger().log(Level.INFO, "Request to enrich {0} received", is.toString());
633637
ItemStack copy = is.clone();
634638
amt = (amt < 1 ? 1 : amt > is.getMaxStackSize() ? is.getMaxStackSize() : amt);
635639
copy.setAmount(amt);
@@ -651,36 +655,60 @@ public static ItemStack enrichWithNBT(ItemStack is, int amt, Map<String, Object>
651655
}
652656

653657
public static NBTTagCompound mapToNBT(NBTTagCompound base, Map<String, Object> map) {
658+
Bukkit.getServer().getLogger().log(Level.INFO, "Representing map --> NBTTagCompound");
654659
if (map == null || base == null) return base;
655660
for (Map.Entry<String, Object> entry : map.entrySet()) {
656661
Object object = entry.getValue();
657662
if (object instanceof Map) {
663+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding map at key {0}", entry.getKey());
658664
base.set(entry.getKey(), mapToNBT(new NBTTagCompound(), (Map<String, Object>) object));
659665
} else if (object instanceof List) {
666+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding list at key {0}", entry.getKey());
660667
base.set(entry.getKey(), listToNBT(new NBTTagList(), (List<Object>) object));
661668
} else if (object instanceof String) {
669+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding String {1} at key {0}",
670+
new Object[] {entry.getKey(), object});
662671
base.setString(entry.getKey(), (String) object);
663672
} else if (object instanceof Double) {
673+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding Double {1} at key {0}",
674+
new Object[] {entry.getKey(), object});
664675
base.setDouble(entry.getKey(), (Double) object);
665676
} else if (object instanceof Float) {
677+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding Float {1} at key {0}",
678+
new Object[] {entry.getKey(), object});
666679
base.setFloat(entry.getKey(), (Float) object);
667680
} else if (object instanceof Boolean) {
681+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding Boolean {1} at key {0}",
682+
new Object[] {entry.getKey(), object});
668683
base.setBoolean(entry.getKey(), (Boolean) object);
669684
} else if (object instanceof Byte) {
685+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding Byte {1} at key {0}",
686+
new Object[] {entry.getKey(), object});
670687
base.setByte(entry.getKey(), (Byte) object);
671688
} else if (object instanceof Short) {
689+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding Byte {1} at key {0}",
690+
new Object[] {entry.getKey(), object});
672691
base.setShort(entry.getKey(), (Short) object);
673692
} else if (object instanceof Integer) {
693+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding Integer {1} at key {0}",
694+
new Object[] {entry.getKey(), object});
674695
base.setInt(entry.getKey(), (Integer) object);
675696
} else if (object instanceof Long) {
697+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding Long {1} at key {0}",
698+
new Object[] {entry.getKey(), object});
676699
base.setLong(entry.getKey(), (Long) object);
677700
} else if (object instanceof byte[]) {
701+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding bytearray at key {0}", entry.getKey());
678702
base.setByteArray(entry.getKey(), (byte[]) object);
679703
} else if (object instanceof int[]) {
704+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding intarray at key {0}", entry.getKey());
680705
base.setIntArray(entry.getKey(), (int[]) object);
681706
} else if (object instanceof UUID) {
707+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding UUID {1} at key {0}",
708+
new Object[] {entry.getKey(), object});
682709
base.a(entry.getKey(), (UUID) object);
683710
} else if (object instanceof NBTBase) {
711+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding nbtobject at key {0}", entry.getKey());
684712
base.set(entry.getKey(), (NBTBase) object);
685713
} else {
686714
Bukkit.getServer().getLogger().log(Level.WARNING, "Unrecognized entry in map-->NBT: {0}", object.toString());
@@ -690,31 +718,44 @@ public static NBTTagCompound mapToNBT(NBTTagCompound base, Map<String, Object> m
690718
}
691719

692720
public static NBTTagList listToNBT(NBTTagList base, List<Object> list) {
721+
Bukkit.getServer().getLogger().log(Level.INFO, "Representing list --> NBTTagList");
693722
if (list == null || base == null) return base;
694723
for (Object object : list) {
695724
if (object instanceof Map) {
725+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding map to list");
696726
base.add(mapToNBT(new NBTTagCompound(), (Map<String, Object>) object));
697727
} else if (object instanceof List) {
728+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding list to list");
698729
base.add(listToNBT(new NBTTagList(), (List<Object>) object));
699730
} else if (object instanceof String) {
731+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding string {0} to list", object);
700732
base.add(new NBTTagString((String) object));
701733
} else if (object instanceof Double) {
734+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding double {0} to list", object);
702735
base.add(new NBTTagDouble((Double) object));
703736
} else if (object instanceof Float) {
737+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding float {0} to list", object);
704738
base.add(new NBTTagFloat((Float) object));
705739
} else if (object instanceof Byte) {
740+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding byte {0} to list", object);
706741
base.add(new NBTTagByte((Byte) object));
707742
} else if (object instanceof Short) {
743+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding short {0} to list", object);
708744
base.add(new NBTTagShort((Short) object));
709745
} else if (object instanceof Integer) {
746+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding integer {0} to list", object);
710747
base.add(new NBTTagInt((Integer) object));
711748
} else if (object instanceof Long) {
749+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding long {0} to list", object);
712750
base.add(new NBTTagLong((Long) object));
713751
} else if (object instanceof byte[]) {
752+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding byte array to list");
714753
base.add(new NBTTagByteArray((byte[]) object));
715754
} else if (object instanceof int[]) {
755+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding int array to list");
716756
base.add(new NBTTagIntArray((int[]) object));
717757
} else if (object instanceof NBTBase) {
758+
Bukkit.getServer().getLogger().log(Level.INFO, "Adding nbt object to list");
718759
base.add((NBTBase) object);
719760
} else {
720761
Bukkit.getServer().getLogger().log(Level.WARNING, "Unrecognized entry in list-->NBT: {0}",

0 commit comments

Comments
 (0)