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

@@ -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();
}
}
}