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,62 +7,78 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import tconstruct.library.tools.ToolCore;
public class ActiveToolMod
{
public class ActiveToolMod {
/* Updating */
public void updateTool (ToolCore tool, ItemStack stack, World world, Entity entity)
{
}
public void updateTool(ToolCore tool, ItemStack stack, World world, Entity entity) {}
/* Harvesting */
public boolean beforeBlockBreak (ToolCore tool, ItemStack stack, int x, int y, int z, EntityLivingBase entity)
{
public boolean beforeBlockBreak(ToolCore tool, ItemStack stack, int x, int y, int z, EntityLivingBase entity) {
return false;
}
@Deprecated
public boolean afterBlockBreak () // Unfinished, not called
{
public boolean afterBlockBreak() // Unfinished, not called
{
return false;
}
public void afterBlockBreak(ToolCore tool, ItemStack stack, Block block, int x, int y, int z, EntityLivingBase entity)
{
}
public void afterBlockBreak(
ToolCore tool, ItemStack stack, Block block, int x, int y, int z, EntityLivingBase entity) {}
/* Attacking */
public int baseAttackDamage (int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity)
{
public int baseAttackDamage(
int earlyModDamage,
int damage,
ToolCore tool,
NBTTagCompound tags,
NBTTagCompound toolTags,
ItemStack stack,
EntityLivingBase player,
Entity entity) {
return earlyModDamage;
}
// Calculated after sprinting and enchant bonuses
public float knockback (float modKnockback, float currentKnockback, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity)
{
public float knockback(
float modKnockback,
float currentKnockback,
ToolCore tool,
NBTTagCompound tags,
NBTTagCompound toolTags,
ItemStack stack,
EntityLivingBase player,
Entity entity) {
return modKnockback;
}
public int attackDamage (int modDamage, int currentDamage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity)
{
public int attackDamage(
int modDamage,
int currentDamage,
ToolCore tool,
NBTTagCompound tags,
NBTTagCompound toolTags,
ItemStack stack,
EntityLivingBase player,
Entity entity) {
return modDamage;
}
public void lateAttackEntity () // Unfinished, not called
{
}
public void lateAttackEntity() // Unfinished, not called
{}
/* Damage tool */
public boolean damageTool (ItemStack stack, int damage, EntityLivingBase entity)
{
public boolean damageTool(ItemStack stack, int damage, EntityLivingBase entity) {
return false;
}
public boolean doesCriticalHit (ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity)
{
public boolean doesCriticalHit(
ToolCore tool,
NBTTagCompound tags,
NBTTagCompound toolTags,
ItemStack stack,
EntityLivingBase player,
Entity entity) {
return false;
}
}