From d81d96e19c771b47a1da9685daf60167af16a0a2 Mon Sep 17 00:00:00 2001
From: llk89 <27812632+llk89@users.noreply.github.com>
Date: Sat, 5 Jun 2021 23:53:42 +0800
Subject: Remove patches that collides with TC4Tweaks

also cleaned up build script. WTF is proguard? Seriously?
---
 .../objects/minecraft/ThaumcraftItemStackData.java | 57 ----------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 src/Java/gtPlusPlus/api/objects/minecraft/ThaumcraftItemStackData.java

(limited to 'src/Java/gtPlusPlus/api/objects/minecraft/ThaumcraftItemStackData.java')

diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ThaumcraftItemStackData.java b/src/Java/gtPlusPlus/api/objects/minecraft/ThaumcraftItemStackData.java
deleted file mode 100644
index 1e9ea49dbf..0000000000
--- a/src/Java/gtPlusPlus/api/objects/minecraft/ThaumcraftItemStackData.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package gtPlusPlus.api.objects.minecraft;
-
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager;
-
-public class ThaumcraftItemStackData {
-	
-	protected final Item mItem;
-	protected final int mDamage;
-	protected final int mStackSize;
-	protected final NBTTagCompound mNBT;
-	protected final String mUniqueDataTag;
-	private final AspectList mAspectList;
-	
-	public ThaumcraftItemStackData (ItemStack aStack) {
-		mItem = aStack.getItem();
-		mDamage = aStack.getItemDamage();
-		mStackSize = aStack.stackSize;
-		mNBT = (aStack.getTagCompound() != null ? aStack.getTagCompound() : new NBTTagCompound());
-		mUniqueDataTag = ""+Item.getIdFromItem(mItem)+""+mDamage+""+mNBT.getId();	
-		mAspectList = ThaumcraftCraftingManager.getObjectTags(aStack);
-	}
-	
-	public String getUniqueDataIdentifier() {
-		return this.mUniqueDataTag;
-	}
-	
-	public ItemStack getStack() {
-		ItemStack aTemp =  ItemUtils.simpleMetaStack(mItem, mDamage, mStackSize);
-		aTemp.setTagCompound(mNBT);
-		return aTemp;
-	}
-	
-	public AspectList getAspectList() {
-		return mAspectList;
-	}
-	
-	public boolean doesItemStackDataMatch(ItemStack aStack) {
-		if (aStack == null) {
-			return false;
-		}
-		Item aItem = aStack.getItem();
-		int aMeta = aStack.getItemDamage();
-		if (aItem != null) {
-			if (aItem == mItem && aMeta == mDamage) {
-				return true;
-			}
-		}		
-		return false;
-	}
-	
-	
-}
-- 
cgit