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

@@ -11,64 +11,52 @@ import net.minecraft.util.IIcon;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.*;
public class CustomBowRenderer implements IItemRenderer
{
public class CustomBowRenderer implements IItemRenderer {
Minecraft mc = Minecraft.getMinecraft();
private RenderBlocks renderBlocksInstance = new RenderBlocks();
@Override
public boolean handleRenderType (ItemStack item, ItemRenderType type)
{
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
return type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON;
}
@Override
public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper)
{
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
return true;
}
@Override
public void renderItem (ItemRenderType type, ItemStack item, Object... data)
{
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
EntityLivingBase living = (EntityLivingBase) data[1];
ItemRenderer renderer = RenderManager.instance.itemRenderer;
for (int i = 0; i < item.getItem().getRenderPasses(item.getItemDamage()) + 1; i++)
renderItem(living, item, i, type);
}
public void renderItem (EntityLivingBase living, ItemStack stack, int renderPass, ItemRenderType type)
{
public void renderItem(EntityLivingBase living, ItemStack stack, int renderPass, ItemRenderType type) {
GL11.glPushMatrix();
IIcon icon = null;
if (living instanceof EntityPlayer)
{
if (living instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) living;
if (player.getItemInUse() != null)
icon = stack.getItem().getIcon(stack, renderPass, player, player.getItemInUse(), player.getItemInUseCount());
else
icon = living.getItemIcon(stack, renderPass);
}
else
{
icon = stack.getItem()
.getIcon(stack, renderPass, player, player.getItemInUse(), player.getItemInUseCount());
else icon = living.getItemIcon(stack, renderPass);
} else {
icon = living.getItemIcon(stack, renderPass);
}
if (icon == null)
{
if (icon == null) {
GL11.glPopMatrix();
return;
}
TextureManager texturemanager = this.mc.getTextureManager();
texturemanager.bindTexture(texturemanager.getResourceLocation(stack.getItemSpriteNumber()));
if (type == ItemRenderType.EQUIPPED_FIRST_PERSON)
{
if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
GL11.glTranslatef(0.6F, 0.5F, 0.5F);
}
else
{
} else {
GL11.glRotatef(180.0F, 0F, 0F, 1.0F);
GL11.glRotatef(45.0F, 1.0F, 0.0F, 0.75F);
GL11.glTranslatef(-0.6F, -0.25F, 1.0F);
@@ -95,5 +83,4 @@ public class CustomBowRenderer implements IItemRenderer
GL11.glPopMatrix();
}
}