From 6f8741694c6277b4ade332916e5bd8f61ecd69f0 Mon Sep 17 00:00:00 2001 From: TeamDman Date: Thu, 6 Dec 2018 18:57:24 -0500 Subject: [PATCH] Reenable tier 6 with config option Revert of fd0326576475c137bc3f7ca73c2e3167aa1f8575 --- .../WayofTime/bloodmagic/ConfigHandler.java | 3 ++ .../WayofTime/bloodmagic/altar/AltarTier.java | 54 +++++++++---------- .../api/impl/BloodMagicCorePlugin.java | 11 ++-- .../bloodmagic/block/BlockDecorative.java | 13 +++++ .../block/enums/EnumDecorative.java | 5 +- .../compat/jei/BloodMagicJEIPlugin.java | 30 ++++++++--- .../bloodmagic/core/RegistrarBloodMagic.java | 34 ++++++------ .../core/RegistrarBloodMagicRecipes.java | 15 +++--- .../bloodmagic/item/ItemInscriptionTool.java | 7 +-- 9 files changed, 102 insertions(+), 70 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 85b20776..3681b7af 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -42,6 +42,9 @@ public class ConfigHandler public boolean enableAPILogging = false; @Config.Comment({ "Enables extra information to be printed to the log.", "Warning: May drastically increase log size." }) public boolean enableVerboseAPILogging = false; + @Config.Comment({ "Enables tier 6 related registrations. This is for pack makers."}) + @Config.RequiresMcRestart + public boolean enableTierSixEvenThoughThereIsNoContent = false; } public static class ConfigBlacklist diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java index 105efae2..906c61e3 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.altar; +import WayofTime.bloodmagic.ConfigHandler; import com.google.common.collect.Lists; import net.minecraft.util.math.BlockPos; @@ -100,34 +101,33 @@ public enum AltarTier { } } }, -// SIX() { -// @Override -// public void buildComponents(Consumer components) { -// FIVE.getAltarComponents().forEach(components); -// -// for (int i = -4; i <= 2; i++) { -// components.accept(new AltarComponent(new BlockPos(11, i, 11))); -// components.accept(new AltarComponent(new BlockPos(-11, i, -11))); -// components.accept(new AltarComponent(new BlockPos(11, i, -11))); -// components.accept(new AltarComponent(new BlockPos(-11, i, 11))); -// } -// -// components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); -// components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); -// components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); -// components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); -// -// for (int i = -9; i <= 9; i++) { -// components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); -// components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); -// components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); -// components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); -// } -// } -// }, - ; + SIX() { + @Override + public void buildComponents(Consumer components) { + FIVE.getAltarComponents().forEach(components); - public static final int MAXTIERS = values().length; + for (int i = -4; i <= 2; i++) { + components.accept(new AltarComponent(new BlockPos(11, i, 11))); + components.accept(new AltarComponent(new BlockPos(-11, i, -11))); + components.accept(new AltarComponent(new BlockPos(11, i, -11))); + components.accept(new AltarComponent(new BlockPos(-11, i, 11))); + } + + components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); + + for (int i = -9; i <= 9; i++) { + components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); + } + } + }; + + public static final int MAXTIERS = ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent ? values().length : values().length-1; private List altarComponents; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index e8d2e44d..1725d095 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.altar.ComponentType; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicAPI; import WayofTime.bloodmagic.api.IBloodMagicPlugin; -import WayofTime.bloodmagic.altar.ComponentType; import WayofTime.bloodmagic.api.IBloodMagicRecipeRegistrar; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; @@ -17,9 +17,6 @@ import WayofTime.bloodmagic.incense.EnumTranquilityType; import WayofTime.bloodmagic.incense.TranquilityStack; import WayofTime.bloodmagic.util.StateUtil; import net.minecraft.block.Block; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.EntityEntry; @@ -76,8 +73,10 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin BlockDecorative decorative = (BlockDecorative) RegistrarBloodMagicBlocks.DECORATIVE_BRICK; api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_BRICK), ComponentType.BLOODSTONE.name()); api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_TILE), ComponentType.BLOODSTONE.name()); -// api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), ComponentType.CRYSTAL.name()); -// api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), ComponentType.CRYSTAL.name()); + if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { + api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), ComponentType.CRYSTAL.name()); + api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), ComponentType.CRYSTAL.name()); + } BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE; for (BloodRuneType runeType : BloodRuneType.values()) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java index 281b4fb5..76ae3392 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java @@ -1,10 +1,14 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumDecorative; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; public class BlockDecorative extends BlockEnum { public BlockDecorative() { @@ -17,4 +21,13 @@ public class BlockDecorative extends BlockEnum { setSoundType(SoundType.STONE); setHarvestLevel("pickaxe", 2); } + + @Override + public void getSubBlocks(CreativeTabs tab, NonNullList subBlocks) { + for (EnumDecorative type : EnumDecorative.values()){ + if (!ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent && (type == EnumDecorative.CRYSTAL_TILE || type == EnumDecorative.CRYSTAL_BRICK)) + continue; + subBlocks.add(new ItemStack(this, 1, type.ordinal())); + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java index b0b31622..7bceae13 100644 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java +++ b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java @@ -7,9 +7,8 @@ import java.util.Locale; public enum EnumDecorative implements IStringSerializable { BLOODSTONE_TILE, BLOODSTONE_BRICK, -// CRYSTAL_TILE, -// CRYSTAL_BRICK, - ; + CRYSTAL_TILE, + CRYSTAL_BRICK; @Override public String toString() { diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index 7f82a21a..d615e21d 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -1,22 +1,17 @@ package WayofTime.bloodmagic.compat.jei; +import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeJEI; -import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.orb.IBloodOrb; -import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; -import WayofTime.bloodmagic.util.Constants; -import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.block.enums.EnumDecorative; import WayofTime.bloodmagic.client.gui.GuiSoulForge; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeJEI; import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeCategory; +import WayofTime.bloodmagic.compat.jei.alchemyTable.AlchemyTableRecipeJEI; import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeCategory; import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeJEI; import WayofTime.bloodmagic.compat.jei.armourDowngrade.ArmourDowngradeRecipeCategory; @@ -29,6 +24,14 @@ import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeCategory; import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeJEI; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableRecipe; +import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import mezz.jei.api.*; import mezz.jei.api.recipe.IRecipeCategoryRegistration; import net.minecraft.item.ItemStack; @@ -86,6 +89,17 @@ public class BloodMagicJEIPlugin implements IModPlugin { registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_BINDING); registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.ALCHEMY_TABLE), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE); + + if (!ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { + for (ItemStack stack : new ItemStack[]{ +// OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), //unregistered elsewhere + new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_TILE.ordinal()), + new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_BRICK.ordinal()), + new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, 1, EnumRuneType.DAWN.ordinal()) + }) { + jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(stack); + } + } } @Override diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 2b352d8b..613d8fcc 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -1,5 +1,15 @@ package WayofTime.bloodmagic.core; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.core.registry.OrbRegistry; +import WayofTime.bloodmagic.entity.mob.*; +import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; +import WayofTime.bloodmagic.entity.projectile.EntityMeteor; +import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; +import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.potion.PotionBloodMagic; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.MobEffects; import net.minecraft.potion.Potion; @@ -16,20 +26,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.RegistryBuilder; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.core.registry.OrbRegistry; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider; -import WayofTime.bloodmagic.entity.mob.EntityCorruptedZombie; -import WayofTime.bloodmagic.entity.mob.EntityMimic; -import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import WayofTime.bloodmagic.entity.projectile.EntityMeteor; -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import WayofTime.bloodmagic.orb.BloodOrb; -import WayofTime.bloodmagic.potion.PotionBloodMagic; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) @GameRegistry.ObjectHolder(BloodMagic.MODID) @@ -47,8 +43,8 @@ public class RegistrarBloodMagic public static final BloodOrb ORB_MASTER = ORB_DEF; @GameRegistry.ObjectHolder("archmage") public static final BloodOrb ORB_ARCHMAGE = ORB_DEF; -// @GameRegistry.ObjectHolder("transcendent") -// public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; + @GameRegistry.ObjectHolder("transcendent") + public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; public static final Potion BOOST = MobEffects.HASTE; public static final Potion WHIRLWIND = MobEffects.HASTE; @@ -76,8 +72,12 @@ public class RegistrarBloodMagic new BloodOrb("magician", 3, 150000, 15).withModel(new ModelResourceLocation(orb, "type=magician")).setRegistryName("magician"), new BloodOrb("master", 4, 1000000, 25).withModel(new ModelResourceLocation(orb, "type=master")).setRegistryName("master"), new BloodOrb("archmage", 5, 10000000, 50).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage") -// new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") ); + if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { + event.getRegistry().register( + new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") + ); + } } @SubscribeEvent diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index fb416608..cbb2c54a 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -1,17 +1,18 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; +import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.altar.AltarTier; +import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; +import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.item.ItemSlate; -import WayofTime.bloodmagic.ritual.EnumRuneType; -import WayofTime.bloodmagic.soul.EnumDemonWillType; -import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import WayofTime.bloodmagic.item.types.ComponentTypes; +import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.util.PluginUtil; import com.google.common.collect.Sets; import net.minecraft.init.Blocks; @@ -98,8 +99,10 @@ public class RegistrarBloodMagicRecipes registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), AltarTier.FIVE.ordinal(), 30000, 40, 100); // SIX -// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); -// registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); + if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { + registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); + registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); + } } public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 67e87565..6f4bb703 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -1,11 +1,12 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.iface.IBindable; -import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.ritual.EnumRuneType; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.NBTHelper; -import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; @@ -41,7 +42,7 @@ public class ItemInscriptionTool extends ItemEnum.Variant implemen return; for (EnumRuneType runeType : types) { - if (runeType == EnumRuneType.BLANK) + if (runeType == EnumRuneType.BLANK || !ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent && runeType == EnumRuneType.DAWN) continue; ItemStack stack = new ItemStack(this, 1, runeType.ordinal());