aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/items
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-09-09 14:25:59 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-09-09 14:25:59 +0100
commitf53fb2b84b32a9f55b6be8d84a9afc016c21e4d0 (patch)
treed7776b5f043cf1da7888daacd2a95c4ea45e6103 /src/main/java/gregtech/api/items
parentac013d92c789ae5a17723c6a6de9ae9fb8d3dd38 (diff)
downloadGT5-Unofficial-f53fb2b84b32a9f55b6be8d84a9afc016c21e4d0.tar.gz
GT5-Unofficial-f53fb2b84b32a9f55b6be8d84a9afc016c21e4d0.tar.bz2
GT5-Unofficial-f53fb2b84b32a9f55b6be8d84a9afc016c21e4d0.zip
Bugfixes and now using built in OrePrefixes enabled/disabled lists
Diffstat (limited to 'src/main/java/gregtech/api/items')
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
index ce4ef6a520..cadbe685fe 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
@@ -49,7 +49,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
OrePrefixes tPrefix = mGeneratedPrefixList[i / 1000];
if (tPrefix == null) continue;
Materials tMaterial = GregTech_API.sGeneratedMaterials[i % 1000];
- if (tMaterial == null || !tMaterial.mComponents.contains(tPrefix)) continue;
+ if (tMaterial == null) continue;
if (doesMaterialAllowGeneration(tPrefix, tMaterial)) {
ItemStack tStack = new ItemStack(this, 1, i);
GT_LanguageManager.addStringLocalization(getUnlocalizedName(tStack) + ".name", getDefaultLocalization(tPrefix, tMaterial, i));
@@ -146,7 +146,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
OrePrefixes aPrefix = mGeneratedPrefixList[i / 1000];
Materials aMaterial = GregTech_API.sGeneratedMaterials[i % 1000];
if (aPrefix != null && aMaterial != null) {
- if (aMaterial.mComponents.contains(aPrefix) && doesMaterialAllowGeneration(aPrefix, aMaterial) && doesShowInCreative(aPrefix, aMaterial, GregTech_API.sDoShowAllItemsInCreative)) {
+ if (doesMaterialAllowGeneration(aPrefix, aMaterial) && doesShowInCreative(aPrefix, aMaterial, GregTech_API.sDoShowAllItemsInCreative)) {
ItemStack tStack = new ItemStack(this, 1, i);
isItemStackUsable(tStack);
aList.add(tStack);