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

+174 -347
View File
@@ -20,81 +20,68 @@ import tconstruct.tools.entity.ArrowEntity;
import tconstruct.util.config.PHConstruct;
@Deprecated
public abstract class BowBase extends ToolCore
{
public BowBase()
{
public abstract class BowBase extends ToolCore {
public BowBase() {
super(0);
}
@Override
public int durabilityTypeAccessory ()
{
public int durabilityTypeAccessory() {
return 2;
}
/* Bow usage */
@Override
public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer player, int useRemaining)
{
public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int useRemaining) {
int time = this.getMaxItemUseDuration(stack) - useRemaining;
ArrowLooseEvent event = new ArrowLooseEvent(player, stack, time);
MinecraftForge.EVENT_BUS.post(event);
if (event.isCanceled())
{
if (event.isCanceled()) {
return;
}
time = event.charge;
boolean creative = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
boolean creative = player.capabilities.isCreativeMode
|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
int slotID = getInventorySlotContainItem(TinkerTools.arrow, player.inventory);
int arrowID = getInventorySlotContainItem(Items.arrow, player.inventory);
int arrowState = 0;
ItemStack tinkerArrow = null;
if (slotID != -1)
tinkerArrow = player.inventory.getStackInSlot(slotID);
if (slotID != -1) tinkerArrow = player.inventory.getStackInSlot(slotID);
if (creative || tinkerArrow != null || arrowID != -1)
{
if (creative || tinkerArrow != null || arrowID != -1) {
NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool");
float drawTime = toolTag.getInteger("DrawSpeed");
float flightSpeed = toolTag.getFloat("FlightSpeed");
float speedBase = (float) time / drawTime;
speedBase = (speedBase * speedBase + speedBase * 2.0F) / 3.0F;
if ((double) speedBase < 0.1D)
{
if ((double) speedBase < 0.1D) {
return;
}
if (speedBase > flightSpeed)
{
if (speedBase > flightSpeed) {
speedBase = flightSpeed;
}
EntityArrow arrowEntity = null;
// if (tinkerArrow != null)
if (slotID != -1 && (arrowID == -1 || slotID < arrowID))
{
if (slotID != -1 && (arrowID == -1 || slotID < arrowID)) {
ItemStack arrowStack = tinkerArrow.copy();
arrowStack.stackSize = 1;
arrowEntity = new ArrowEntity(world, player, speedBase * 2.0F, arrowStack);
}
else
{
} else {
arrowEntity = new EntityArrow(world, player, speedBase * 2.0F);
}
if (speedBase >= 1.0F)
{
if (speedBase >= 1.0F) {
arrowEntity.setIsCritical(true);
}
int var9 = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, stack);
if (var9 > 0)
{
if (var9 > 0) {
arrowEntity.setDamage(arrowEntity.getDamage() + (double) var9 * 0.5D + 0.5D);
}
@@ -104,57 +91,44 @@ public abstract class BowBase extends ToolCore
((ArrowEntity) arrowEntity).setKnockbackModStrength(toolTag.getFloat("Knockback"));
// var10 += toolTag.getFloat("Knockback");
if (var10 > 0)
{
if (var10 > 0) {
arrowEntity.setKnockbackStrength(var10);
}
if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, stack) > 0)
{
if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, stack) > 0) {
arrowEntity.setFire(100);
}
int reinforced = 0;
if (toolTag.hasKey("Unbreaking"))
reinforced = toolTag.getInteger("Unbreaking");
if (toolTag.hasKey("Unbreaking")) reinforced = toolTag.getInteger("Unbreaking");
if (random.nextInt(10) < 10 - reinforced)
{
if (random.nextInt(10) < 10 - reinforced) {
AbilityHelper.damageTool(stack, 1, player, false);
}
world.playSoundAtEntity(player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + speedBase * 0.5F);
world.playSoundAtEntity(
player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + speedBase * 0.5F);
if (creative)
{
if (creative) {
arrowEntity.canBePickedUp = 2;
}
else
{
} else {
// if (tinkerArrow != null)
if (slotID != -1 && (arrowID == -1 || slotID < arrowID))
{
if (slotID != -1 && (arrowID == -1 || slotID < arrowID)) {
player.inventory.consumeInventoryItem(TinkerTools.arrow);
}
else
{
} else {
player.inventory.consumeInventoryItem(Items.arrow);
}
}
if (!world.isRemote)
{
if (!world.isRemote) {
world.spawnEntityInWorld(arrowEntity);
}
}
}
int getInventorySlotContainItem (Item item, InventoryPlayer inventory)
{
for (int j = 0; j < inventory.mainInventory.length; ++j)
{
if (inventory.mainInventory[j] != null && inventory.mainInventory[j].getItem() == item)
{
int getInventorySlotContainItem(Item item, InventoryPlayer inventory) {
for (int j = 0; j < inventory.mainInventory.length; ++j) {
if (inventory.mainInventory[j] != null && inventory.mainInventory[j].getItem() == item) {
return j;
}
}
@@ -162,8 +136,7 @@ public abstract class BowBase extends ToolCore
return -1;
}
public ItemStack onFoodEaten (ItemStack stack, World par2World, EntityPlayer par3EntityPlayer)
{
public ItemStack onFoodEaten(ItemStack stack, World par2World, EntityPlayer par3EntityPlayer) {
return stack;
}
@@ -171,8 +144,7 @@ public abstract class BowBase extends ToolCore
* How long it takes to use or consume an item
*/
@Override
public int getMaxItemUseDuration (ItemStack par1ItemStack)
{
public int getMaxItemUseDuration(ItemStack par1ItemStack) {
return 72000;
}
@@ -181,8 +153,7 @@ public abstract class BowBase extends ToolCore
* is being used
*/
@Override
public EnumAction getItemUseAction (ItemStack par1ItemStack)
{
public EnumAction getItemUseAction(ItemStack par1ItemStack) {
return EnumAction.bow;
}
@@ -191,22 +162,19 @@ public abstract class BowBase extends ToolCore
* pressed. Args: itemStack, world, entityPlayer
*/
@Override
public ItemStack onItemRightClick (ItemStack stack, World par2World, EntityPlayer player)
{
if (stack.hasTagCompound())
{
public ItemStack onItemRightClick(ItemStack stack, World par2World, EntityPlayer player) {
if (stack.hasTagCompound()) {
NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool");
if (!toolTag.getBoolean("Broken"))
{
if (!toolTag.getBoolean("Broken")) {
ArrowNockEvent event = new ArrowNockEvent(player, stack);
MinecraftForge.EVENT_BUS.post(event);
if (event.isCanceled())
{
if (event.isCanceled()) {
return event.result;
}
if (player.capabilities.isCreativeMode || player.inventory.hasItemStack(new ItemStack(Items.arrow)) || player.inventory.hasItemStack(new ItemStack(TinkerTools.arrow)))
{
if (player.capabilities.isCreativeMode
|| player.inventory.hasItemStack(new ItemStack(Items.arrow))
|| player.inventory.hasItemStack(new ItemStack(TinkerTools.arrow))) {
player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
}
}
@@ -217,45 +185,50 @@ public abstract class BowBase extends ToolCore
/* Rendering */
@Override
public void registerIcons (IIconRegister iconRegister)
{
public void registerIcons(IIconRegister iconRegister) {
super.registerIcons(iconRegister);
if(PHConstruct.minimalTextures)
{
if (PHConstruct.minimalTextures) {
headIcons1.clear();
headIcons1.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_1"));
headIcons1.put(
-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_1"));
handleIcons1.clear();
handleIcons1.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_1"));
handleIcons1.put(
-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_1"));
accessoryIcons1.clear();
accessoryIcons1.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_1"));
accessoryIcons1.put(
-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_1"));
headIcons2.clear();
headIcons2.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_2"));
headIcons2.put(
-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_2"));
handleIcons2.clear();
handleIcons2.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_2"));
handleIcons2.put(
-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_2"));
accessoryIcons2.clear();
accessoryIcons2.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_2"));
accessoryIcons2.put(
-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_2"));
headIcons3.clear();
headIcons3.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_3"));
headIcons3.put(
-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(0) + "_3"));
handleIcons3.clear();
handleIcons3.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_3"));
handleIcons3.put(
-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(2) + "_3"));
accessoryIcons3.clear();
accessoryIcons3.put(-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_3"));
accessoryIcons3.put(
-1, iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/" + getIconSuffix(3) + "_3"));
// effect icons
effectIcons1.clear();
effectIcons2.clear();
effectIcons3.clear();
for(Map.Entry<Integer, String> entry : effectStrings.entrySet()) {
for (Map.Entry<Integer, String> entry : effectStrings.entrySet()) {
effectIcons.put(entry.getKey(), iconRegister.registerIcon(entry.getValue()));
effectIcons1.put(entry.getKey(), iconRegister.registerIcon(entry.getValue() + "_1"));
effectIcons2.put(entry.getKey(), iconRegister.registerIcon(entry.getValue() + "_2"));
effectIcons3.put(entry.getKey(), iconRegister.registerIcon(entry.getValue() + "_3"));
}
}
else {
} else {
headIcons1.clear();
handleIcons1.clear();
accessoryIcons1.clear();
@@ -277,7 +250,8 @@ public abstract class BowBase extends ToolCore
iterOne = accessoryStrings.entrySet().iterator();
while (iterOne.hasNext()) {
Map.Entry pairs = (Map.Entry) iterOne.next();
accessoryIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1"));
accessoryIcons1.put(
(Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1"));
}
}
@@ -285,7 +259,8 @@ public abstract class BowBase extends ToolCore
iterOne = extraStrings.entrySet().iterator();
while (iterOne.hasNext()) {
Map.Entry pairs = (Map.Entry) iterOne.next();
extraIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1"));
extraIcons1.put(
(Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1"));
}
}
@@ -316,7 +291,8 @@ public abstract class BowBase extends ToolCore
iterTwo = accessoryStrings.entrySet().iterator();
while (iterTwo.hasNext()) {
Map.Entry pairs = (Map.Entry) iterTwo.next();
accessoryIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2"));
accessoryIcons2.put(
(Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2"));
}
}
@@ -324,7 +300,8 @@ public abstract class BowBase extends ToolCore
iterTwo = extraStrings.entrySet().iterator();
while (iterTwo.hasNext()) {
Map.Entry pairs = (Map.Entry) iterTwo.next();
extraIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2"));
extraIcons2.put(
(Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2"));
}
}
@@ -355,7 +332,8 @@ public abstract class BowBase extends ToolCore
iterThree = accessoryStrings.entrySet().iterator();
while (iterThree.hasNext()) {
Map.Entry pairs = (Map.Entry) iterThree.next();
accessoryIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3"));
accessoryIcons3.put(
(Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3"));
}
}
@@ -363,7 +341,8 @@ public abstract class BowBase extends ToolCore
iterThree = extraStrings.entrySet().iterator();
while (iterThree.hasNext()) {
Map.Entry pairs = (Map.Entry) iterThree.next();
extraIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3"));
extraIcons3.put(
(Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3"));
}
}
@@ -376,82 +355,46 @@ public abstract class BowBase extends ToolCore
registerArrows(iconRegister);
}
void registerArrows (IIconRegister iconRegister)
{
void registerArrows(IIconRegister iconRegister) {
arrow1 = iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/arrow_1");
arrow2 = iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/arrow_2");
arrow3 = iconRegister.registerIcon("tinker:" + getDefaultFolder() + "/arrow_3");
}
@Override
public IIcon getIcon (ItemStack stack, int renderPass)
{
public IIcon getIcon(ItemStack stack, int renderPass) {
NBTTagCompound tags = stack.getTagCompound();
if (tags != null)
{
if (tags != null) {
tags = stack.getTagCompound().getCompoundTag("InfiTool");
if (renderPass < getPartAmount())
{
if (renderPass < getPartAmount()) {
if (renderPass == 0) // Handle
{
if (tags.getBoolean("Broken"))
return getCorrectIcon(brokenIcons, tags.getInteger("RenderHandle"));
if (tags.getBoolean("Broken")) return getCorrectIcon(brokenIcons, tags.getInteger("RenderHandle"));
return getCorrectIcon(handleIcons, tags.getInteger("RenderHandle"));
}
else if (renderPass == 1) // Head
} else if (renderPass == 1) // Head
{
return getCorrectIcon(headIcons, tags.getInteger("RenderHead"));
}
else if (renderPass == 2) // Accessory
} else if (renderPass == 2) // Accessory
{
return getCorrectIcon(accessoryIcons, tags.getInteger("RenderAccessory"));
}
else if (renderPass == 3) // Extra
} else if (renderPass == 3) // Extra
{
return getCorrectIcon(extraIcons, tags.getInteger("RenderExtra"));
}
}
else
{
if (renderPass == getPartAmount())
{
if (tags.hasKey("Effect1"))
return getCorrectIcon2(effectIcons, tags.getInteger("Effect1"));
}
else if (renderPass == getPartAmount() + 1)
{
if (tags.hasKey("Effect2"))
return getCorrectIcon2(effectIcons, tags.getInteger("Effect2"));
}
else if (renderPass == getPartAmount() + 2)
{
if (tags.hasKey("Effect3"))
return getCorrectIcon2(effectIcons, tags.getInteger("Effect3"));
}
else if (renderPass == getPartAmount() + 3)
{
if (tags.hasKey("Effect4"))
return getCorrectIcon2(effectIcons, tags.getInteger("Effect4"));
}
else if (renderPass == getPartAmount() + 4)
{
if (tags.hasKey("Effect5"))
return getCorrectIcon2(effectIcons, tags.getInteger("Effect5"));
}
else if (renderPass == getPartAmount() + 5)
{
if (tags.hasKey("Effect6"))
return getCorrectIcon2(effectIcons, tags.getInteger("Effect6"));
} else {
if (renderPass == getPartAmount()) {
if (tags.hasKey("Effect1")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect1"));
} else if (renderPass == getPartAmount() + 1) {
if (tags.hasKey("Effect2")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect2"));
} else if (renderPass == getPartAmount() + 2) {
if (tags.hasKey("Effect3")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect3"));
} else if (renderPass == getPartAmount() + 3) {
if (tags.hasKey("Effect4")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect4"));
} else if (renderPass == getPartAmount() + 4) {
if (tags.hasKey("Effect5")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect5"));
} else if (renderPass == getPartAmount() + 5) {
if (tags.hasKey("Effect6")) return getCorrectIcon2(effectIcons, tags.getInteger("Effect6"));
}
}
return blankSprite;
@@ -459,30 +402,24 @@ public abstract class BowBase extends ToolCore
return emptyIcon;
}
protected IIcon getCorrectIcon2(Map<Integer, IIcon> icons, int id)
{
if(!icons.containsKey(id))
return blankSprite;
protected IIcon getCorrectIcon2(Map<Integer, IIcon> icons, int id) {
if (!icons.containsKey(id)) return blankSprite;
return icons.get(id);
}
/* Animations */
@Override
public void registerPartPaths (int index, String[] location)
{
public void registerPartPaths(int index, String[] location) {
headStrings.put(index, location[0]);
// brokenHeadStrings.put(index, location[1]);
// handleStrings.put(index, location[2]);
if (location.length > 3)
accessoryStrings.put(index, location[3]);
if (location.length > 4)
extraStrings.put(index, location[4]);
if (location.length > 3) accessoryStrings.put(index, location[3]);
if (location.length > 4) extraStrings.put(index, location[4]);
}
@Override
public void registerAlternatePartPaths (int index, String[] location)
{
public void registerAlternatePartPaths(int index, String[] location) {
brokenPartStrings.put(index, location[1]);
handleStrings.put(index, location[2]);
}
@@ -510,100 +447,59 @@ public abstract class BowBase extends ToolCore
public HashMap<Integer, IIcon> effectIcons3 = new HashMap<Integer, IIcon>();
@Override
public IIcon getIcon (ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining)
{
public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
int useTime = stack.getMaxItemUseDuration() - useRemaining;
if (!stack.hasTagCompound())
return emptyIcon;
if (!stack.hasTagCompound()) return emptyIcon;
NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool");
int drawTime = toolTag.getInteger("DrawSpeed");
float flightSpeed = toolTag.getFloat("FlightSpeed");
drawTime *= flightSpeed;
if (usingItem == null)
{
if (usingItem == null) {
return getIcon(stack, renderPass);
}
if (useTime >= drawTime - 2)
{
if (useTime >= drawTime - 2) {
return getIcon3(stack, renderPass);
}
if (useTime >= (drawTime * 2 / 3))
{
if (useTime >= (drawTime * 2 / 3)) {
return getIcon2(stack, renderPass);
}
return getIcon1(stack, renderPass);
}
public IIcon getIcon1 (ItemStack stack, int renderPass)
{
public IIcon getIcon1(ItemStack stack, int renderPass) {
NBTTagCompound tags = stack.getTagCompound();
if (tags != null)
{
if (tags != null) {
tags = stack.getTagCompound().getCompoundTag("InfiTool");
if (renderPass < getPartAmount())
{
if (renderPass < getPartAmount()) {
if (renderPass == 0) // Handle
{
return getCorrectIcon(handleIcons1, tags.getInteger("RenderHandle"));
}
else if (renderPass == 1) // Head
} else if (renderPass == 1) // Head
{
return getCorrectIcon(headIcons1, tags.getInteger("RenderHead"));
}
else if (renderPass == 2) // Accessory
} else if (renderPass == 2) // Accessory
{
return getCorrectIcon(accessoryIcons1, tags.getInteger("RenderAccessory"));
}
else if (renderPass == 3) // Extra
} else if (renderPass == 3) // Extra
{
return getCorrectIcon(extraIcons1, tags.getInteger("RenderExtra"));
}
}
else
{
if (renderPass == getPartAmount())
{
if (tags.hasKey("Effect1"))
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect1"));
}
else if (renderPass == getPartAmount() + 1)
{
if (tags.hasKey("Effect2"))
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect2"));
}
else if (renderPass == getPartAmount() + 2)
{
if (tags.hasKey("Effect3"))
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect3"));
}
else if (renderPass == getPartAmount() + 3)
{
if (tags.hasKey("Effect4"))
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect4"));
}
else if (renderPass == getPartAmount() + 4)
{
if (tags.hasKey("Effect5"))
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect5"));
}
else if (renderPass == getPartAmount() + 5)
{
if (tags.hasKey("Effect6"))
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect6"));
}
else
{
} else {
if (renderPass == getPartAmount()) {
if (tags.hasKey("Effect1")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect1"));
} else if (renderPass == getPartAmount() + 1) {
if (tags.hasKey("Effect2")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect2"));
} else if (renderPass == getPartAmount() + 2) {
if (tags.hasKey("Effect3")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect3"));
} else if (renderPass == getPartAmount() + 3) {
if (tags.hasKey("Effect4")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect4"));
} else if (renderPass == getPartAmount() + 4) {
if (tags.hasKey("Effect5")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect5"));
} else if (renderPass == getPartAmount() + 5) {
if (tags.hasKey("Effect6")) return getCorrectIcon2(effectIcons1, tags.getInteger("Effect6"));
} else {
return arrow1;
}
}
@@ -612,75 +508,39 @@ public abstract class BowBase extends ToolCore
return emptyIcon;
}
public IIcon getIcon2 (ItemStack stack, int renderPass)
{
public IIcon getIcon2(ItemStack stack, int renderPass) {
NBTTagCompound tags = stack.getTagCompound();
if (tags != null)
{
if (tags != null) {
tags = stack.getTagCompound().getCompoundTag("InfiTool");
if (renderPass < getPartAmount())
{
if (renderPass < getPartAmount()) {
if (renderPass == 0) // Handle
{
return getCorrectIcon(handleIcons2, tags.getInteger("RenderHandle"));
}
else if (renderPass == 1) // Head
} else if (renderPass == 1) // Head
{
return getCorrectIcon(headIcons2, tags.getInteger("RenderHead"));
}
else if (renderPass == 2) // Accessory
} else if (renderPass == 2) // Accessory
{
return getCorrectIcon(accessoryIcons2, tags.getInteger("RenderAccessory"));
}
else if (renderPass == 3) // Extra
} else if (renderPass == 3) // Extra
{
return getCorrectIcon(extraIcons2, tags.getInteger("RenderExtra"));
}
}
else
{
if (renderPass == getPartAmount())
{
if (tags.hasKey("Effect1"))
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect1"));
}
else if (renderPass == getPartAmount() + 1)
{
if (tags.hasKey("Effect2"))
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect2"));
}
else if (renderPass == getPartAmount() + 2)
{
if (tags.hasKey("Effect3"))
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect3"));
}
else if (renderPass == getPartAmount() + 3)
{
if (tags.hasKey("Effect4"))
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect4"));
}
else if (renderPass == getPartAmount() + 4)
{
if (tags.hasKey("Effect5"))
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect5"));
}
else if (renderPass == getPartAmount() + 5)
{
if (tags.hasKey("Effect6"))
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect6"));
}
else
{
} else {
if (renderPass == getPartAmount()) {
if (tags.hasKey("Effect1")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect1"));
} else if (renderPass == getPartAmount() + 1) {
if (tags.hasKey("Effect2")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect2"));
} else if (renderPass == getPartAmount() + 2) {
if (tags.hasKey("Effect3")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect3"));
} else if (renderPass == getPartAmount() + 3) {
if (tags.hasKey("Effect4")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect4"));
} else if (renderPass == getPartAmount() + 4) {
if (tags.hasKey("Effect5")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect5"));
} else if (renderPass == getPartAmount() + 5) {
if (tags.hasKey("Effect6")) return getCorrectIcon2(effectIcons2, tags.getInteger("Effect6"));
} else {
return arrow2;
}
}
@@ -689,75 +549,39 @@ public abstract class BowBase extends ToolCore
return emptyIcon;
}
public IIcon getIcon3 (ItemStack stack, int renderPass)
{
public IIcon getIcon3(ItemStack stack, int renderPass) {
NBTTagCompound tags = stack.getTagCompound();
if (tags != null)
{
if (tags != null) {
tags = stack.getTagCompound().getCompoundTag("InfiTool");
if (renderPass < getPartAmount())
{
if (renderPass < getPartAmount()) {
if (renderPass == 0) // Handle
{
return getCorrectIcon(handleIcons3, tags.getInteger("RenderHandle"));
}
else if (renderPass == 1) // Head
} else if (renderPass == 1) // Head
{
return getCorrectIcon(headIcons3, tags.getInteger("RenderHead"));
}
else if (renderPass == 2) // Accessory
} else if (renderPass == 2) // Accessory
{
return getCorrectIcon(accessoryIcons3, tags.getInteger("RenderAccessory"));
}
else if (renderPass == 3) // Extra
} else if (renderPass == 3) // Extra
{
return getCorrectIcon(extraIcons3, tags.getInteger("RenderExtra"));
}
}
else
{
if (renderPass == getPartAmount())
{
if (tags.hasKey("Effect1"))
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect1"));
}
else if (renderPass == getPartAmount() + 1)
{
if (tags.hasKey("Effect2"))
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect2"));
}
else if (renderPass == getPartAmount() + 2)
{
if (tags.hasKey("Effect3"))
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect3"));
}
else if (renderPass == getPartAmount() + 3)
{
if (tags.hasKey("Effect4"))
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect4"));
}
else if (renderPass == getPartAmount() + 4)
{
if (tags.hasKey("Effect5"))
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect5"));
}
else if (renderPass == getPartAmount() + 5)
{
if (tags.hasKey("Effect6"))
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect6"));
}
else
{
} else {
if (renderPass == getPartAmount()) {
if (tags.hasKey("Effect1")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect1"));
} else if (renderPass == getPartAmount() + 1) {
if (tags.hasKey("Effect2")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect2"));
} else if (renderPass == getPartAmount() + 2) {
if (tags.hasKey("Effect3")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect3"));
} else if (renderPass == getPartAmount() + 3) {
if (tags.hasKey("Effect4")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect4"));
} else if (renderPass == getPartAmount() + 4) {
if (tags.hasKey("Effect5")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect5"));
} else if (renderPass == getPartAmount() + 5) {
if (tags.hasKey("Effect6")) return getCorrectIcon2(effectIcons3, tags.getInteger("Effect6"));
} else {
return arrow3;
}
}
@@ -767,15 +591,18 @@ public abstract class BowBase extends ToolCore
}
@Override
public void buildTool (int id, String name, List list)
{
public void buildTool(int id, String name, List list) {
Item accessory = getAccessoryItem();
ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, id) : null;
Item extra = getExtraItem();
ItemStack extraStack = extra != null ? new ItemStack(getExtraItem(), 1, id) : null;
ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name);
if (tool == null)
return;
ItemStack tool = ToolBuilder.instance.buildTool(
new ItemStack(getHeadItem(), 1, id),
new ItemStack(getHandleItem(), 1, id),
accessoryStack,
extraStack,
name);
if (tool == null) return;
tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
list.add(tool);