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

@@ -1,138 +1,112 @@
package tconstruct.items.tools;
import cpw.mods.fml.relauncher.*;
import mantle.world.WorldHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.*;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.BlockEvent;
import tconstruct.library.*;
import tconstruct.library.tools.*;
import tconstruct.tools.TinkerTools;
public class Excavator extends AOEHarvestTool
{
public Excavator()
{
super(2, 1,0);
public class Excavator extends AOEHarvestTool {
public Excavator() {
super(2, 1, 0);
this.setUnlocalizedName("InfiTool.Excavator");
}
@Override
protected Material[] getEffectiveMaterials ()
{
protected Material[] getEffectiveMaterials() {
return materials;
}
@Override
protected String getHarvestType ()
{
protected String getHarvestType() {
return "shovel";
}
static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay };
static Material[] materials = {
Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay
};
@Override
public Item getHeadItem ()
{
public Item getHeadItem() {
return TinkerTools.excavatorHead;
}
@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.toughBinding;
}
@Override
public float getRepairCost ()
{
public float getRepairCost() {
return 4.0f;
}
@Override
public float getDurabilityModifier ()
{
public float getDurabilityModifier() {
return 2.75f;
}
@Override
public int durabilityTypeAccessory ()
{
public int durabilityTypeAccessory() {
return 2;
}
@Override
public int durabilityTypeExtra ()
{
public int durabilityTypeExtra() {
return 1;
}
@Override
public int getPartAmount ()
{
public int getPartAmount() {
return 4;
}
@Override
public String getIconSuffix (int partType)
{
switch (partType)
{
case 0:
return "_excavator_head";
case 1:
return "_excavator_head_broken";
case 2:
return "_excavator_handle";
case 3:
return "_excavator_binding";
case 4:
return "_excavator_grip";
default:
return "";
public String getIconSuffix(int partType) {
switch (partType) {
case 0:
return "_excavator_head";
case 1:
return "_excavator_head_broken";
case 2:
return "_excavator_handle";
case 3:
return "_excavator_binding";
case 4:
return "_excavator_grip";
default:
return "";
}
}
@Override
public String getEffectSuffix ()
{
public String getEffectSuffix() {
return "_excavator_effect";
}
@Override
public String getDefaultFolder ()
{
public String getDefaultFolder() {
return "excavator";
}
@Override
public float breakSpeedModifier ()
{
public float breakSpeedModifier() {
return 0.4f;
}
@Override
public float stoneboundModifier ()
{
public float stoneboundModifier() {
return 216f;
}
}