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

@@ -12,11 +12,9 @@ import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.*;
import tconstruct.library.tools.ToolCore;
public class CreativeModifier extends Item
{
public class CreativeModifier extends Item {
public CreativeModifier()
{
public CreativeModifier() {
super();
this.setCreativeTab(TConstructRegistry.materialTab);
}
@@ -26,12 +24,10 @@ public class CreativeModifier extends Item
* returns a list of items with the same ID, but different meta (eg: dye returns 16 items)
*/
@Override
public void getSubItems (Item par1, CreativeTabs par2CreativeTabs, List par3List)
{
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
par3List.add(new ItemStack(par1, 1, 0));
for (ToolRecipe recipe : ToolBuilder.instance.combos)
{
for (ToolRecipe recipe : ToolBuilder.instance.combos) {
ToolCore tool = recipe.getType();
ItemStack item = new ItemStack(par1, 1, 0);
NBTTagCompound compound = new NBTTagCompound();
@@ -44,21 +40,18 @@ public class CreativeModifier extends Item
@SideOnly(Side.CLIENT)
@Override
public void registerIcons (IIconRegister iconRegister)
{
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon("tinker:skull_char_gold");
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
if (stack.hasTagCompound())
{
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
if (stack.hasTagCompound()) {
String targetLock = "None";
targetLock = stack.getTagCompound().getString("TargetLock");
targetLock = StatCollector.translateToLocal("infitool." + targetLock.toLowerCase());
list.add(StatCollector.translateToLocal("creativeModLock.tooltip") + targetLock);
}
}
}
}