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

@@ -3,8 +3,7 @@ package tconstruct.armor.model;
import net.minecraft.client.model.*;
import net.minecraft.entity.Entity;
public class BeltModel extends ModelBiped
{
public class BeltModel extends ModelBiped {
ModelRenderer Buckle;
ModelRenderer FrontRight;
ModelRenderer FrontLeft;
@@ -12,8 +11,7 @@ public class BeltModel extends ModelBiped
ModelRenderer SideLeft;
ModelRenderer Back;
public BeltModel()
{
public BeltModel() {
textureWidth = 64;
textureHeight = 32;
@@ -54,12 +52,11 @@ public class BeltModel extends ModelBiped
bipedBody.addChild(Back);
}
public void render (Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
//super.render(entity, f, f1, f2, f3, f4, f5);
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
// super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
bipedBody.render(f5);
//Buckle.render(f5);
// Buckle.render(f5);
/*FrontRight.render(f5);
FrontLeft.render(f5);
SideRight.render(f5);
@@ -67,17 +64,14 @@ public class BeltModel extends ModelBiped
Back.render(f5);*/
}
private void setRotation (ModelRenderer model, float x, float y, float z)
{
private void setRotation(ModelRenderer model, float x, float y, float z) {
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
@Override
public void setRotationAngles (float f, float f1, float partialTick, float f3, float f4, float f5, Entity player)
{
public void setRotationAngles(float f, float f1, float partialTick, float f3, float f4, float f5, Entity player) {
super.setRotationAngles(f, f1, partialTick, f3, f4, f5, player);
}
}
@@ -2,13 +2,11 @@ package tconstruct.armor.model;
import net.minecraft.client.model.*;
public class BootBump extends ModelBiped
{
public class BootBump extends ModelBiped {
ModelRenderer rightBump;
ModelRenderer leftBump;
public BootBump()
{
public BootBump() {
super(0.5f, 0, 64, 32);
rightBump = new ModelRenderer(this, 24, 0);
@@ -2,36 +2,34 @@ package tconstruct.armor.model;
import net.minecraft.client.model.ModelBiped;
public class HiddenPlayerModel extends ModelBiped
{
public HiddenPlayerModel(float size, int slot)
{
public class HiddenPlayerModel extends ModelBiped {
public HiddenPlayerModel(float size, int slot) {
super(size, 0, 64, 32);
if (slot != 0) //Head
if (slot != 0) // Head
{
this.bipedHead.isHidden = true;
this.bipedHeadwear.isHidden = true;
}
if (slot != 1 && slot != 5) //Chest, belt
if (slot != 1 && slot != 5) // Chest, belt
{
this.bipedBody.isHidden = true;
}
if (slot != 2 && slot != 3) //Legs, shoes
if (slot != 2 && slot != 3) // Legs, shoes
{
this.bipedRightLeg.isHidden = true;
this.bipedLeftLeg.isHidden = true;
}
if (slot != 4) //Gloves
if (slot != 4) // Gloves
{
this.bipedRightArm.isHidden = true;
this.bipedLeftArm.isHidden = true;
}
if (slot != 6) //Ears
if (slot != 6) // Ears
{
this.bipedEars.isHidden = true;
}
if (slot != 7) //Cloak
if (slot != 7) // Cloak
{
this.bipedCloak.isHidden = true;
}
@@ -12,60 +12,56 @@ import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
import tconstruct.armor.items.ArmorPattern;
public class RenderArmorCast implements IItemRenderer
{
public class RenderArmorCast implements IItemRenderer {
@Override
public boolean handleRenderType (ItemStack item, ItemRenderType type)
{
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
return type != ItemRenderType.FIRST_PERSON_MAP;
}
@Override
public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper)
{
switch (helper)
{
case BLOCK_3D:
return true;
case ENTITY_BOBBING:
return true;
case ENTITY_ROTATION:
return true;
case EQUIPPED_BLOCK:
return true;
case INVENTORY_BLOCK:
return true;
default:
return false;
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
switch (helper) {
case BLOCK_3D:
return true;
case ENTITY_BOBBING:
return true;
case ENTITY_ROTATION:
return true;
case EQUIPPED_BLOCK:
return true;
case INVENTORY_BLOCK:
return true;
default:
return false;
}
}
@Override
public void renderItem (ItemRenderType type, ItemStack item, Object... data)
{
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
RenderBlocks renderer = Minecraft.getMinecraft().renderGlobal.renderBlocksRg;
Tessellator tessellator = Tessellator.instance;
IIcon baseIcon = item.getItem() instanceof ArmorPattern ? ((ArmorPattern) item.getItem()).getBaseIcon() : item.getIconIndex();
IIcon baseIcon = item.getItem() instanceof ArmorPattern
? ((ArmorPattern) item.getItem()).getBaseIcon()
: item.getIconIndex();
GL11.glPushMatrix();
switch (type)
{
case ENTITY:
GL11.glScalef(0.8F, 0.33F, 0.8F);
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
break;
case INVENTORY:
GL11.glScalef(1F, 0.6F, 1F);
GL11.glTranslatef(0F, -0.1F, 0F);
break;
case EQUIPPED:
GL11.glScalef(1F, 0.6F, 1F);
break;
case EQUIPPED_FIRST_PERSON:
GL11.glScalef(1F, 0.6F, 1F);
break;
default:
break;
switch (type) {
case ENTITY:
GL11.glScalef(0.8F, 0.33F, 0.8F);
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
break;
case INVENTORY:
GL11.glScalef(1F, 0.6F, 1F);
GL11.glTranslatef(0F, -0.1F, 0F);
break;
case EQUIPPED:
GL11.glScalef(1F, 0.6F, 1F);
break;
case EQUIPPED_FIRST_PERSON:
GL11.glScalef(1F, 0.6F, 1F);
break;
default:
break;
}
renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 0.83F, 0.9F);
renderCube(tessellator, renderer, baseIcon);
@@ -81,8 +77,7 @@ public class RenderArmorCast implements IItemRenderer
GL11.glPopMatrix();
}
public void renderCube (Tessellator tessellator, RenderBlocks renderer, IIcon icon)
{
public void renderCube(Tessellator tessellator, RenderBlocks renderer, IIcon icon) {
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0F, 0F);
renderer.renderFaceXNeg((Block) null, 0F, 0F, 0F, icon);
@@ -99,37 +94,29 @@ public class RenderArmorCast implements IItemRenderer
tessellator.draw();
}
public void renderSelectedCube (Tessellator tessellator, RenderBlocks renderer, IIcon icon, List<ForgeDirection> sidesToRender)
{
public void renderSelectedCube(
Tessellator tessellator, RenderBlocks renderer, IIcon icon, List<ForgeDirection> sidesToRender) {
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0F, 0F);
if (sidesToRender.contains(ForgeDirection.WEST))
renderer.renderFaceXNeg((Block) null, 0F, 0F, 0F, icon);
if (sidesToRender.contains(ForgeDirection.WEST)) renderer.renderFaceXNeg((Block) null, 0F, 0F, 0F, icon);
tessellator.setNormal(1F, 0F, 0F);
if (sidesToRender.contains(ForgeDirection.EAST))
renderer.renderFaceXPos((Block) null, 0F, 0F, 0F, icon);
if (sidesToRender.contains(ForgeDirection.EAST)) renderer.renderFaceXPos((Block) null, 0F, 0F, 0F, icon);
tessellator.setNormal(0F, -1F, 0F);
if (sidesToRender.contains(ForgeDirection.DOWN))
renderer.renderFaceYNeg((Block) null, 0F, 0F, 0F, icon);
if (sidesToRender.contains(ForgeDirection.DOWN)) renderer.renderFaceYNeg((Block) null, 0F, 0F, 0F, icon);
tessellator.setNormal(0F, 1F, 0F);
if (sidesToRender.contains(ForgeDirection.UP))
renderer.renderFaceYPos((Block) null, 0F, 0F, 0F, icon);
if (sidesToRender.contains(ForgeDirection.UP)) renderer.renderFaceYPos((Block) null, 0F, 0F, 0F, icon);
tessellator.setNormal(0F, 0F, -1F);
if (sidesToRender.contains(ForgeDirection.SOUTH))
renderer.renderFaceZNeg((Block) null, 0F, 0F, 0F, icon);
if (sidesToRender.contains(ForgeDirection.SOUTH)) renderer.renderFaceZNeg((Block) null, 0F, 0F, 0F, icon);
tessellator.setNormal(0F, 0F, 1F);
if (sidesToRender.contains(ForgeDirection.NORTH))
renderer.renderFaceZPos((Block) null, 0F, 0F, 0F, icon);
if (sidesToRender.contains(ForgeDirection.NORTH)) renderer.renderFaceZPos((Block) null, 0F, 0F, 0F, icon);
tessellator.draw();
}
public void renderCastTop (ItemStack par1ItemStack, ItemRenderType type)
{
public void renderCastTop(ItemStack par1ItemStack, ItemRenderType type) {
GL11.glPushMatrix();
IIcon icon = par1ItemStack.getIconIndex();
if (icon == null)
{
if (icon == null) {
GL11.glPopMatrix();
return;
}
@@ -158,8 +145,15 @@ public class RenderArmorCast implements IItemRenderer
GL11.glPopMatrix();
}
public static void renderItemIn2D (Tessellator par0Tessellator, float par1, float par2, float par3, float par4, float par5, float par6, float par7)
{
public static void renderItemIn2D(
Tessellator par0Tessellator,
float par1,
float par2,
float par3,
float par4,
float par5,
float par6,
float par7) {
par0Tessellator.startDrawingQuads();
par0Tessellator.setNormal(0.0F, 0.0F, 1.0F);
par0Tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, (double) par1, (double) par4);
@@ -182,8 +176,7 @@ public class RenderArmorCast implements IItemRenderer
float f7;
float f8;
for (k = 0; k < par5; ++k)
{
for (k = 0; k < par5; ++k) {
f7 = (float) k / (float) par5;
f8 = par1 + (par3 - par1) * f7 - f5;
par0Tessellator.addVertexWithUV((double) f7, 0.0D, (double) (0.0F - par7), (double) f8, (double) par4);
@@ -197,8 +190,7 @@ public class RenderArmorCast implements IItemRenderer
par0Tessellator.setNormal(1.0F, 0.0F, 0.0F);
float f9;
for (k = 0; k < par5; ++k)
{
for (k = 0; k < par5; ++k) {
f7 = (float) k / (float) par5;
f8 = par1 + (par3 - par1) * f7 - f5;
f9 = f7 + 1.0F / (float) par5;
@@ -212,8 +204,7 @@ public class RenderArmorCast implements IItemRenderer
par0Tessellator.startDrawingQuads();
par0Tessellator.setNormal(0.0F, 1.0F, 0.0F);
for (k = 0; k < par6; ++k)
{
for (k = 0; k < par6; ++k) {
f7 = (float) k / (float) par6;
f8 = par4 + (par2 - par4) * f7 - f6;
f9 = f7 + 1.0F / (float) par6;
@@ -227,8 +218,7 @@ public class RenderArmorCast implements IItemRenderer
par0Tessellator.startDrawingQuads();
par0Tessellator.setNormal(0.0F, -1.0F, 0.0F);
for (k = 0; k < par6; ++k)
{
for (k = 0; k < par6; ++k) {
f7 = (float) k / (float) par6;
f8 = par4 + (par2 - par4) * f7 - f6;
par0Tessellator.addVertexWithUV(1.0D, (double) f7, 0.0D, (double) par3, (double) f8);
@@ -239,5 +229,4 @@ public class RenderArmorCast implements IItemRenderer
par0Tessellator.draw();
}
}
}
@@ -4,8 +4,7 @@ import net.minecraft.client.model.*;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
public class WingModel extends ModelBiped
{
public class WingModel extends ModelBiped {
ModelRenderer WingBaseRight;
ModelRenderer WingEdgeRight;
ModelRenderer WingInsetRight;
@@ -19,22 +18,21 @@ public class WingModel extends ModelBiped
ModelRenderer WingFlangeLeft;
ModelRenderer WingAuxLeft;
public WingModel()
{
public WingModel() {
super(0.25f, 0, 64, 64);
textureWidth = 64;
textureHeight = 32;
//Right Wing
// Right Wing
WingBaseRight = new ModelRenderer(this, 0, 9);
WingBaseRight.addBox(-0.5F, -1F, 0F, 1, 2, 10);
WingBaseRight.setRotationPoint(-1F, 1F, 0F);
setRotation(WingBaseRight, 0.5235988F, -0.5235988F, 0F);
WingEdgeRight = new ModelRenderer(this, 0, 21); //Texture position
WingEdgeRight.addBox(0F, 0F, -2F, 1, 9, 2); //Offset, Size
WingEdgeRight.setRotationPoint(-0.502F, -1F, 10F); //Negative x, y - 1, Position
setRotation(WingEdgeRight, 0.5235988F, 0F, 0F); //Angle in radians
WingEdgeRight = new ModelRenderer(this, 0, 21); // Texture position
WingEdgeRight.addBox(0F, 0F, -2F, 1, 9, 2); // Offset, Size
WingEdgeRight.setRotationPoint(-0.502F, -1F, 10F); // Negative x, y - 1, Position
setRotation(WingEdgeRight, 0.5235988F, 0F, 0F); // Angle in radians
WingInsetRight = new ModelRenderer(this, 6, 21);
WingInsetRight.addBox(0F, 0F, -1F, 1, 9, 2);
@@ -62,7 +60,7 @@ public class WingModel extends ModelBiped
WingBaseRight.addChild(WingFlangeRight);
WingBaseRight.addChild(WingAuxRight);
//Left Wing
// Left Wing
WingBaseLeft = new ModelRenderer(this, 42, 9);
WingBaseLeft.addBox(-0.5F, -1F, 0F, 1, 2, 10);
WingBaseLeft.setRotationPoint(1F, 1F, 0F);
@@ -109,26 +107,22 @@ public class WingModel extends ModelBiped
this.bipedLeftLeg.isHidden = true;
}
public void render (Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
WingBaseRight.render(f5);
WingBaseLeft.render(f5);
}
private void setRotation (ModelRenderer model, float x, float y, float z)
{
private void setRotation(ModelRenderer model, float x, float y, float z) {
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
public void setRotationAngles (float f, float f1, float partialTick, float f3, float f4, float f5, Entity player)
{
public void setRotationAngles(float f, float f1, float partialTick, float f3, float f4, float f5, Entity player) {
super.setRotationAngles(f, f1, partialTick, f3, f4, f5, player);
if (this.isRiding)
{
if (this.isRiding) {
float slow = 17f;
this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 10f + 0.9F;
this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 5.0f - 0.7f;
@@ -137,9 +131,7 @@ public class WingModel extends ModelBiped
this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 10 + 0.9F;
this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 5.0f + 0.7f;
this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 2.5f + 0.3f;
}
else if (player.isInWater())
{
} else if (player.isInWater()) {
float slow = 17f;
this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F;
this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 15f - 0.8f;
@@ -148,9 +140,7 @@ public class WingModel extends ModelBiped
this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F;
this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 15f + 0.8f;
this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 15f + 0.8f;
}
else if (player.posY - player.prevPosY < 0f && player.fallDistance > 2.3)
{
} else if (player.posY - player.prevPosY < 0f && player.fallDistance > 2.3) {
float slow = 20f;
this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.7F;
this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 15f - 0.8f;
@@ -159,9 +149,7 @@ public class WingModel extends ModelBiped
this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.7F;
this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 15f + 0.8f;
this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 15f + 0.3f;
}
else if (player.isSprinting() || this.onGround > 0)
{
} else if (player.isSprinting() || this.onGround > 0) {
float slow = 1.73f;
this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F;
this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 15f - 0.6f;
@@ -170,12 +158,9 @@ public class WingModel extends ModelBiped
this.WingBaseLeft.rotateAngleX = MathHelper.sin(partialTick / slow) / 15f + 0.5235988F;
this.WingBaseLeft.rotateAngleY = -MathHelper.sin(partialTick / slow) / 15f + 0.6f;
this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 15f + 0.3f;
}
else
{
} else {
float slow = 17f;
if (player.motionX != 0 || player.motionZ != 0)
slow = 6f;
if (player.motionX != 0 || player.motionZ != 0) slow = 6f;
this.WingBaseRight.rotateAngleX = MathHelper.sin(partialTick / slow) / 5f + 0.5235988F;
this.WingBaseRight.rotateAngleY = MathHelper.sin(partialTick / slow) / 3.0f - 0.6f;
this.WingBaseRight.rotateAngleZ = MathHelper.sin(partialTick / slow) / 1.5f - 0.3f;
@@ -185,11 +170,9 @@ public class WingModel extends ModelBiped
this.WingBaseLeft.rotateAngleZ = -MathHelper.sin(partialTick / slow) / 1.5f + 0.3f;
}
if (this.isSneak)
{
if (this.isSneak) {
this.WingBaseRight.rotateAngleX += 0.4f;
this.WingBaseLeft.rotateAngleX += 0.4f;
}
}
}