diff options
Diffstat (limited to 'src/Java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/common/CI.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 77556aff53..4d788e048e 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -562,7 +562,7 @@ public final class ModItems { tI = new BaseItemMisc("Forest", new short[]{130,164,96}, 64, MiscTypes.MUSHROOM, new String[]{"You Found this on the ground.", "Definitely not sure if it's worth eating."}); //EnderIO Resources - if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){ + if ((LoadedMods.EnderIO || LOAD_ALL_CONTENT) && !CORE.GTNH){ Utils.LOG_INFO("EnderIO Found - Loading Resources."); //Enderio Dusts itemDustSoularium = ItemUtils.generateSpecialUseDusts("Soularium", "Soularium", Utils.rgbtoHexValue(95,90,54))[0]; @@ -605,7 +605,7 @@ public final class ModItems { } //Thaumcraft - if (LoadedMods.Thaumcraft|| LOAD_ALL_CONTENT){ + if ((LoadedMods.Thaumcraft|| LOAD_ALL_CONTENT) && !CORE.GTNH){ Utils.LOG_INFO("Thaumcraft Found - Loading Resources."); //Item Init try { diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index e7aa8f831e..bcd669682d 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -8,6 +8,7 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.recipe.LOADER_Machine_Components; +import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; @@ -355,11 +356,10 @@ public class CI { type.get(material); } else { - if (material instanceof Material){ String materialName = ((Material) material).getLocalizedName(); ItemUtils.getItemStackOfAmountFromOreDict(type.mRegularLocalName+materialName, 1); - } } + Utils.LOG_INFO("[Components] Failed getting a tiered component. "+type.mRegularLocalName+" "+tier); return null; } |