diff options
| author | Martin Robertz <dream-master@gmx.net> | 2020-04-11 15:33:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-11 15:33:47 +0200 |
| commit | ce8441b14d3b3e78f4cc5af2dbfc743e274ba22c (patch) | |
| tree | 84f24e78676a6b1d8604dd5edd92ba1cd0f6491d /src/main/java/gregtech/common/items | |
| parent | bd10bd57d3db003f63a7abd59422a27894358355 (diff) | |
| parent | d604d24ed0fdbb77c4d3431efc1dd994d1140f02 (diff) | |
| download | GT5-Unofficial-ce8441b14d3b3e78f4cc5af2dbfc743e274ba22c.tar.gz GT5-Unofficial-ce8441b14d3b3e78f4cc5af2dbfc743e274ba22c.tar.bz2 GT5-Unofficial-ce8441b14d3b3e78f4cc5af2dbfc743e274ba22c.zip | |
Merge pull request #263 from GTNewHorizons/fixes
Fixes
Diffstat (limited to 'src/main/java/gregtech/common/items')
| -rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index ef17e4f433..cb1737d665 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -861,6 +861,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.addAssemblerRecipe(ItemList.Emitter_MV.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), ItemList.Cover_NeedsMaintainance.get(1L, new Object[0]), 600, 24); } + private static boolean bw = Loader.isModLoaded("bartworks"); + public boolean onEntityItemUpdate(EntityItem aItemEntity) { int aDamage = aItemEntity.getEntityItem().getItemDamage(); if ((aDamage < 32000) && (aDamage >= 0) && (!aItemEntity.worldObj.isRemote)) { @@ -874,11 +876,23 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { Block tBlock = aItemEntity.worldObj.getBlock(tX, tY, tZ); byte tMetaData = (byte) aItemEntity.worldObj.getBlockMetadata(tX, tY, tZ); if ((tBlock == Blocks.cauldron) && (tMetaData > 0)) { + + if (bw) { + if (aMaterial == Materials.Osmium) + aMaterial = GT_BartWorks_Compat.getBartWorksMaterialByIGNName("Rarest Metal Residue"); + else if (aMaterial == Materials.Iridium) + aMaterial = GT_BartWorks_Compat.getBartWorksMaterialByIGNName("Iridium Metal Residue"); + else if (aMaterial == Materials.Platinum) + aMaterial = GT_BartWorks_Compat.getBartWorksMaterialByIGNName("Platinum Metallic Powder"); + else if (aMaterial == Materials.Palladium) + aMaterial = GT_BartWorks_Compat.getBartWorksMaterialByIGNName("Palladium Metallic Powder"); + } + aItemEntity.setEntityItemStack(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, aItemEntity.getEntityItem().stackSize)); aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); return true; } - }else if (aPrefix == OrePrefixes.crushed) { + } else if (aPrefix == OrePrefixes.crushed) { Block tBlock = aItemEntity.worldObj.getBlock(tX, tY, tZ); byte tMetaData = (byte) aItemEntity.worldObj.getBlockMetadata(tX, tY, tZ); if ((tBlock == Blocks.cauldron) && (tMetaData > 0)) { @@ -886,7 +900,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); return true; } - }else if(aPrefix == OrePrefixes.dust && aMaterial == Materials.Wheat){ + } else if(aPrefix == OrePrefixes.dust && aMaterial == Materials.Wheat) { Block tBlock = aItemEntity.worldObj.getBlock(tX, tY, tZ); byte tMetaData = (byte) aItemEntity.worldObj.getBlockMetadata(tX, tY, tZ); if ((tBlock == Blocks.cauldron) && (tMetaData > 0)) { |