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:
Raven Szewczyk authored and GitHub committed 2022-09-22 20:51:23 +02:00
1 parent 18bfeaff32
commit 39be06c23b
571 files changed
+25959 -28223

No files matched your search

@@ -5,17 +5,14 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.*;
import tconstruct.library.armor.ArmorPart;
public class AModLeadBoots extends AModBoolean
{
public class AModLeadBoots extends AModBoolean {
public AModLeadBoots(ItemStack[] items)
{
public AModLeadBoots(ItemStack[] items) {
super(2, "LeadBoots", EnumSet.of(ArmorPart.Feet), items, "\u00a78", "Lead Boots");
}
@Override
public void modify (ItemStack[] recipe, ItemStack armor)
{
public void modify(ItemStack[] recipe, ItemStack armor) {
NBTTagCompound baseTag = armor.getTagCompound();
NBTTagCompound armorTag = armor.getTagCompound().getCompoundTag(getTagName(armor));
@@ -28,18 +25,13 @@ public class AModLeadBoots extends AModBoolean
addToolTip(armor, color + tooltipName, color + key);
NBTTagList attributes;
if (baseTag.hasKey("AttributeModifiers"))
{
if (baseTag.hasKey("AttributeModifiers")) {
attributes = baseTag.getTagList("AttributeModifiers", 0);
for (int iter = 0; iter < attributes.tagCount(); iter++)
{
for (int iter = 0; iter < attributes.tagCount(); iter++) {
NBTTagCompound tag = (NBTTagCompound) attributes.getCompoundTagAt(iter);
if (tag.getString("AttributeName").equals("generic.knockbackResistance"))
attributes.removeTag(iter);
if (tag.getString("AttributeName").equals("generic.knockbackResistance")) attributes.removeTag(iter);
}
}
else
{
} else {
attributes = new NBTTagList();
baseTag.setTag("AttributeModifiers", attributes);
}