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

+104 -119
View File
@@ -20,33 +20,32 @@ import tconstruct.util.config.PHConstruct;
import tconstruct.world.TinkerWorld;
import tconstruct.world.entity.BlueSlime;
public class TActiveOmniMod extends ActiveToolMod
{
public class TActiveOmniMod extends ActiveToolMod {
Random random = new Random();
/* Updating */
@Override
public void updateTool (ToolCore tool, ItemStack stack, World world, Entity entity)
{
if (!world.isRemote && entity instanceof EntityLivingBase && !((EntityLivingBase) entity).isSwingInProgress && stack.getTagCompound() != null)
{
if(entity instanceof EntityPlayer && (((EntityPlayer) entity).isUsingItem()))
return;
public void updateTool(ToolCore tool, ItemStack stack, World world, Entity entity) {
if (!world.isRemote
&& entity instanceof EntityLivingBase
&& !((EntityLivingBase) entity).isSwingInProgress
&& stack.getTagCompound() != null) {
if (entity instanceof EntityPlayer && (((EntityPlayer) entity).isUsingItem())) return;
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
if (tags.hasKey("Moss"))
{
if (tags.hasKey("Moss")) {
int chance = tags.getInteger("Moss");
int check = world.canBlockSeeTheSky((int) entity.posX, (int) entity.posY, (int) entity.posZ) ? 350 : 1150;
int check =
world.canBlockSeeTheSky((int) entity.posX, (int) entity.posY, (int) entity.posZ) ? 350 : 1150;
// REGROWING AMMO :OOoo
if(tool instanceof IAmmo && random.nextInt(check*3) < chance) // ammo regenerates at a much slower rate
if (tool instanceof IAmmo
&& random.nextInt(check * 3) < chance) // ammo regenerates at a much slower rate
{
IAmmo ammothing = (IAmmo)tool;
if(ammothing.getAmmoCount(stack) > 0) // must have ammo
ammothing.addAmmo(1, stack);
IAmmo ammothing = (IAmmo) tool;
if (ammothing.getAmmoCount(stack) > 0) // must have ammo
ammothing.addAmmo(1, stack);
}
// selfrepairing tool. LAAAAAME
else if (random.nextInt(check) < chance)
{
else if (random.nextInt(check) < chance) {
AbilityHelper.healTool(stack, 1, (EntityLivingBase) entity, true);
}
}
@@ -55,73 +54,59 @@ public class TActiveOmniMod extends ActiveToolMod
/* Harvesting */
@Override
public boolean beforeBlockBreak (ToolCore tool, ItemStack stack, int x, int y, int z, EntityLivingBase entity)
{
public boolean beforeBlockBreak(ToolCore tool, ItemStack stack, int x, int y, int z, EntityLivingBase entity) {
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
baconator(tool, stack, entity, tags);
if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode)
return false;
if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode) return false;
TinkerTools.modLapis.midStreamModify(stack, tool);
if (autoSmelt(tool, tags, stack, x, y, z, entity))
return true;
if (autoSmelt(tool, tags, stack, x, y, z, entity)) return true;
return false;
}
@Override
public void afterBlockBreak(ToolCore tool, ItemStack stack, Block block, int x, int y, int z, EntityLivingBase entity) {
public void afterBlockBreak(
ToolCore tool, ItemStack stack, Block block, int x, int y, int z, EntityLivingBase entity) {
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
slimify(tool, tags, block, x,y,z, entity.worldObj);
slimify(tool, tags, block, x, y, z, entity.worldObj);
}
private boolean autoSmelt (ToolCore tool, NBTTagCompound tags, ItemStack stack, int x, int y, int z, EntityLivingBase entity)
{
private boolean autoSmelt(
ToolCore tool, NBTTagCompound tags, ItemStack stack, int x, int y, int z, EntityLivingBase entity) {
World world = entity.worldObj;
Block block = world.getBlock(x, y, z);
if (block == null)
return false;
if (block == null) return false;
int blockMeta = world.getBlockMetadata(x, y, z);
if(block.getMaterial().isToolNotRequired()) {
if (block.getMaterial().isToolNotRequired()) {
// only if effective tool
if(tool instanceof HarvestTool) {
if (!((HarvestTool) tool).isEffective(block, blockMeta))
return false;
}
else
return false;
}
else if(!ForgeHooks.canToolHarvestBlock(block, blockMeta, stack))
return false;
if (tool instanceof HarvestTool) {
if (!((HarvestTool) tool).isEffective(block, blockMeta)) return false;
} else return false;
} else if (!ForgeHooks.canToolHarvestBlock(block, blockMeta, stack)) return false;
if (tags.getBoolean("Lava") && block.quantityDropped(blockMeta, 0, random) > 0)
{
if (tags.getBoolean("Lava") && block.quantityDropped(blockMeta, 0, random) > 0) {
int itemMeta = block.damageDropped(blockMeta);
int amount = block.quantityDropped(random);
Item item = block.getItemDropped(blockMeta, random, EnchantmentHelper.getFortuneModifier(entity));
// apparently some things that don't drop blocks (like glass panes without silktouch) return null.
if (item == null)
return false;
if (item == null) return false;
ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(new ItemStack(item, amount, itemMeta));
if (result != null)
{
if (result != null) {
world.setBlockToAir(x, y, z);
if (entity instanceof EntityPlayer && !((EntityPlayer) entity).capabilities.isCreativeMode)
tool.onBlockDestroyed(stack, world, block, x, y, z, entity);
if (!world.isRemote)
{
ItemStack spawnme = new ItemStack(result.getItem(), amount * result.stackSize, result.getItemDamage());
if (result.hasTagCompound())
spawnme.setTagCompound(result.getTagCompound());
if (!(result.getItem() instanceof ItemBlock) && PHConstruct.lavaFortuneInteraction)
{
if (!world.isRemote) {
ItemStack spawnme =
new ItemStack(result.getItem(), amount * result.stackSize, result.getItemDamage());
if (result.hasTagCompound()) spawnme.setTagCompound(result.getTagCompound());
if (!(result.getItem() instanceof ItemBlock) && PHConstruct.lavaFortuneInteraction) {
int loot = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack);
if (loot > 0)
{
if (loot > 0) {
spawnme.stackSize *= (random.nextInt(loot + 1) + 1);
}
}
@@ -135,31 +120,26 @@ public class TActiveOmniMod extends ActiveToolMod
float f = FurnaceRecipes.smelting().func_151398_b(spawnme);
int j;
if (f == 0.0F)
{
if (f == 0.0F) {
i = 0;
}
else if (f < 1.0F)
{
} else if (f < 1.0F) {
j = MathHelper.floor_float((float) i * f);
if (j < MathHelper.ceiling_float_int((float) i * f) && (float) Math.random() < (float) i * f - (float) j)
{
if (j < MathHelper.ceiling_float_int((float) i * f)
&& (float) Math.random() < (float) i * f - (float) j) {
++j;
}
i = j;
}
while (i > 0)
{
while (i > 0) {
j = EntityXPOrb.getXPSplit(i);
i -= j;
entity.worldObj.spawnEntityInWorld(new EntityXPOrb(world, x, y + 0.5, z, j));
}
}
for (int i = 0; i < 5; i++)
{
for (int i = 0; i < 5; i++) {
float f = (float) x + random.nextFloat();
float f1 = (float) y + random.nextFloat();
float f2 = (float) z + random.nextFloat();
@@ -186,15 +166,21 @@ public class TActiveOmniMod extends ActiveToolMod
/* Attacking */
@Override
public int baseAttackDamage (int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity)
{
public int baseAttackDamage(
int earlyModDamage,
int damage,
ToolCore tool,
NBTTagCompound tags,
NBTTagCompound toolTags,
ItemStack stack,
EntityLivingBase player,
Entity entity) {
TinkerTools.modLapis.midStreamModify(stack, tool);
baconator(tool, stack, player, tags);
return 0;
}
private void baconator (ToolCore tool, ItemStack stack, EntityLivingBase entity, NBTTagCompound tags)
{
private void baconator(ToolCore tool, ItemStack stack, EntityLivingBase entity, NBTTagCompound tags) {
final int pigiron = TinkerTools.MaterialID.PigIron;
int bacon = 0;
bacon += tags.getInteger("Head") == pigiron ? 1 : 0;
@@ -202,37 +188,29 @@ public class TActiveOmniMod extends ActiveToolMod
bacon += tags.getInteger("Accessory") == pigiron ? 1 : 0;
bacon += tags.getInteger("Extra") == pigiron ? 1 : 0;
int chance = tool.getPartAmount() * 100;
if (random.nextInt(chance) < bacon)
{
if (random.nextInt(chance) < bacon) {
if (entity instanceof EntityPlayer)
AbilityHelper.spawnItemAtPlayer((EntityPlayer) entity, new ItemStack(TinkerWorld.strangeFood, 1, 2));
else
AbilityHelper.spawnItemAtEntity(entity, new ItemStack(TinkerWorld.strangeFood, 1, 2), 0);
else AbilityHelper.spawnItemAtEntity(entity, new ItemStack(TinkerWorld.strangeFood, 1, 2), 0);
}
}
private void slimify(ToolCore tool, NBTTagCompound tags, Block block, int x, int y, int z, World world)
{
if (world.isRemote)
return;
private void slimify(ToolCore tool, NBTTagCompound tags, Block block, int x, int y, int z, World world) {
if (world.isRemote) return;
int chance = tool.getPartAmount() * 100;
int count = 0;
int slimeMat = TinkerTools.MaterialID.Slime;
// regular slime
if(tags.getInteger("Head") == slimeMat)
count++;
if(tags.getInteger("Handle") == slimeMat)
count++;
if(tags.getInteger("Accessory") == slimeMat)
count++;
if(tags.getInteger("Extra") == slimeMat)
count++;
if (tags.getInteger("Head") == slimeMat) count++;
if (tags.getInteger("Handle") == slimeMat) count++;
if (tags.getInteger("Accessory") == slimeMat) count++;
if (tags.getInteger("Extra") == slimeMat) count++;
if(random.nextInt(chance) < count) {
if (random.nextInt(chance) < count) {
EntitySlime entity = new EntitySlime(world);
entity.setPosition(x+0.5,y,z+0.5);
entity.setPosition(x + 0.5, y, z + 0.5);
entity.setSlimeSize(1); // minislime!
world.spawnEntityInWorld(entity);
entity.playLivingSound();
@@ -241,18 +219,14 @@ public class TActiveOmniMod extends ActiveToolMod
// blueslime
slimeMat = TinkerTools.MaterialID.BlueSlime;
count = 0;
if(tags.getInteger("Head") == slimeMat)
count++;
if(tags.getInteger("Handle") == slimeMat)
count++;
if(tags.getInteger("Accessory") == slimeMat)
count++;
if(tags.getInteger("Extra") == slimeMat)
count++;
if (tags.getInteger("Head") == slimeMat) count++;
if (tags.getInteger("Handle") == slimeMat) count++;
if (tags.getInteger("Accessory") == slimeMat) count++;
if (tags.getInteger("Extra") == slimeMat) count++;
if(random.nextInt(chance) < count) {
if (random.nextInt(chance) < count) {
BlueSlime entity = new BlueSlime(world);
entity.setPosition(x+0.5,y,z+0.5);
entity.setPosition(x + 0.5, y, z + 0.5);
entity.setSlimeSize(1); // minislime!
world.spawnEntityInWorld(entity);
entity.playLivingSound();
@@ -260,30 +234,31 @@ public class TActiveOmniMod extends ActiveToolMod
}
@Override
public int attackDamage (int modDamage, int currentDamage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity)
{
public int attackDamage(
int modDamage,
int currentDamage,
ToolCore tool,
NBTTagCompound tags,
NBTTagCompound toolTags,
ItemStack stack,
EntityLivingBase player,
Entity entity) {
int bonus = modDamage;
if (entity instanceof EntityLivingBase)
{
if (entity instanceof EntityLivingBase) {
EnumCreatureAttribute attribute = ((EntityLivingBase) entity).getCreatureAttribute();
if (attribute == EnumCreatureAttribute.UNDEAD)
{
if (tool == TinkerTools.hammer)
{
if (attribute == EnumCreatureAttribute.UNDEAD) {
if (tool == TinkerTools.hammer) {
int level = 2;
bonus += random.nextInt(level * 2 + 1) + level * 2;
}
if (toolTags.hasKey("ModSmite"))
{
if (toolTags.hasKey("ModSmite")) {
int[] array = toolTags.getIntArray("ModSmite");
int base = array[0] / 18;
bonus += 1 + base + random.nextInt(base + 1);
}
}
if (attribute == EnumCreatureAttribute.ARTHROPOD)
{
if (toolTags.hasKey("ModAntiSpider"))
{
if (attribute == EnumCreatureAttribute.ARTHROPOD) {
if (toolTags.hasKey("ModAntiSpider")) {
int[] array = toolTags.getIntArray("ModAntiSpider");
int base = array[0] / 2;
bonus += 1 + base + random.nextInt(base + 1);
@@ -294,11 +269,17 @@ public class TActiveOmniMod extends ActiveToolMod
}
@Override
public float knockback (float modKnockback, float currentKnockback, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity)
{
public float knockback(
float modKnockback,
float currentKnockback,
ToolCore tool,
NBTTagCompound tags,
NBTTagCompound toolTags,
ItemStack stack,
EntityLivingBase player,
Entity entity) {
float bonus = modKnockback;
if (toolTags.hasKey("Knockback"))
{
if (toolTags.hasKey("Knockback")) {
float level = toolTags.getFloat("Knockback");
bonus += level;
}
@@ -306,10 +287,14 @@ public class TActiveOmniMod extends ActiveToolMod
}
@Override
public boolean doesCriticalHit (ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity)
{
if (tool == TinkerTools.cutlass && random.nextInt(10) == 0)
return true;
public boolean doesCriticalHit(
ToolCore tool,
NBTTagCompound tags,
NBTTagCompound toolTags,
ItemStack stack,
EntityLivingBase player,
Entity entity) {
if (tool == TinkerTools.cutlass && random.nextInt(10) == 0) return true;
return false;
}
}