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

+41 -18
View File
@@ -8,15 +8,12 @@ import net.minecraft.item.Item;
import net.minecraft.world.World;
@SideOnly(Side.CLIENT)
public class BreakingFX extends EntityFX
{
public BreakingFX(World par1World, double par2, double par4, double par6, Item par8Item)
{
public class BreakingFX extends EntityFX {
public BreakingFX(World par1World, double par2, double par4, double par6, Item par8Item) {
this(par1World, par2, par4, par6, par8Item, 0);
}
public BreakingFX(World par1World, double par2, double par4, double par6, Item par8Item, int par9)
{
public BreakingFX(World par1World, double par2, double par4, double par6, Item par8Item, int par9) {
super(par1World, par2, par4, par6, 0.0D, 0.0D, 0.0D);
this.setParticleIcon(par8Item.getIconFromDamage(par9));
this.particleRed = this.particleGreen = this.particleBlue = 1.0F;
@@ -24,8 +21,16 @@ public class BreakingFX extends EntityFX
this.particleScale /= 2.0F;
}
public BreakingFX(World par1World, double par2, double par4, double par6, double par8, double par10, double par12, Item par14Item, int par15)
{
public BreakingFX(
World par1World,
double par2,
double par4,
double par6,
double par8,
double par10,
double par12,
Item par14Item,
int par15) {
this(par1World, par2, par4, par6, par14Item, par15);
this.motionX *= 0.10000000149011612D;
this.motionY *= 0.10000000149011612D;
@@ -36,22 +41,20 @@ public class BreakingFX extends EntityFX
}
@Override
public int getFXLayer ()
{
public int getFXLayer() {
return 2;
}
@Override
public void renderParticle (Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
{
public void renderParticle(
Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) {
float f6 = ((float) this.particleTextureIndexX + this.particleTextureJitterX / 4.0F) / 16.0F;
float f7 = f6 + 0.015609375F;
float f8 = ((float) this.particleTextureIndexY + this.particleTextureJitterY / 4.0F) / 16.0F;
float f9 = f8 + 0.015609375F;
float f10 = 0.1F * this.particleScale;
if (this.particleIcon != null)
{
if (this.particleIcon != null) {
f6 = this.particleIcon.getInterpolatedU((double) (this.particleTextureJitterX / 4.0F * 16.0F));
f7 = this.particleIcon.getInterpolatedU((double) ((this.particleTextureJitterX + 1.0F) / 4.0F * 16.0F));
f8 = this.particleIcon.getInterpolatedV((double) (this.particleTextureJitterY / 4.0F * 16.0F));
@@ -63,9 +66,29 @@ public class BreakingFX extends EntityFX
float f13 = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) par2 - interpPosZ);
float f14 = 1.0F;
par1Tessellator.setColorOpaque_F(f14 * this.particleRed, f14 * this.particleGreen, f14 * this.particleBlue);
par1Tessellator.addVertexWithUV((double) (f11 - par3 * f10 - par6 * f10), (double) (f12 - par4 * f10), (double) (f13 - par5 * f10 - par7 * f10), (double) f6, (double) f9);
par1Tessellator.addVertexWithUV((double) (f11 - par3 * f10 + par6 * f10), (double) (f12 + par4 * f10), (double) (f13 - par5 * f10 + par7 * f10), (double) f6, (double) f8);
par1Tessellator.addVertexWithUV((double) (f11 + par3 * f10 + par6 * f10), (double) (f12 + par4 * f10), (double) (f13 + par5 * f10 + par7 * f10), (double) f7, (double) f8);
par1Tessellator.addVertexWithUV((double) (f11 + par3 * f10 - par6 * f10), (double) (f12 - par4 * f10), (double) (f13 + par5 * f10 - par7 * f10), (double) f7, (double) f9);
par1Tessellator.addVertexWithUV(
(double) (f11 - par3 * f10 - par6 * f10),
(double) (f12 - par4 * f10),
(double) (f13 - par5 * f10 - par7 * f10),
(double) f6,
(double) f9);
par1Tessellator.addVertexWithUV(
(double) (f11 - par3 * f10 + par6 * f10),
(double) (f12 + par4 * f10),
(double) (f13 - par5 * f10 + par7 * f10),
(double) f6,
(double) f8);
par1Tessellator.addVertexWithUV(
(double) (f11 + par3 * f10 + par6 * f10),
(double) (f12 + par4 * f10),
(double) (f13 + par5 * f10 + par7 * f10),
(double) f7,
(double) f8);
par1Tessellator.addVertexWithUV(
(double) (f11 + par3 * f10 - par6 * f10),
(double) (f12 - par4 * f10),
(double) (f13 + par5 * f10 - par7 * f10),
(double) f7,
(double) f9);
}
}