Merge pull request #82 from HellFirePvP/1.12.2

Switch enchantment-writing related code to a more direct data-driven approach

src/main/java/electroblob/wizardry/WizardData.java

@@ -33,12 +33,12 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Items;
 import net.minecraft.init.MobEffects;
 import net.minecraft.init.SoundEvents;
+import net.minecraft.item.ItemEnchantedBook;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.*;
-import net.minecraft.nbt.NBTTagInt;
-import net.minecraft.nbt.NBTTagString;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
@@ -278,12 +278,14 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 		for(ItemStack stack : player.inventory.mainInventory){
 			if(stack.isItemEnchanted()){
 
-				Map<Enchantment, Integer> enchantments = EnchantmentHelper.getEnchantments(stack);
+				NBTTagList enchantmentList = stack.getItem() == Items.ENCHANTED_BOOK ?
+						ItemEnchantedBook.getEnchantments(stack) : stack.getEnchantmentTagList();
 
-				Iterator<Entry<Enchantment, Integer>> iterator = enchantments.entrySet().iterator();
+				Iterator<NBTBase> iterator =enchantmentList.iterator();
 				// For each of the item's enchantments
 				while(iterator.hasNext()){
-					Enchantment enchantment = iterator.next().getKey();
+					NBTTagCompound enchantmentTag = (NBTTagCompound) iterator.next();
+					Enchantment enchantment = Enchantment.getEnchantmentByID(enchantmentTag.getShort("id"));
 					// Ignores the enchantment unless it is an imbuement
 					if(enchantment instanceof Imbuement){
 						int duration = this.getImbuementDuration(enchantment);
@@ -295,10 +297,8 @@ public class WizardData implements INBTSerializable<NBTTagCompound> {
 							activeImbuements.add((Imbuement)enchantment);
 							// Otherwise:
 						}else{
-							// Removes the enchantment from the enchantment map
+							// Removes the enchantment from the item
 							iterator.remove();
-							// Applies the new enchantment map to the item
-							EnchantmentHelper.setEnchantments(enchantments, stack);
 						}
 					}
 				}

src/main/java/electroblob/wizardry/enchantment/Imbuement.java

@@ -1,7 +1,9 @@
 package electroblob.wizardry.enchantment;
 
+import java.util.Iterator;
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.registry.WizardryEnchantments;
 import electroblob.wizardry.spell.FreezingWeapon;
@@ -10,11 +12,15 @@ import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.init.Items;
 import net.minecraft.inventory.ContainerChest;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemBow;
 import net.minecraft.item.ItemEnchantedBook;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.item.ItemTossEvent;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
@@ -55,11 +61,18 @@ public interface Imbuement {
 		if(stack.isItemEnchanted()){
 			// No need to check what enchantments the item has, since remove() does nothing if the element does not
 			// exist.
-			Map<Enchantment, Integer> enchantments = EnchantmentHelper.getEnchantments(stack);
+			NBTTagList enchantmentList = stack.getItem() == Items.ENCHANTED_BOOK ?
-			// Removes the magic weapon enchantments from the enchantment map
+					ItemEnchantedBook.getEnchantments(stack) : stack.getEnchantmentTagList();
-			enchantments.entrySet().removeIf(entry -> entry.getKey() instanceof Imbuement);
+			// Check all enchantments of the item
-			// Applies the new enchantment map to the item
+			Iterator<NBTBase> enchantmentIt = enchantmentList.iterator();
-			EnchantmentHelper.setEnchantments(enchantments, stack);
+			while(enchantmentIt.hasNext()){
+				NBTTagCompound enchantmentTag = (NBTTagCompound) enchantmentIt.next();
+				Enchantment enchantment = Enchantment.getEnchantmentByID(enchantmentTag.getShort("id"));
+				// If the item contains a magic weapon enchantment, remove it from the item
+				if(enchantment instanceof Imbuement){
+					enchantmentIt.remove();
+				}
+			}
 		}
 	}
 
@@ -70,18 +83,23 @@ public interface Imbuement {
 			// Still not sure if it's better to set stacks in slots or modify the itemstack list directly, but I would
 			// imagine it's the former.
 			for(Slot slot : event.getContainer().inventorySlots){
-				if(slot.getStack().getItem() instanceof ItemEnchantedBook){
+				ItemStack slotStack = slot.getStack();
+				if(slotStack.getItem() instanceof ItemEnchantedBook){
 					// We don't care about the level of the enchantments
-					Map<Enchantment, Integer> enchantments = EnchantmentHelper.getEnchantments(slot.getStack());
+					NBTTagList enchantmentList = ItemEnchantedBook.getEnchantments(slotStack);
 					// Removes all imbuements
-					if(enchantments.keySet().removeIf(e -> e instanceof Imbuement)){
+					if(Iterables.removeIf(enchantmentList, tag -> {
-						// If any imbuements were removed, replaces the enchantments on the book with the new ones, or
+						NBTTagCompound enchantmentTag = (NBTTagCompound) tag;
-						// deletes the book entirely if there are none left.
+						return Enchantment.getEnchantmentByID(enchantmentTag.getShort("id"))
-						if(enchantments.isEmpty()){
+								instanceof Imbuement;
+					})){
+						// If any imbuements were removed, inform about the removal of the enchantment(s), or
+						// delete the book entirely if there are none left.
+						if(enchantmentList.hasNoTags()){
 							slot.putStack(ItemStack.EMPTY); // NOTE: Will need changing in 1.11
 							Wizardry.logger.info("Deleted enchanted book with illegal enchantments");
 						}else{
-							EnchantmentHelper.setEnchantments(enchantments, slot.getStack());
+							// Inform about enchantment removal
 							Wizardry.logger.info("Removed illegal enchantments from enchanted book");
 						}
 					}