Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
This commit is contained in:
commit
da4f8fcb4d
2 changed files with 8 additions and 2 deletions
|
@ -399,8 +399,8 @@ public abstract class CableMultipart extends Multipart
|
||||||
}
|
}
|
||||||
if (ConfigTechReborn.UninsulatedElectocutionSound)
|
if (ConfigTechReborn.UninsulatedElectocutionSound)
|
||||||
{
|
{
|
||||||
getWorld().playSound(entity.posX, entity.posY, entity.posZ, ModSounds.shock,
|
// getWorld().playSound(entity.posX, entity.posY, entity.posZ, ModSounds.shock,
|
||||||
SoundCategory.BLOCKS, 0.6F, 1F, false);
|
// SoundCategory.BLOCKS, 0.6F, 1F, false);
|
||||||
}
|
}
|
||||||
if (ConfigTechReborn.UninsulatedElectocutionParticle)
|
if (ConfigTechReborn.UninsulatedElectocutionParticle)
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,6 +14,7 @@ import reborncore.common.util.ItemUtils;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
import ic2.api.tile.IWrenchable;
|
import ic2.api.tile.IWrenchable;
|
||||||
|
import techreborn.items.ItemParts;
|
||||||
|
|
||||||
public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory
|
public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory
|
||||||
{
|
{
|
||||||
|
@ -303,6 +304,11 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
|
||||||
{
|
{
|
||||||
// int value = getValue(Recipes.matterAmplifier.getOutputFor(itemStack,
|
// int value = getValue(Recipes.matterAmplifier.getOutputFor(itemStack,
|
||||||
// false));
|
// false));
|
||||||
|
if(itemStack.getItem() == ModItems.parts && itemStack.getItemDamage() == ItemParts.getPartByName("scrap").getItemDamage()){
|
||||||
|
return 5000;
|
||||||
|
} else if (itemStack.getItem() == ModItems.scrapBox){
|
||||||
|
return 45000;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue