diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java | 11 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java index f3b40a7214..aac26418b0 100644 --- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java @@ -15,6 +15,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; @@ -114,13 +115,17 @@ public class BlockEventHandler { ArrayList<Block> mBlockTypes = new ArrayList<Block>(); if (!oreLimestone.isEmpty()){ for (int i=0;i<oreLimestone.size();i++){ - mBlockTypes.add(Block.getBlockFromItem(oreLimestone.get(i).getItem())); + if (!ItemUtils.getModId(oreLimestone.get(i)).toLowerCase().contains("biomesoplenty")) { + mBlockTypes.add(Block.getBlockFromItem(oreLimestone.get(i).getItem())); + } } } if (!blockLimestone.isEmpty()){ for (int i=0;i<blockLimestone.size();i++){ - if (!mBlockTypes.contains(Block.getBlockFromItem(blockLimestone.get(i).getItem()))){ - mBlockTypes.add(Block.getBlockFromItem(blockLimestone.get(i).getItem())); + if (!ItemUtils.getModId(oreLimestone.get(i)).toLowerCase().contains("biomesoplenty")) { + if (!mBlockTypes.contains(Block.getBlockFromItem(blockLimestone.get(i).getItem()))){ + mBlockTypes.add(Block.getBlockFromItem(blockLimestone.get(i).getItem())); + } } } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index d4eadedc48..1cdc08c1db 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1039,11 +1039,11 @@ public class RECIPES_GREGTECH { new int[] { 2000, 1000, 250, 250, 250, 250, 500 }, 0); HotFuel.addNewHotFuel(FluidUtils.getFluidStack("ic2pahoehoelava", 83), GT_Values.NF, - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("nuggetCopper", 1), - ItemUtils.getItemStackOfAmountFromOreDict("nuggetTin", 1), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("nuggetBronze", 1), ItemUtils.getItemStackOfAmountFromOreDict("nuggetElectrum", 1), ItemUtils.getSimpleStack(Blocks.obsidian) }, - new int[] { 1000, 500, 125, 1850 }, 0); + new int[] { 750, 250, 1850 }, 0); /* * HotFuel.addNewHotFuel( FluidUtils.getFluidStack("ic2hotcoolant", |