aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-09-09 18:44:54 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-09-09 18:44:54 +1000
commit2d67cb6dd3d4f2c26fc44c0763c8c0414b7b6bda (patch)
tree33f9fb98d7bb6591f2d1b450f4be06bfa5642f3e /src/Java/gtPlusPlus/core
parent221c2f0fe81430e7dd4087e5f5845bd7c62ec56d (diff)
downloadGT5-Unofficial-2d67cb6dd3d4f2c26fc44c0763c8c0414b7b6bda.tar.gz
GT5-Unofficial-2d67cb6dd3d4f2c26fc44c0763c8c0414b7b6bda.tar.bz2
GT5-Unofficial-2d67cb6dd3d4f2c26fc44c0763c8c0414b7b6bda.zip
+ Added Harvesrcraft support to growthcraft Fishtraps in older versions of GC.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/util/item/UtilsItems.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
index 623fc1707c..6eb5335035 100644
--- a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
+++ b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
@@ -2,8 +2,8 @@ package gtPlusPlus.core.util.item;
import gregtech.api.enums.Materials;
import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.block.base.BlockBaseModular;
import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
+import gtPlusPlus.core.block.base.BlockBaseModular;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.base.BasicSpawnEgg;
import gtPlusPlus.core.item.base.bolts.BaseItemBolt;
@@ -261,6 +261,16 @@ public class UtilsItems {
return getSimpleStack(ModItems.AAA_Broken, amount);
}
+ public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, int amount){
+ ItemStack returnValue = getItemStackOfAmountFromOreDict(oredictName, amount);
+
+ if (returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass() || returnValue.getItem() != ModItems.AAA_Broken){
+ return returnValue;
+ }
+
+ return null;
+ }
+
public static void generateItemsFromMaterial(String unlocalizedName, String materialName, int materialTier, MaterialInfo matInfo, int Colour, boolean hotIngot){
if (materialTier > 10 || materialTier <= 0){
materialTier = 2;