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

@@ -13,45 +13,42 @@ import net.minecraft.world.World;
import tconstruct.blocks.TConstructBlock;
import tconstruct.library.TConstructRegistry;
public class SlimeGel extends TConstructBlock
{
public SlimeGel()
{
super(Material.sponge, 0.5f, new String[] { "slimeblock_blue", "slimeblock_green", "slimeblock_purple" });
public class SlimeGel extends TConstructBlock {
public SlimeGel() {
super(Material.sponge, 0.5f, new String[] {"slimeblock_blue", "slimeblock_green", "slimeblock_purple"});
setCreativeTab(TConstructRegistry.blockTab);
}
@Override
public boolean getEnableStats ()
{
public boolean getEnableStats() {
return false;
}
@Override
public int getMobilityFlag ()
{
public int getMobilityFlag() {
return 0;
}
@Override
public int damageDropped (int meta)
{
public int damageDropped(int meta) {
return meta;
}
@Override
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
{
if (entity.motionY < 0)
{
if (entity.motionY < -0.08F)
{
public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
if (entity.motionY < 0) {
if (entity.motionY < -0.08F) {
Block var9 = (Block) this;
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.stepSound.soundName, (var9.stepSound.getVolume()) / 2.0F, var9.stepSound.getPitch() * 0.65F);
world.playSoundEffect(
x + 0.5F,
y + 0.5F,
z + 0.5F,
var9.stepSound.soundName,
(var9.stepSound.getVolume()) / 2.0F,
var9.stepSound.getPitch() * 0.65F);
}
entity.motionY *= -1.2F;
if (entity instanceof EntityLivingBase)
{
if (entity instanceof EntityLivingBase) {
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 1, 2));
}
}
@@ -59,8 +56,7 @@ public class SlimeGel extends TConstructBlock
}
@Override
public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z)
{
public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 0.625D, (double) z + 1.0D);
}
@@ -68,15 +64,13 @@ public class SlimeGel extends TConstructBlock
/**
* returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks)
*/
public void getSubBlocks (Block b, CreativeTabs par2CreativeTabs, List par3List)
{
public void getSubBlocks(Block b, CreativeTabs par2CreativeTabs, List par3List) {
par3List.add(new ItemStack(b, 1, 0));
par3List.add(new ItemStack(b, 1, 1));
// par3List.add(new ItemStack(par1, 1, 2));
}
public boolean canSustainLeaves (World world, int x, int y, int z)
{
public boolean canSustainLeaves(World world, int x, int y, int z) {
return true;
}
}