From f2587e15a1d620bd8f268cf4bcb2c5e2611995ee Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Wed, 20 Mar 2019 05:59:15 +0100 Subject: smaller fixes +no hardness or resistance on non gt te blocks +fixed possible lesu npe +maybe fixed windmill dupe? Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 738b8615f27431fbc18e1be41314378e495e6bce --- .../bartworks/common/blocks/BW_TileEntityContainer.java | 3 ++- .../bartimaeusnek/bartworks/common/loaders/RecipeLoader.java | 1 + .../bartworks/common/tileentities/multis/GT_TileEntity_LESU.java | 2 +- .../common/tileentities/multis/GT_TileEntity_Windmill.java | 8 +++++++- 4 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java index 4944355722..6cbca9b7ad 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java @@ -55,6 +55,8 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI public BW_TileEntityContainer(Material p_i45386_1_, Class tileEntity, String blockName) { super(p_i45386_1_); this.tileEntity = tileEntity; + this.setHardness(15.0F); + this.setResistance(30.0F); this.setCreativeTab(MainMod.BWT); this.setBlockName(blockName); this.setBlockTextureName(MainMod.MOD_ID + ":" + blockName); @@ -87,7 +89,6 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI return false; } - public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack itemStack) { final TileEntity tile = world.getTileEntity(x, y, z); if (tile instanceof IWrenchable && itemStack != null) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java index 95cb64890b..972eacef2d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java @@ -600,6 +600,7 @@ public class RecipeLoader implements Runnable { 'W', "logWood", } ); + GT_ModHandler.addCraftingRecipe( new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), GT_ModHandler.RecipeBits.NOT_REMOVABLE, diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_LESU.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_LESU.java index 8e7042908a..c3aabbd0da 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_LESU.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_LESU.java @@ -295,7 +295,7 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { case 1: return true; default: - return p_94041_2_.getItem().equals(GT_Utility.getIntegratedCircuit(0).getItem()); + return p_94041_2_ != null && p_94041_2_.getItem().equals(GT_Utility.getIntegratedCircuit(0).getItem()); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java index 5d601ed32c..0d36a4fcb7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java @@ -114,7 +114,13 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_MultiBlockBase { if (new XSTR().nextInt(2) == 0) { if (tRecipe.getOutput(1) != null) mOutputItems[1] = tRecipe.getOutput(1); - else if (GT_OreDictUnificator.getAssociation(aStack) == null || GT_OreDictUnificator.getAssociation(aStack).mMaterial == null || GT_OreDictUnificator.getAssociation(aStack).mMaterial.mMaterial == null || + if( !BW_Util.checkStackAndPrefix(mOutputItems[0]) || + !( + BW_Util.checkStackAndPrefix(mOutputItems[0]) && GT_OreDictUnificator.getAssociation(mOutputItems[0]).mMaterial.mMaterial.mSubTags.contains(SubTag.METAL) || + BW_Util.checkStackAndPrefix(mOutputItems[0]) && GT_OreDictUnificator.getAssociation(mOutputItems[0]).mMaterial.mMaterial.mSubTags.contains(SubTag.CRYSTAL)|| + BW_Util.checkStackAndPrefix(mOutputItems[0]) && GT_OreDictUnificator.getAssociation(mOutputItems[0]).mMaterial.mMaterial.mSubTags.contains(SubTag.CRYSTALLISABLE) + ) + || BW_Util.checkStackAndPrefix(mOutputItems[0]) && GT_OreDictUnificator.getAssociation(mOutputItems[0]).mMaterial.mMaterial == Materials.Flint || BW_Util.checkStackAndPrefix(mOutputItems[0]) && GT_OreDictUnificator.getAssociation(mOutputItems[0]).mMaterial.mMaterial == Materials.Sugar || BW_Util.checkStackAndPrefix(mOutputItems[0]) && GT_OreDictUnificator.getAssociation(mOutputItems[0]).mMaterial.mMaterial == Materials.Wheat || -- cgit