Skip to content

Commit

Permalink
Merge pull request #57 from dshadowwolf/nme-api-update
Browse files Browse the repository at this point in the history
Creative Tabs Fixes
  • Loading branch information
dshadowwolf authored May 2, 2018
2 parents 43bde7f + 58ab3b4 commit da94292
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions src/main/java/com/mcmoddev/nethermetals/init/ItemGroups.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.mcmoddev.lib.init.MMDCreativeTab;
import com.mcmoddev.lib.init.Materials;
import com.mcmoddev.lib.material.MMDMaterial;
import com.mcmoddev.nethermetals.NetherMetals;

import net.minecraft.item.Item;

Expand All @@ -15,8 +16,6 @@
*
*/
public class ItemGroups extends com.mcmoddev.lib.init.ItemGroups {
public static final MMDCreativeTab blocksTab = getTab(SharedStrings.TAB_BLOCKS);

private static boolean initDone = false;

private ItemGroups() {
Expand All @@ -38,8 +37,8 @@ public static void setupIcons(String materialName) {
if (Materials.hasMaterial(materialName)) {
final MMDMaterial material = Materials.getMaterialByName(materialName);

if ((blocksTab != null) && (material.hasBlock(Names.NETHERORE))) {
blocksTab.setTabIconItem(Item.getItemFromBlock(material.getBlock(Names.NETHERORE)));
if (material.hasBlock(Names.NETHERORE)) {
getTab(NetherMetals.MODID,SharedStrings.TAB_BLOCKS).setTabIconItem(Item.getItemFromBlock(material.getBlock(Names.NETHERORE)));
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private static void createBasicNetherOreWrapper(String materialName ) {

private static void createNetherOreWrapper(String materialName) {
List<String> vanillaMats = Arrays.asList("coal", "diamond", "emerald", "gold", "iron", "lapis", "redstone");
NetherMetals.logger.fatal("Creating NetherOre for material named %s", materialName);

if (vanillaMats.contains(materialName))
createVanillaNetherOreWrapper(materialName);
else
Expand Down

0 comments on commit da94292

Please sign in to comment.