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

@@ -8,21 +8,18 @@ import tconstruct.armor.inventory.KnapsackContainer;
import tconstruct.armor.player.KnapsackInventory;
import tconstruct.client.tabs.*;
public class KnapsackGui extends InventoryEffectRenderer
{
public class KnapsackGui extends InventoryEffectRenderer {
public InventoryPlayer inv;
public KnapsackInventory stats;
public KnapsackGui(InventoryPlayer inventoryplayer, KnapsackInventory holder)
{
public KnapsackGui(InventoryPlayer inventoryplayer, KnapsackInventory holder) {
super(new KnapsackContainer(inventoryplayer, holder));
inv = inventoryplayer;
stats = holder;
}
@Override
public void initGui ()
{
public void initGui() {
super.initGui();
int cornerX = guiLeft;
@@ -45,17 +42,16 @@ public class KnapsackGui extends InventoryEffectRenderer
}
@Override
protected void drawGuiContainerForegroundLayer (int par1, int par2)
{
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
fontRendererObj.drawString(StatCollector.translateToLocal("inventory.knapsack"), 8, 6, 0x404040);
fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
fontRendererObj.drawString(
StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040);
}
private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/knapsack.png");
@Override
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
{
protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.getTextureManager().bindTexture(background);
int cornerX = guiLeft;
@@ -66,7 +62,7 @@ public class KnapsackGui extends InventoryEffectRenderer
/*
* protected void keyTyped(char par1, int par2) { if (par2 ==
* TControls.armorKey.keyCode) { this.mc.thePlayer.closeScreen(); }
*
*
* super.keyTyped(par1, par2); }
*/
}