mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
Fix JABBA-related issues with crafting station slots (#54)
* Fix shift-merging tools voiding items fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11392> * Change 0-sized ItemStacks into null stacks in crafting station attached slots Fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10425> * Update buildscript * spotlessApply
This commit is contained in:
1 parent
18bfeaff32
commit
39be06c23b
571 files changed
+25959
-28223
No files matched your search
@@ -4,25 +4,21 @@ import java.util.*;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
public abstract class ItemModifier
|
||||
{
|
||||
public abstract class ItemModifier {
|
||||
public final String key;
|
||||
public final List stacks;
|
||||
public final int effectIndex;
|
||||
public static Random random = new Random();
|
||||
|
||||
/** Default constructor
|
||||
*
|
||||
*
|
||||
* @param recipe Items to compare against when checking the modifier
|
||||
* @param effect Render index for sprite layering
|
||||
* @param dataKey NBT string to put on the item
|
||||
*/
|
||||
|
||||
public ItemModifier(ItemStack[] recipe, int effect, String dataKey)
|
||||
{
|
||||
public ItemModifier(ItemStack[] recipe, int effect, String dataKey) {
|
||||
List<ItemStack> itemstacks = new ArrayList<ItemStack>();
|
||||
for (int iter = 0; iter < recipe.length; iter++)
|
||||
itemstacks.add(recipe[iter]);
|
||||
for (int iter = 0; iter < recipe.length; iter++) itemstacks.add(recipe[iter]);
|
||||
stacks = itemstacks;
|
||||
effectIndex = effect;
|
||||
key = dataKey;
|
||||
@@ -30,41 +26,36 @@ public abstract class ItemModifier
|
||||
|
||||
/** Checks to see if the inputs match the stored items
|
||||
* Note: Works like ShapelessRecipes
|
||||
*
|
||||
*
|
||||
* @param recipe The ItemStacks to compare against
|
||||
* @param input Item to modify, used for restrictions
|
||||
* @return Whether the recipe matches the input
|
||||
*/
|
||||
public boolean matches (ItemStack[] recipe, ItemStack input)
|
||||
{
|
||||
if (!canModify(input, recipe))
|
||||
return false;
|
||||
public boolean matches(ItemStack[] recipe, ItemStack input) {
|
||||
if (!canModify(input, recipe)) return false;
|
||||
|
||||
ArrayList list = new ArrayList(this.stacks);
|
||||
|
||||
for (int iter = 0; iter < recipe.length; ++iter)
|
||||
{
|
||||
for (int iter = 0; iter < recipe.length; ++iter) {
|
||||
ItemStack craftingStack = recipe[iter];
|
||||
|
||||
if (craftingStack != null)
|
||||
{
|
||||
if (craftingStack != null) {
|
||||
boolean canCraft = false;
|
||||
Iterator iterate = list.iterator();
|
||||
|
||||
while (iterate.hasNext())
|
||||
{
|
||||
while (iterate.hasNext()) {
|
||||
ItemStack removeStack = (ItemStack) iterate.next();
|
||||
|
||||
if (craftingStack.getItem() == removeStack.getItem() && (removeStack.getItemDamage() == Short.MAX_VALUE || craftingStack.getItemDamage() == removeStack.getItemDamage()))
|
||||
{
|
||||
if (craftingStack.getItem() == removeStack.getItem()
|
||||
&& (removeStack.getItemDamage() == Short.MAX_VALUE
|
||||
|| craftingStack.getItemDamage() == removeStack.getItemDamage())) {
|
||||
canCraft = true;
|
||||
list.remove(removeStack);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!canCraft)
|
||||
{
|
||||
if (!canCraft) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -73,13 +64,11 @@ public abstract class ItemModifier
|
||||
return list.isEmpty();
|
||||
}
|
||||
|
||||
protected String getTagName (ItemStack stack)
|
||||
{
|
||||
protected String getTagName(ItemStack stack) {
|
||||
return ((IModifyable) stack.getItem()).getBaseTagName();
|
||||
}
|
||||
|
||||
protected NBTTagCompound getModifierTag (ItemStack stack)
|
||||
{
|
||||
protected NBTTagCompound getModifierTag(ItemStack stack) {
|
||||
return stack.getTagCompound().getCompoundTag(getTagName(stack));
|
||||
}
|
||||
|
||||
@@ -88,63 +77,44 @@ public abstract class ItemModifier
|
||||
* @param recipe Items to modify with
|
||||
* @return Whether the tool can be modified
|
||||
*/
|
||||
|
||||
protected boolean canModify (ItemStack input, ItemStack[] recipe)
|
||||
{
|
||||
protected boolean canModify(ItemStack input, ItemStack[] recipe) {
|
||||
NBTTagCompound tags = input.getTagCompound().getCompoundTag(getTagName(input));
|
||||
return tags.getInteger("Modifiers") > 0;
|
||||
}
|
||||
|
||||
/** Modifies the tool. Adds nbttags, changes existing ones, ticks down modification counter, etc
|
||||
*
|
||||
*
|
||||
* @param recipe ItemStacks to pull info from
|
||||
* @param input The tool to modify
|
||||
*/
|
||||
public abstract void modify (ItemStack[] recipe, ItemStack input);
|
||||
public abstract void modify(ItemStack[] recipe, ItemStack input);
|
||||
|
||||
public void addMatchingEffect (ItemStack input)
|
||||
{
|
||||
public void addMatchingEffect(ItemStack input) {
|
||||
NBTTagCompound tags = input.getTagCompound().getCompoundTag(getTagName(input));
|
||||
if (tags.hasKey("Effect6") || tags.hasKey(key))
|
||||
return;
|
||||
|
||||
else if (tags.hasKey("Effect5"))
|
||||
{
|
||||
if (tags.hasKey("Effect6") || tags.hasKey(key)) return;
|
||||
else if (tags.hasKey("Effect5")) {
|
||||
tags.setInteger("Effect6", effectIndex);
|
||||
}
|
||||
else if (tags.hasKey("Effect4"))
|
||||
{
|
||||
} else if (tags.hasKey("Effect4")) {
|
||||
tags.setInteger("Effect5", effectIndex);
|
||||
}
|
||||
else if (tags.hasKey("Effect3"))
|
||||
{
|
||||
} else if (tags.hasKey("Effect3")) {
|
||||
tags.setInteger("Effect4", effectIndex);
|
||||
}
|
||||
else if (tags.hasKey("Effect2"))
|
||||
{
|
||||
} else if (tags.hasKey("Effect2")) {
|
||||
tags.setInteger("Effect3", effectIndex);
|
||||
}
|
||||
else if (tags.hasKey("Effect1"))
|
||||
{
|
||||
} else if (tags.hasKey("Effect1")) {
|
||||
tags.setInteger("Effect2", effectIndex);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
tags.setInteger("Effect1", effectIndex);
|
||||
}
|
||||
}
|
||||
|
||||
//Gui
|
||||
protected int addModifierTip (ItemStack input, String modifierTip)
|
||||
{
|
||||
// Gui
|
||||
protected int addModifierTip(ItemStack input, String modifierTip) {
|
||||
NBTTagCompound tags = input.getTagCompound().getCompoundTag(getTagName(input));
|
||||
int tipNum = 0;
|
||||
while (true)
|
||||
{
|
||||
while (true) {
|
||||
tipNum++;
|
||||
String tip = "Tooltip" + tipNum;
|
||||
if (!tags.hasKey(tip))
|
||||
{
|
||||
if (!tags.hasKey(tip)) {
|
||||
tags.setString(tip, "");
|
||||
String modTip = "ModifierTip" + tipNum;
|
||||
tags.setString(modTip, modifierTip);
|
||||
@@ -153,27 +123,21 @@ public abstract class ItemModifier
|
||||
}
|
||||
}
|
||||
|
||||
//Item
|
||||
protected int addToolTip (ItemStack input, String tooltip, String modifierTip)
|
||||
{
|
||||
// Item
|
||||
protected int addToolTip(ItemStack input, String tooltip, String modifierTip) {
|
||||
NBTTagCompound tags = input.getTagCompound().getCompoundTag(getTagName(input));
|
||||
int tipNum = 0;
|
||||
while (true)
|
||||
{
|
||||
while (true) {
|
||||
tipNum++;
|
||||
String tip = "Tooltip" + tipNum;
|
||||
if (!tags.hasKey(tip))
|
||||
{
|
||||
if (!tags.hasKey(tip)) {
|
||||
tags.setString(tip, tooltip);
|
||||
String modTip = "ModifierTip" + tipNum;
|
||||
tags.setString(modTip, modifierTip);
|
||||
return tipNum;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
String tag = tags.getString(tip);
|
||||
if (tag.contains(tooltip))
|
||||
{
|
||||
if (tag.contains(tooltip)) {
|
||||
tags.setString(tip, getProperName(tooltip, tag));
|
||||
String modTip = "ModifierTip" + tipNum;
|
||||
tag = tags.getString(modTip);
|
||||
@@ -184,70 +148,53 @@ public abstract class ItemModifier
|
||||
}
|
||||
}
|
||||
|
||||
protected String getProperName (String tooltip, String tag)
|
||||
{
|
||||
if (tag.isEmpty())
|
||||
return tooltip + " I";
|
||||
protected String getProperName(String tooltip, String tag) {
|
||||
if (tag.isEmpty()) return tooltip + " I";
|
||||
|
||||
if (tag.equals(tooltip) || tag.equals(tooltip + " I"))
|
||||
return tooltip + " II";
|
||||
if (tag.equals(tooltip) || tag.equals(tooltip + " I")) return tooltip + " II";
|
||||
|
||||
if (tag.equals(tooltip + " II"))
|
||||
return tooltip + " III";
|
||||
if (tag.equals(tooltip + " II")) return tooltip + " III";
|
||||
|
||||
if (tag.equals(tooltip + " III"))
|
||||
return tooltip + " IV";
|
||||
if (tag.equals(tooltip + " III")) return tooltip + " IV";
|
||||
|
||||
if (tag.equals(tooltip + " IV"))
|
||||
return tooltip + " V";
|
||||
if (tag.equals(tooltip + " IV")) return tooltip + " V";
|
||||
|
||||
if (tag.equals(tooltip + " V"))
|
||||
return tooltip + " VI";
|
||||
if (tag.equals(tooltip + " V")) return tooltip + " VI";
|
||||
|
||||
if (tag.equals(tooltip + " VI"))
|
||||
return tooltip + " VII";
|
||||
if (tag.equals(tooltip + " VI")) return tooltip + " VII";
|
||||
|
||||
if (tag.equals(tooltip + " VII"))
|
||||
return tooltip + " VIII";
|
||||
if (tag.equals(tooltip + " VII")) return tooltip + " VIII";
|
||||
|
||||
if (tag.equals(tooltip + " VIII"))
|
||||
return tooltip + " IX";
|
||||
if (tag.equals(tooltip + " VIII")) return tooltip + " IX";
|
||||
|
||||
if (tag.equals(tooltip + " IX"))
|
||||
return tooltip + " X";
|
||||
if (tag.equals(tooltip + " IX")) return tooltip + " X";
|
||||
|
||||
return tooltip + " X+";
|
||||
}
|
||||
|
||||
public boolean validType (IModifyable input)
|
||||
{
|
||||
public boolean validType(IModifyable input) {
|
||||
return input.getModifyType().equals("Tool");
|
||||
}
|
||||
|
||||
// Helper methods
|
||||
public boolean areItemsEquivalent (ItemStack stack1, ItemStack stack2)
|
||||
{
|
||||
if (stack1.getItem() != stack2.getItem())
|
||||
return false;
|
||||
public boolean areItemsEquivalent(ItemStack stack1, ItemStack stack2) {
|
||||
if (stack1.getItem() != stack2.getItem()) return false;
|
||||
return ItemStack.areItemStackTagsEqual(stack1, stack2);
|
||||
}
|
||||
|
||||
public boolean areItemStacksEquivalent (ItemStack stack1, ItemStack stack2)
|
||||
{
|
||||
if (stack1.getItem() != stack2.getItem())
|
||||
return false;
|
||||
if (stack1.getItemDamage() != stack2.getItemDamage())
|
||||
return false;
|
||||
public boolean areItemStacksEquivalent(ItemStack stack1, ItemStack stack2) {
|
||||
if (stack1.getItem() != stack2.getItem()) return false;
|
||||
if (stack1.getItemDamage() != stack2.getItemDamage()) return false;
|
||||
return ItemStack.areItemStackTagsEqual(stack1, stack2);
|
||||
}
|
||||
|
||||
public static NBTTagCompound getAttributeTag (String attributeType, String modifierName, double amount, boolean flat, UUID uuid)
|
||||
{
|
||||
public static NBTTagCompound getAttributeTag(
|
||||
String attributeType, String modifierName, double amount, boolean flat, UUID uuid) {
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
tag.setString("AttributeName", attributeType);
|
||||
tag.setString("Name", modifierName);
|
||||
tag.setDouble("Amount", amount);
|
||||
tag.setInteger("Operation", flat ? 0 : 1);//0 = flat increase, 1 = % increase
|
||||
tag.setInteger("Operation", flat ? 0 : 1); // 0 = flat increase, 1 = % increase
|
||||
tag.setLong("UUIDMost", uuid.getMostSignificantBits());
|
||||
tag.setLong("UUIDLeast", uuid.getLeastSignificantBits());
|
||||
return tag;
|
||||
|
||||
Reference in new issue
Block a user