mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-22 13:09:53 +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
@@ -4,35 +4,34 @@ import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.util.*;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
|
||||
public class SmelteryDamageSource extends DamageSource
|
||||
{
|
||||
public SmelteryDamageSource()
|
||||
{
|
||||
public class SmelteryDamageSource extends DamageSource {
|
||||
public SmelteryDamageSource() {
|
||||
super("smeltery");
|
||||
}
|
||||
|
||||
@Override
|
||||
public IChatComponent func_151519_b (EntityLivingBase par1EntityLiving)
|
||||
{
|
||||
public IChatComponent func_151519_b(EntityLivingBase par1EntityLiving) {
|
||||
String type = "";
|
||||
switch (AbilityHelper.random.nextInt(4))
|
||||
{
|
||||
case 0:
|
||||
type = "one.";
|
||||
break;
|
||||
case 1:
|
||||
type = "two.";
|
||||
break;
|
||||
case 2:
|
||||
type = "three.";
|
||||
break;
|
||||
case 3:
|
||||
type = "four.";
|
||||
break;
|
||||
switch (AbilityHelper.random.nextInt(4)) {
|
||||
case 0:
|
||||
type = "one.";
|
||||
break;
|
||||
case 1:
|
||||
type = "two.";
|
||||
break;
|
||||
case 2:
|
||||
type = "three.";
|
||||
break;
|
||||
case 3:
|
||||
type = "four.";
|
||||
break;
|
||||
}
|
||||
EntityLivingBase entityliving1 = par1EntityLiving.func_94060_bK();
|
||||
String s = "death." + type + this.damageType;
|
||||
String s1 = s + ".player";
|
||||
return entityliving1 != null && StatCollector.canTranslate(s1) ? new ChatComponentTranslation(s1, new Object[] { par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_() }) : new ChatComponentTranslation(s, new Object[] { par1EntityLiving.func_145748_c_() });
|
||||
return entityliving1 != null && StatCollector.canTranslate(s1)
|
||||
? new ChatComponentTranslation(
|
||||
s1, new Object[] {par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_()})
|
||||
: new ChatComponentTranslation(s, new Object[] {par1EntityLiving.func_145748_c_()});
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user