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

@@ -5,19 +5,17 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;
public class FrypanRender implements ISimpleBlockRenderingHandler
{
public class FrypanRender implements ISimpleBlockRenderingHandler {
public static int frypanModelID = RenderingRegistry.getNextAvailableRenderId();
@Override
public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
{
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
// Inventory should be an item. This is not here!
}
@Override
public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer)
{
public boolean renderWorldBlock(
IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) {
renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F);
renderer.renderStandardBlock(block, x, y, z);
renderer.setRenderBounds(0.0F, 0.125F, 0.0F, 0.125F, 0.25F, 1.0F);
@@ -34,36 +32,32 @@ public class FrypanRender implements ISimpleBlockRenderingHandler
return true;
}
public void renderHandle (IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer)
{
switch (world.getBlockMetadata(x, y, z))
{
case 0:
renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F);
break;
case 1:
renderer.setRenderBounds(-1F, 0.0F, 0.4375F, 0F, 0.125F, 0.5625F);
break;
case 2:
renderer.setRenderBounds(0.4375F, 0.0F, -1F, 0.5625F, 0.125F, 0F);
break;
case 3:
renderer.setRenderBounds(0.4375F, 0.0F, 1F, 0.5625F, 0.125F, 2F);
break;
public void renderHandle(IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer) {
switch (world.getBlockMetadata(x, y, z)) {
case 0:
renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F);
break;
case 1:
renderer.setRenderBounds(-1F, 0.0F, 0.4375F, 0F, 0.125F, 0.5625F);
break;
case 2:
renderer.setRenderBounds(0.4375F, 0.0F, -1F, 0.5625F, 0.125F, 0F);
break;
case 3:
renderer.setRenderBounds(0.4375F, 0.0F, 1F, 0.5625F, 0.125F, 2F);
break;
}
renderer.renderStandardBlock(block, x, y, z);
}
@Override
public boolean shouldRender3DInInventory (int modelid)
{
public boolean shouldRender3DInInventory(int modelid) {
return true;
}
@Override
public int getRenderId ()
{
public int getRenderId() {
return frypanModelID;
}
}