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

@@ -7,24 +7,19 @@ import tconstruct.library.tools.Weapon;
import tconstruct.tools.TinkerTools;
import tconstruct.tools.entity.DaggerEntity;
public class Dagger extends Weapon
{
public Dagger()
{
public class Dagger extends Weapon {
public Dagger() {
super(1);
this.setUnlocalizedName("InfiTool.Dagger");
}
@Override
public ItemStack onItemRightClick (ItemStack itemstack, World world, EntityPlayer player)
{
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) {
ItemStack stack = itemstack.copy();
if (!world.isRemote)
{
if (!world.isRemote) {
DaggerEntity dagger = new DaggerEntity(world, player, 1.5f, 0, stack);
//dagger.motionY++;
if (player.capabilities.isCreativeMode)
dagger.canBePickedUp = 2;
// dagger.motionY++;
if (player.capabilities.isCreativeMode) dagger.canBePickedUp = 2;
world.spawnEntityInWorld(dagger);
}
itemstack.stackSize--;
@@ -32,13 +27,11 @@ public class Dagger extends Weapon
}
@Override
public ItemStack onEaten (ItemStack itemstack, World world, EntityPlayer player)
{
public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer player) {
ItemStack stack = itemstack.copy();
if (!world.isRemote)
{
if (!world.isRemote) {
DaggerEntity dagger = new DaggerEntity(world, player, 1.5f, 0, stack);
//dagger.motionY++;
// dagger.motionY++;
world.spawnEntityInWorld(dagger);
}
itemstack.stackSize--;
@@ -46,67 +39,57 @@ public class Dagger extends Weapon
}
@Override
public String[] getTraits ()
{
return new String[] { "weapon", "melee", "throwing" };
public String[] getTraits() {
return new String[] {"weapon", "melee", "throwing"};
}
@Override
public EnumAction getItemUseAction (ItemStack par1ItemStack)
{
public EnumAction getItemUseAction(ItemStack par1ItemStack) {
return EnumAction.bow;
}
@Override
public int getMaxItemUseDuration (ItemStack stack)
{
public int getMaxItemUseDuration(ItemStack stack) {
return 10;
}
public boolean rangedTool ()
{
public boolean rangedTool() {
return true;
}
@Override
public String getIconSuffix (int partType)
{
switch (partType)
{
case 0:
return "_dagger_blade";
case 1:
return "_dagger_blade_broken";
case 2:
return "_dagger_handle";
case 3:
return "_dagger_accessory";
default:
return "";
public String getIconSuffix(int partType) {
switch (partType) {
case 0:
return "_dagger_blade";
case 1:
return "_dagger_blade_broken";
case 2:
return "_dagger_handle";
case 3:
return "_dagger_accessory";
default:
return "";
}
}
@Override
public String getEffectSuffix ()
{
public String getEffectSuffix() {
return "_dagger_effect";
}
@Override
public String getDefaultFolder ()
{
public String getDefaultFolder() {
return "dagger";
}
@Override
public Item getHeadItem ()
{
public Item getHeadItem() {
return TinkerTools.knifeBlade;
}
@Override
public Item getAccessoryItem ()
{
public Item getAccessoryItem() {
return TinkerTools.crossbar;
}
}