mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 11:59:14 +00:00
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:
1 parent
18bfeaff32
commit
39be06c23b
571 files changed
+25959
-28223
No files matched your search
@@ -6,31 +6,28 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class FancyEntityItem extends EntityItem
|
||||
{
|
||||
public FancyEntityItem(World par1World, double par2, double par4, double par6)
|
||||
{
|
||||
public class FancyEntityItem extends EntityItem {
|
||||
public FancyEntityItem(World par1World, double par2, double par4, double par6) {
|
||||
super(par1World, par2, par4, par6);
|
||||
this.isImmuneToFire = true;
|
||||
this.lifespan = 72000;
|
||||
}
|
||||
|
||||
public FancyEntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack)
|
||||
{
|
||||
public FancyEntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) {
|
||||
this(par1World, par2, par4, par6);
|
||||
this.setEntityItemStack(par8ItemStack);
|
||||
this.lifespan = (par8ItemStack.getItem() == null ? 6000 : par8ItemStack.getItem().getEntityLifespan(par8ItemStack, par1World));
|
||||
this.lifespan = (par8ItemStack.getItem() == null
|
||||
? 6000
|
||||
: par8ItemStack.getItem().getEntityLifespan(par8ItemStack, par1World));
|
||||
}
|
||||
|
||||
public FancyEntityItem(World par1World)
|
||||
{
|
||||
public FancyEntityItem(World par1World) {
|
||||
super(par1World);
|
||||
this.isImmuneToFire = true;
|
||||
this.lifespan = 72000;
|
||||
}
|
||||
|
||||
public FancyEntityItem(World world, Entity original, ItemStack stack)
|
||||
{
|
||||
public FancyEntityItem(World world, Entity original, ItemStack stack) {
|
||||
this(world, original.posX, original.posY, original.posZ);
|
||||
this.delayBeforeCanPickup = 20;
|
||||
this.motionX = original.motionX;
|
||||
@@ -39,10 +36,8 @@ public class FancyEntityItem extends EntityItem
|
||||
this.setEntityItemStack(stack);
|
||||
}
|
||||
|
||||
public boolean attackEntityFrom (DamageSource par1DamageSource, float par2)
|
||||
{
|
||||
if (par1DamageSource.getDamageType().equals("outOfWorld"))
|
||||
return true;
|
||||
public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) {
|
||||
if (par1DamageSource.getDamageType().equals("outOfWorld")) return true;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user