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,68 +5,59 @@ import net.minecraft.item.Item;
import tconstruct.library.tools.HarvestTool;
import tconstruct.tools.TinkerTools;
public class Pickaxe extends HarvestTool
{
public Pickaxe()
{
public class Pickaxe extends HarvestTool {
public Pickaxe() {
super(1);
this.setUnlocalizedName("InfiTool.Pickaxe");
}
@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, Material.circuits };
static Material[] materials = new Material[] {
Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil, Material.circuits
};
@Override
public Item getHeadItem ()
{
public Item getHeadItem() {
return TinkerTools.pickaxeHead;
}
@Override
public Item getAccessoryItem ()
{
public Item getAccessoryItem() {
return TinkerTools.binding;
}
@Override
public String getIconSuffix (int partType)
{
switch (partType)
{
case 0:
return "_pickaxe_head";
case 1:
return "_pickaxe_head_broken";
case 2:
return "_pickaxe_handle";
case 3:
return "_pickaxe_accessory";
default:
return "";
public String getIconSuffix(int partType) {
switch (partType) {
case 0:
return "_pickaxe_head";
case 1:
return "_pickaxe_head_broken";
case 2:
return "_pickaxe_handle";
case 3:
return "_pickaxe_accessory";
default:
return "";
}
}
@Override
public String getEffectSuffix ()
{
public String getEffectSuffix() {
return "_pickaxe_effect";
}
@Override
public String getDefaultFolder ()
{
public String getDefaultFolder() {
return "pickaxe";
}
}