mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-18 19:39:12 +00:00
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:
1 parent
18bfeaff32
commit
39be06c23b
571 files changed
+25959
-28223
No files matched your search
@@ -9,15 +9,12 @@ import tconstruct.util.ItemHelper;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import tconstruct.world.blocks.SlimePad;
|
||||
|
||||
public class SlimePadRender implements ISimpleBlockRenderingHandler
|
||||
{
|
||||
public class SlimePadRender implements ISimpleBlockRenderingHandler {
|
||||
public static int model = RenderingRegistry.getNextAvailableRenderId();
|
||||
|
||||
@Override
|
||||
public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
|
||||
{
|
||||
if (modelID == model)
|
||||
{
|
||||
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
|
||||
if (modelID == model) {
|
||||
ItemHelper.renderStandardInvBlock(renderer, TinkerWorld.slimeGel, metadata);
|
||||
renderer.setRenderBounds(0f, 0.0625f, 0f, 1f, 0.5f, 1f);
|
||||
ItemHelper.renderStandardInvBlock(renderer, TinkerWorld.slimeGel, 1);
|
||||
@@ -25,59 +22,68 @@ public class SlimePadRender implements ISimpleBlockRenderingHandler
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer)
|
||||
{
|
||||
if (modelID == model)
|
||||
{
|
||||
public boolean renderWorldBlock(
|
||||
IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) {
|
||||
if (modelID == model) {
|
||||
renderer.setRenderBounds(0f, 0, 0f, 1f, 0.5f, 1f);
|
||||
int metadata = world.getBlockMetadata(x, y, z);
|
||||
BlockSkinRenderHelper.renderLiquidBlock(((SlimePad) block).getFluidIcon(metadata), ((SlimePad) block).getFluidIcon(metadata), x, y, z, renderer, world);
|
||||
BlockSkinRenderHelper.renderLiquidBlock(
|
||||
((SlimePad) block).getFluidIcon(metadata),
|
||||
((SlimePad) block).getFluidIcon(metadata),
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
renderer,
|
||||
world);
|
||||
|
||||
renderer.setRenderBounds(0.125f,0.0625f,0.125f, 0.875f,0.625f,0.875f);
|
||||
renderer.setRenderBounds(0.125f, 0.0625f, 0.125f, 0.875f, 0.625f, 0.875f);
|
||||
renderer.renderStandardBlock(block, x, y, z);
|
||||
|
||||
float[] size = size(metadata % 8);
|
||||
renderer.setRenderBounds(size[0], 0.5f, size[1], size[2], 0.6875f, size[3]);
|
||||
BlockSkinRenderHelper.renderLiquidBlock(((SlimePad) block).getNubIcon(metadata), ((SlimePad) block).getNubIcon(metadata), x, y, z, renderer, world);
|
||||
BlockSkinRenderHelper.renderLiquidBlock(
|
||||
((SlimePad) block).getNubIcon(metadata),
|
||||
((SlimePad) block).getNubIcon(metadata),
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
renderer,
|
||||
world);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
float[] size (int meta)
|
||||
{
|
||||
float[] size(int meta) {
|
||||
// xMin, zMin, xMax, zMax
|
||||
switch (meta)
|
||||
{
|
||||
case 0:
|
||||
return new float[] { 0.375f, 0.6875f, 0.625f, 0.9375f };
|
||||
case 1:
|
||||
return new float[] { 0.0625f, 0.6875f, 0.3125f, 0.9375f };
|
||||
case 2:
|
||||
return new float[] { 0.0625f, 0.375f, 0.3125f, 0.625f };
|
||||
case 3:
|
||||
return new float[] { 0.0625f, 0.0625f, 0.3125f, 0.3125f };
|
||||
case 4:
|
||||
return new float[] { 0.375f, 0.0625f, 0.625f, 0.3125f };
|
||||
case 5:
|
||||
return new float[] { 0.6875f, 0.0625f, 0.9375f, 0.3125f };
|
||||
case 6:
|
||||
return new float[] { 0.6875f, 0.375f, 0.9375f, 0.625f };
|
||||
case 7:
|
||||
return new float[] { 0.6875f, 0.6875f, 0.9375f, 0.9375f };
|
||||
switch (meta) {
|
||||
case 0:
|
||||
return new float[] {0.375f, 0.6875f, 0.625f, 0.9375f};
|
||||
case 1:
|
||||
return new float[] {0.0625f, 0.6875f, 0.3125f, 0.9375f};
|
||||
case 2:
|
||||
return new float[] {0.0625f, 0.375f, 0.3125f, 0.625f};
|
||||
case 3:
|
||||
return new float[] {0.0625f, 0.0625f, 0.3125f, 0.3125f};
|
||||
case 4:
|
||||
return new float[] {0.375f, 0.0625f, 0.625f, 0.3125f};
|
||||
case 5:
|
||||
return new float[] {0.6875f, 0.0625f, 0.9375f, 0.3125f};
|
||||
case 6:
|
||||
return new float[] {0.6875f, 0.375f, 0.9375f, 0.625f};
|
||||
case 7:
|
||||
return new float[] {0.6875f, 0.6875f, 0.9375f, 0.9375f};
|
||||
}
|
||||
return new float[] { 0.375f, 0.375f, 0.625f, 0.625f };
|
||||
return new float[] {0.375f, 0.375f, 0.625f, 0.625f};
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldRender3DInInventory (int modelID)
|
||||
{
|
||||
public boolean shouldRender3DInInventory(int modelID) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRenderId ()
|
||||
{
|
||||
public int getRenderId() {
|
||||
return model;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user