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,23 +12,22 @@ import tconstruct.TConstruct;
import tconstruct.library.tools.ToolCore;
public class FlexibleToolRenderer implements IItemRenderer {
public float depth = 1/32f;
public float depth = 1 / 32f;
public void setDepth(float d) { depth = d; }
public void setDepth(float d) {
depth = d;
}
@Override
public boolean handleRenderType (ItemStack item, ItemRenderType type)
{
if(!item.hasTagCompound())
return false;
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
if (!item.hasTagCompound()) return false;
switch (type)
{
switch (type) {
case ENTITY:
//GL11.glTranslatef(-0.0625F, -0.0625F, 0F);
// GL11.glTranslatef(-0.0625F, -0.0625F, 0F);
return true;
case EQUIPPED:
//GL11.glTranslatef(0.03f, 0F, -0.09375F);
// GL11.glTranslatef(0.03f, 0F, -0.09375F);
case EQUIPPED_FIRST_PERSON:
return true;
case INVENTORY:
@@ -41,8 +40,7 @@ public class FlexibleToolRenderer implements IItemRenderer {
}
@Override
public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper)
{
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
return handleRenderType(item, type) & helper.ordinal() < ItemRendererHelper.EQUIPPED_BLOCK.ordinal();
}
@@ -51,13 +49,11 @@ public class FlexibleToolRenderer implements IItemRenderer {
protected void specialAnimation(ItemRenderType type, ItemStack item) {}
@Override
public void renderItem (ItemRenderType type, ItemStack item, Object... data) {
if(item == null || item.getItem() == null || !(item.getItem() instanceof ToolCore))
return;
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
if (item == null || item.getItem() == null || !(item.getItem() instanceof ToolCore)) return;
Entity ent = null;
if (data.length > 1)
ent = (Entity) data[1];
if (data.length > 1) ent = (Entity) data[1];
IIcon[] parts = new IIcon[toolIcons];
int iconParts = getIcons(item, type, ent, parts);
@@ -80,8 +76,7 @@ public class FlexibleToolRenderer implements IItemRenderer {
float[] yDiff = new float[iconParts];
float[] xSub = new float[iconParts];
float[] ySub = new float[iconParts];
for (int i = 0; i < iconParts; ++i)
{
for (int i = 0; i < iconParts; ++i) {
IIcon icon = parts[i];
xMin[i] = icon.getMinU();
xMax[i] = icon.getMaxU();
@@ -98,22 +93,18 @@ public class FlexibleToolRenderer implements IItemRenderer {
GL11.glPushMatrix();
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
if(type != ItemRenderType.ENTITY) {
if (type != ItemRenderType.ENTITY) {
specialAnimation(type, item);
}
else
GL11.glTranslatef(-0.5f, -0.25f, 0); // why? because.. minecraft.
} else GL11.glTranslatef(-0.5f, -0.25f, 0); // why? because.. minecraft.
// prepare colors
int[] color = new int[iconParts];
for(int i = 0; i < iconParts; i++)
color[i] = item.getItem().getColorFromItemStack(item, i);
for (int i = 0; i < iconParts; i++) color[i] = item.getItem().getColorFromItemStack(item, i);
// one side
tess.startDrawingQuads();
tess.setNormal(0, 0, 1);
for (int i = 0; i < iconParts; ++i)
{
for (int i = 0; i < iconParts; ++i) {
tess.setColorOpaque_I(color[i]);
tess.addVertexWithUV(0, 0, +depth, xMax[i], yMax[i]);
tess.addVertexWithUV(1, 0, +depth, xMin[i], yMax[i]);
@@ -125,8 +116,7 @@ public class FlexibleToolRenderer implements IItemRenderer {
// other side
tess.startDrawingQuads();
tess.setNormal(0, 0, -1);
for (int i = 0; i < iconParts; ++i)
{
for (int i = 0; i < iconParts; ++i) {
tess.setColorOpaque_I(color[i]);
tess.addVertexWithUV(0, 1, -depth, xMax[i], yMin[i]);
tess.addVertexWithUV(1, 1, -depth, xMin[i], yMin[i]);
@@ -141,12 +131,10 @@ public class FlexibleToolRenderer implements IItemRenderer {
float pos;
float iconPos;
for (int i = 0; i < iconParts; ++i)
{
for (int i = 0; i < iconParts; ++i) {
tess.setColorOpaque_I(color[i]);
float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i];
for (int k = 0, e = (int)w; k < e; ++k)
{
for (int k = 0, e = (int) w; k < e; ++k) {
pos = k / w;
iconPos = m + d * pos - s;
tess.addVertexWithUV(pos, 0, -depth, iconPos, yMax[i]);
@@ -161,13 +149,11 @@ public class FlexibleToolRenderer implements IItemRenderer {
tess.setNormal(1, 0, 0);
float posEnd;
for (int i = 0; i < iconParts; ++i)
{
for (int i = 0; i < iconParts; ++i) {
tess.setColorOpaque_I(color[i]);
float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i];
float d2 = 1f / w;
for (int k = 0, e = (int)w; k < e; ++k)
{
for (int k = 0, e = (int) w; k < e; ++k) {
pos = k / w;
iconPos = m + d * pos - s;
posEnd = pos + d2;
@@ -182,13 +168,11 @@ public class FlexibleToolRenderer implements IItemRenderer {
tess.startDrawingQuads();
tess.setNormal(0, 1, 0);
for (int i = 0; i < iconParts; ++i)
{
for (int i = 0; i < iconParts; ++i) {
tess.setColorOpaque_I(color[i]);
float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i];
float d2 = 1f / h;
for (int k = 0, e = (int)h; k < e; ++k)
{
for (int k = 0, e = (int) h; k < e; ++k) {
pos = k / h;
iconPos = m + d * pos - s;
posEnd = pos + d2;
@@ -203,12 +187,10 @@ public class FlexibleToolRenderer implements IItemRenderer {
tess.startDrawingQuads();
tess.setNormal(0, -1, 0);
for (int i = 0; i < iconParts; ++i)
{
for (int i = 0; i < iconParts; ++i) {
tess.setColorOpaque_I(color[i]);
float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i];
for (int k = 0, e = (int)h; k < e; ++k)
{
for (int k = 0, e = (int) h; k < e; ++k) {
pos = k / h;
iconPos = m + d * pos - s;
tess.addVertexWithUV(1, pos, +depth, xMin[i], iconPos);
@@ -223,21 +205,19 @@ public class FlexibleToolRenderer implements IItemRenderer {
GL11.glPopMatrix();
}
public void renderInventory(int count, IIcon[] icons, ItemStack item)
{
public void renderInventory(int count, IIcon[] icons, ItemStack item) {
Tessellator tess = Tessellator.instance;
GL11.glPushMatrix();
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glAlphaFunc(GL11.GL_GREATER, 0.5F);
//GL11.glDisable(GL11.GL_BLEND);
// GL11.glDisable(GL11.GL_BLEND);
tess.startDrawingQuads();
// draw a simple rectangle for the inventory icon
for (int i = 0; i < count; ++i)
{
for (int i = 0; i < count; ++i) {
tess.setColorOpaque_I(item.getItem().getColorFromItemStack(item, i));
final IIcon icon = icons[i];
@@ -245,23 +225,22 @@ public class FlexibleToolRenderer implements IItemRenderer {
final float xmax = icon.getMaxU();
final float ymin = icon.getMinV();
final float ymax = icon.getMaxV();
tess.addVertexWithUV( 0, 16, 0, xmin, ymax);
tess.addVertexWithUV(0, 16, 0, xmin, ymax);
tess.addVertexWithUV(16, 16, 0, xmax, ymax);
tess.addVertexWithUV(16, 0, 0, xmax, ymin);
tess.addVertexWithUV( 0, 0, 0, xmin, ymin);
tess.addVertexWithUV(16, 0, 0, xmax, ymin);
tess.addVertexWithUV(0, 0, 0, xmin, ymin);
}
tess.draw();
//GL11.glEnable(GL11.GL_BLEND);
// GL11.glEnable(GL11.GL_BLEND);
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix();
}
public int getIcons(ItemStack item, ItemRenderType type, Entity ent, IIcon[] parts)
{
int iconParts = toolIcons;//tool.getRenderPasses(item.getItemDamage());
public int getIcons(ItemStack item, ItemRenderType type, Entity ent, IIcon[] parts) {
int iconParts = toolIcons; // tool.getRenderPasses(item.getItemDamage());
// TODO: have the tools define how many render passes they have
// (requires more logic rewrite than it sounds like)
@@ -271,35 +250,28 @@ public class FlexibleToolRenderer implements IItemRenderer {
IIcon[] tempParts = new IIcon[iconParts];
label:
{
if (!isInventory && ent instanceof EntityPlayer)
{
if (!isInventory && ent instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) ent;
ItemStack itemInUse = player.getItemInUse();
if (itemInUse != null)
{
if (itemInUse != null) {
int useCount = player.getItemInUseCount();
for (int i = iconParts; i-- > 0;)
for (int i = iconParts; i-- > 0; )
tempParts[i] = tool.getIcon(item, i, player, itemInUse, useCount);
break label;
}
}
for (int i = iconParts; i-- > 0;)
tempParts[i] = tool.getIcon(item, i);
for (int i = iconParts; i-- > 0; ) tempParts[i] = tool.getIcon(item, i);
}
int count = 0;
for (int i = 0; i < iconParts; ++i)
{
for (int i = 0; i < iconParts; ++i) {
IIcon part = tempParts[i];
if (part == null || part == ToolCore.blankSprite || part == ToolCore.emptyIcon)
++count;
else
parts[i - count] = part;
if (part == null || part == ToolCore.blankSprite || part == ToolCore.emptyIcon) ++count;
else parts[i - count] = part;
}
iconParts -= count;
if (iconParts <= 0)
{
if (iconParts <= 0) {
iconParts = 1;
parts[0] = ToolCore.blankSprite;
}