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

@@ -2,153 +2,130 @@ package tconstruct.items.tools;
import cpw.mods.fml.relauncher.*;
import java.util.List;
import mantle.world.WorldHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.*;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.*;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.BlockEvent;
import tconstruct.library.*;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.tools.*;
import tconstruct.tools.TinkerTools;
public class Hammer extends AOEHarvestTool
{
public Hammer()
{
public class Hammer extends AOEHarvestTool {
public Hammer() {
super(2, 1, 0);
this.setUnlocalizedName("InfiTool.Hammer");
}
@Override
public int getPartAmount ()
{
public int getPartAmount() {
return 4;
}
@Override
public int durabilityTypeAccessory ()
{
public int durabilityTypeAccessory() {
return 2;
}
@Override
public int durabilityTypeExtra ()
{
public int durabilityTypeExtra() {
return 2;
}
@Override
protected String getHarvestType ()
{
protected String getHarvestType() {
return "pickaxe";
}
@Override
protected Material[] getEffectiveMaterials ()
{
protected Material[] getEffectiveMaterials() {
return materials;
}
static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil };
static Material[] materials =
new Material[] {Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil
};
@Override
public Item getHeadItem ()
{
public Item getHeadItem() {
return TinkerTools.hammerHead;
}
@Override
public Item getHandleItem ()
{
public Item getHandleItem() {
return TinkerTools.toughRod;
}
@Override
public Item getAccessoryItem ()
{
public Item getAccessoryItem() {
return TinkerTools.largePlate;
}
@Override
public Item getExtraItem ()
{
public Item getExtraItem() {
return TinkerTools.largePlate;
}
@Override
public float getDurabilityModifier ()
{
public float getDurabilityModifier() {
return 4.5f;
}
@Override
public String getIconSuffix (int partType)
{
switch (partType)
{
case 0:
return "_hammer_head";
case 1:
return "_hammer_handle_broken";
case 2:
return "_hammer_handle";
case 3:
return "_hammer_front";
case 4:
return "_hammer_back";
default:
return "";
public String getIconSuffix(int partType) {
switch (partType) {
case 0:
return "_hammer_head";
case 1:
return "_hammer_handle_broken";
case 2:
return "_hammer_handle";
case 3:
return "_hammer_front";
case 4:
return "_hammer_back";
default:
return "";
}
}
@Override
public String getEffectSuffix ()
{
public String getEffectSuffix() {
return "_hammer_effect";
}
@Override
public String getDefaultFolder ()
{
public String getDefaultFolder() {
return "hammer";
}
@Override
public IIcon getIcon (ItemStack stack, int renderPass)
{
public IIcon getIcon(ItemStack stack, int renderPass) {
NBTTagCompound tags = stack.getTagCompound();
if (tags != null) {
tags = stack.getTagCompound().getCompoundTag("InfiTool");
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)
return getCorrectIcon(headIcons, tags.getInteger("RenderHead"));
} else if (renderPass == 1) return getCorrectIcon(headIcons, tags.getInteger("RenderHead"));
}
return super.getIcon(stack, renderPass);
}
@Override
public void getSubItems (Item id, CreativeTabs tab, List list)
{
public void getSubItems(Item id, CreativeTabs tab, List list) {
super.getSubItems(id, tab, list);
ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 10), new ItemStack(getHandleItem(), 1, 8), new ItemStack(getAccessoryItem(), 1, 11), new ItemStack(getExtraItem(), 1, 11), StatCollector.translateToLocal("tool.infiminer"));
ItemStack tool = ToolBuilder.instance.buildTool(
new ItemStack(getHeadItem(), 1, 10),
new ItemStack(getHandleItem(), 1, 8),
new ItemStack(getAccessoryItem(), 1, 11),
new ItemStack(getExtraItem(), 1, 11),
StatCollector.translateToLocal("tool.infiminer"));
NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
tags.setBoolean("Special", true);
@@ -163,24 +140,18 @@ public class Hammer extends AOEHarvestTool
list.add(tool);
}
@Override
public float breakSpeedModifier ()
{
public float breakSpeedModifier() {
return 0.4f;
}
@Override
public float stoneboundModifier ()
{
public float stoneboundModifier() {
return 216f;
}
@Override
public String[] getTraits ()
{
return new String[] { "weapon", "harvest", "melee", "bludgeoning" };
public String[] getTraits() {
return new String[] {"weapon", "harvest", "melee", "bludgeoning"};
}
}