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

@@ -1,10 +1,6 @@
package tconstruct.client;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.texture.TextureUtil;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -14,105 +10,88 @@ import org.lwjgl.opengl.*;
import tconstruct.TConstruct;
import tconstruct.library.tools.ToolCore;
public class ToolCoreRenderer implements IItemRenderer
{
public class ToolCoreRenderer implements IItemRenderer {
private final boolean isEntity;
private final boolean noEntityTranslation;
public ToolCoreRenderer()
{
public ToolCoreRenderer() {
this(false, false);
}
public ToolCoreRenderer(boolean isEntity)
{
public ToolCoreRenderer(boolean isEntity) {
this(isEntity, false);
}
public ToolCoreRenderer(boolean isEntity, boolean noEntityTranslation)
{
public ToolCoreRenderer(boolean isEntity, boolean noEntityTranslation) {
this.isEntity = isEntity;
this.noEntityTranslation = noEntityTranslation;
}
@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)
{
case ENTITY:
return true;
case EQUIPPED:
GL11.glTranslatef(0.03f, 0F, -0.09375F);
case EQUIPPED_FIRST_PERSON:
return !isEntity;
case INVENTORY:
return true;
default:
TConstruct.logger.warn("[TCon] Unhandled render case!");
case FIRST_PERSON_MAP:
return false;
switch (type) {
case ENTITY:
return true;
case EQUIPPED:
GL11.glTranslatef(0.03f, 0F, -0.09375F);
case EQUIPPED_FIRST_PERSON:
return !isEntity;
case INVENTORY:
return true;
default:
TConstruct.logger.warn("[TCon] Unhandled render case!");
case FIRST_PERSON_MAP:
return false;
}
}
@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();
}
private static final int toolIcons = 10;
@Override
public void renderItem (ItemRenderType type, ItemStack item, Object... data)
{
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
ToolCore tool = (ToolCore) item.getItem();
boolean isInventory = type == ItemRenderType.INVENTORY;
Entity ent = null;
if (data.length > 1)
ent = (Entity) data[1];
if (data.length > 1) ent = (Entity) data[1];
int iconParts = toolIcons;//tool.getRenderPasses(item.getItemDamage());
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)
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;
IIcon[] parts = new IIcon[iconParts];
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;
// TODO: assign default sprite
// parts = new Icon[]{ defaultSprite };
@@ -131,8 +110,7 @@ public class ToolCoreRenderer 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();
@@ -149,26 +127,22 @@ public class ToolCoreRenderer implements IItemRenderer
// color
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);
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
if (type == ItemRenderType.INVENTORY)
{
if (type == ItemRenderType.INVENTORY) {
//TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();
//texturemanager.getResourceLocation(item.getItemSpriteNumber());
//TextureUtil.func_152777_a(false, false, 1.0F);
// TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();
// texturemanager.getResourceLocation(item.getItemSpriteNumber());
// TextureUtil.func_152777_a(false, false, 1.0F);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glDisable(GL11.GL_BLEND);
tess.startDrawingQuads();
for (int i = 0; i < iconParts; ++i)
{
for (int i = 0; i < iconParts; ++i) {
tess.setColorOpaque_I(color[i]);
tess.addVertexWithUV(0, 16, 0, xMin[i], yMax[i]);
tess.addVertexWithUV(16, 16, 0, xMax[i], yMax[i]);
@@ -180,31 +154,28 @@ public class ToolCoreRenderer implements IItemRenderer
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_BLEND);
//GL11.glDisable(GL12.GL_RESCALE_NORMAL);
//texturemanager.bindTexture(texturemanager.getResourceLocation(item.getItemSpriteNumber()));
//TextureUtil.func_147945_b();
}
else
{
switch (type)
{
case EQUIPPED_FIRST_PERSON:
break;
case EQUIPPED:
GL11.glTranslatef(0, -4 / 16f, 0);
break;
case ENTITY:
if (!noEntityTranslation)
GL11.glTranslatef(-0.5f, 0f, depth); // correction of the rotation point when items lie on the ground
break;
default:
// GL11.glDisable(GL12.GL_RESCALE_NORMAL);
// texturemanager.bindTexture(texturemanager.getResourceLocation(item.getItemSpriteNumber()));
// TextureUtil.func_147945_b();
} else {
switch (type) {
case EQUIPPED_FIRST_PERSON:
break;
case EQUIPPED:
GL11.glTranslatef(0, -4 / 16f, 0);
break;
case ENTITY:
if (!noEntityTranslation)
GL11.glTranslatef(
-0.5f, 0f, depth); // correction of the rotation point when items lie on the ground
break;
default:
}
// 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, 0, xMax[i], yMax[i]);
tess.addVertexWithUV(1, 0, 0, xMin[i], yMax[i]);
@@ -216,8 +187,7 @@ public class ToolCoreRenderer 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]);
@@ -232,12 +202,10 @@ public class ToolCoreRenderer 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]);
@@ -252,13 +220,11 @@ public class ToolCoreRenderer 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;
@@ -273,13 +239,11 @@ public class ToolCoreRenderer 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;
@@ -294,12 +258,10 @@ public class ToolCoreRenderer 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, 0, xMin[i], iconPos);