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

@@ -10,18 +10,15 @@ import net.minecraft.potion.*;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
public class GoldenHead extends ItemFood
{
public GoldenHead(int par2, float par3, boolean par4)
{
public class GoldenHead extends ItemFood {
public GoldenHead(int par2, float par3, boolean par4) {
super(par2, par3, par4);
this.setHasSubtypes(true);
}
@Override
@SideOnly(Side.CLIENT)
public boolean hasEffect (ItemStack par1ItemStack)
{
public boolean hasEffect(ItemStack par1ItemStack) {
return par1ItemStack.getItemDamage() > 0;
}
@@ -30,25 +27,19 @@ public class GoldenHead extends ItemFood
/**
* Return an item rarity from EnumRarity
*/
public EnumRarity getRarity (ItemStack par1ItemStack)
{
public EnumRarity getRarity(ItemStack par1ItemStack) {
return par1ItemStack.getItemDamage() == 0 ? EnumRarity.rare : EnumRarity.epic;
}
@Override
protected void onFoodEaten (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
if (par1ItemStack.getItemDamage() > 0)
{
if (!par2World.isRemote)
{
protected void onFoodEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
if (par1ItemStack.getItemDamage() > 0) {
if (!par2World.isRemote) {
par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.regeneration.id, 600, 3));
par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.resistance.id, 6000, 0));
par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 6000, 0));
}
}
else
{
} else {
super.onFoodEaten(par1ItemStack, par2World, par3EntityPlayer);
}
}
@@ -58,22 +49,19 @@ public class GoldenHead extends ItemFood
/**
* returns a list of items with the same ID, but different meta (eg: dye returns 16 items)
*/
public void getSubItems (Item b, CreativeTabs par2CreativeTabs, List par3List)
{
public void getSubItems(Item b, CreativeTabs par2CreativeTabs, List par3List) {
par3List.add(new ItemStack(b, 1, 0));
}
@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)
{
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
list.add("\u00a75\u00a7o" + StatCollector.translateToLocal("goldenhead1.tooltip"));
list.add("\u00a75\u00a7o" + StatCollector.translateToLocal("goldenhead2.tooltip"));
}
@@ -11,62 +11,55 @@ import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import tconstruct.library.TConstructRegistry;
public class OreBerries extends CraftingItem
{
static String[] names = new String[] { "iron", "gold", "copper", "tin", "aluminum", "essence" };
static String[] tex = new String[] { "oreberry_iron", "oreberry_gold", "oreberry_copper", "oreberry_tin", "oreberry_aluminum", "oreberry_essence" };
public class OreBerries extends CraftingItem {
static String[] names = new String[] {"iron", "gold", "copper", "tin", "aluminum", "essence"};
static String[] tex = new String[] {
"oreberry_iron", "oreberry_gold", "oreberry_copper", "oreberry_tin", "oreberry_aluminum", "oreberry_essence"
};
public OreBerries()
{
public OreBerries() {
super(names, tex, "oreberries/", "tinker", TConstructRegistry.materialTab);
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
switch (stack.getItemDamage())
{
case 0:
list.add(StatCollector.translateToLocal("oreberries1.tooltip"));
break;
case 1:
list.add(StatCollector.translateToLocal("oreberries2.tooltip"));
break;
case 2:
list.add(StatCollector.translateToLocal("oreberries3.tooltip"));
break;
case 3:
list.add(StatCollector.translateToLocal("oreberries4.tooltip"));
break;
case 4:
list.add(StatCollector.translateToLocal("oreberries5.tooltip"));
break;
case 5:
list.add(StatCollector.translateToLocal("oreberries6.tooltip"));
break;
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
switch (stack.getItemDamage()) {
case 0:
list.add(StatCollector.translateToLocal("oreberries1.tooltip"));
break;
case 1:
list.add(StatCollector.translateToLocal("oreberries2.tooltip"));
break;
case 2:
list.add(StatCollector.translateToLocal("oreberries3.tooltip"));
break;
case 3:
list.add(StatCollector.translateToLocal("oreberries4.tooltip"));
break;
case 4:
list.add(StatCollector.translateToLocal("oreberries5.tooltip"));
break;
case 5:
list.add(StatCollector.translateToLocal("oreberries6.tooltip"));
break;
}
}
@Override
public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player)
{
if (stack.getItemDamage() == 5)
{
EntityXPOrb entity = new EntityXPOrb(world, player.posX, player.posY + 1, player.posZ, itemRand.nextInt(14) + 6);
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
if (stack.getItemDamage() == 5) {
EntityXPOrb entity =
new EntityXPOrb(world, player.posX, player.posY + 1, player.posZ, itemRand.nextInt(14) + 6);
spawnEntity(player.posX, player.posY + 1, player.posZ, entity, world, player);
if (!player.capabilities.isCreativeMode)
stack.stackSize--;
if (!player.capabilities.isCreativeMode) stack.stackSize--;
}
return stack;
}
public static void spawnEntity (double x, double y, double z, Entity entity, World world, EntityPlayer player)
{
if (!world.isRemote)
{
public static void spawnEntity(double x, double y, double z, Entity entity, World world, EntityPlayer player) {
if (!world.isRemote) {
world.spawnEntityInWorld(entity);
}
}
}
@@ -7,16 +7,14 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.*;
import net.minecraft.util.*;
public class SpecialFood extends ItemFood
{
public class SpecialFood extends ItemFood {
protected int[] hunger;
protected float[] saturation;
protected String[] unlocalizedNames;
protected String[] iconNames;
protected IIcon[] icons;
public SpecialFood(int[] hunger, float[] saturation, String[] textureNames, String[] iconNames)
{
public SpecialFood(int[] hunger, float[] saturation, String[] textureNames, String[] iconNames) {
super(0, 0, false);
this.hunger = hunger;
this.saturation = saturation;
@@ -25,49 +23,40 @@ public class SpecialFood extends ItemFood
}
@Override
public int func_150905_g (ItemStack stack)
{
public int func_150905_g(ItemStack stack) {
return hunger[stack.getItemDamage()];
}
@Override
public float func_150906_h (ItemStack stack)
{
public float func_150906_h(ItemStack stack) {
return saturation[stack.getItemDamage()];
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage (int meta)
{
if (meta >= icons.length)
return icons[0];
public IIcon getIconFromDamage(int meta) {
if (meta >= icons.length) return icons[0];
return icons[meta];
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons (IIconRegister iconRegister)
{
public void registerIcons(IIconRegister iconRegister) {
this.icons = new IIcon[iconNames.length];
for (int i = 0; i < this.icons.length; ++i)
{
for (int i = 0; i < this.icons.length; ++i) {
this.icons[i] = iconRegister.registerIcon("tinker:" + iconNames[i]);
}
}
@Override
public String getUnlocalizedName (ItemStack stack)
{
public String getUnlocalizedName(ItemStack stack) {
int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, unlocalizedNames.length);
return getUnlocalizedName() + "." + unlocalizedNames[arr];
}
@Override
public void getSubItems (Item b, CreativeTabs tab, List list)
{
for (int i = 0; i < unlocalizedNames.length; i++)
list.add(new ItemStack(b, 1, i));
public void getSubItems(Item b, CreativeTabs tab, List list) {
for (int i = 0; i < unlocalizedNames.length; i++) list.add(new ItemStack(b, 1, i));
}
}
@@ -8,39 +8,37 @@ import net.minecraft.potion.*;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
public class StrangeFood extends SpecialFood
{
public StrangeFood()
{
super(new int[] { 2, 2, 4 }, new float[] { 1f, 1f, 0.6f }, new String[] { "edibleslime", "edibleblood", "bacon" }, new String[] { "food/edibleslime", "food/edibleblood", "food/bacon" });
public class StrangeFood extends SpecialFood {
public StrangeFood() {
super(
new int[] {2, 2, 4},
new float[] {1f, 1f, 0.6f},
new String[] {"edibleslime", "edibleblood", "bacon"},
new String[] {"food/edibleslime", "food/edibleblood", "food/bacon"});
this.setHasSubtypes(true);
}
@Override
protected void onFoodEaten (ItemStack stack, World world, EntityPlayer player)
{
if (stack.getItemDamage() == 1)
player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20 * 15, 0));
protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) {
if (stack.getItemDamage() == 1) player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20 * 15, 0));
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
int type = stack.getItemDamage();
switch (type)
{
case 0:
list.add("\u00a7b\u00a7o" + StatCollector.translateToLocal("strangefood1.tooltip"));
list.add("\u00a7b\u00a7o" + StatCollector.translateToLocal("strangefood2.tooltip"));
break;
case 1:
list.add("\u00a74\u00a7o" + StatCollector.translateToLocal("strangefood3.tooltip"));
list.add("\u00a74\u00a7o" + StatCollector.translateToLocal("strangefood4.tooltip"));
break;
case 2:
list.add("\u00a7c" + StatCollector.translateToLocal("strangefood7.tooltip"));
break;
switch (type) {
case 0:
list.add("\u00a7b\u00a7o" + StatCollector.translateToLocal("strangefood1.tooltip"));
list.add("\u00a7b\u00a7o" + StatCollector.translateToLocal("strangefood2.tooltip"));
break;
case 1:
list.add("\u00a74\u00a7o" + StatCollector.translateToLocal("strangefood3.tooltip"));
list.add("\u00a74\u00a7o" + StatCollector.translateToLocal("strangefood4.tooltip"));
break;
case 2:
list.add("\u00a7c" + StatCollector.translateToLocal("strangefood7.tooltip"));
break;
}
}
}