Added config to disable gem tools and armour, closes

This commit is contained in:
modmuss50 2016-06-04 11:20:06 +01:00
parent d3bd2bf70b
commit 1a0fb02516
3 changed files with 102 additions and 91 deletions
src/main/java/techreborn

View file

@ -141,6 +141,9 @@ public class ConfigTechReborn
// EMC
public static boolean UseConnectedTextures;
public static boolean OreUnifer;
public static boolean enableGemArmorAndTools;
public static Configuration config;
private static ConfigTechReborn instance = null;
@ -370,6 +373,8 @@ public class ConfigTechReborn
.get(CATEGORY_FEATURES, "Frequency Transmitter tooltips", true, "Allow Frequency Transmitter to display tooltip info")
.getBoolean(true);
enableGemArmorAndTools = config.get(CATEGORY_FEATURES, "Gem tools and armor", true, "Should the gem tools and armor be added to the game").getBoolean(true);
// Crafting
ExpensiveMacerator = config
.get(CATEGORY_CRAFTING, "Expensive Macerator", true, "Allow TechReborn to change the Macerator recipe")

View file

@ -13,6 +13,7 @@ import reborncore.common.util.BucketHandler;
import techreborn.Core;
import techreborn.api.Reference;
import techreborn.blocks.BlockMachineFrame;
import techreborn.config.ConfigTechReborn;
import techreborn.events.OreUnifier;
import techreborn.items.*;
import techreborn.items.armor.ItemLapotronPack;
@ -186,85 +187,88 @@ public class ModItems
advancedJackhammer = PoweredItem.createItem(ItemAdvancedJackhammer.class);
registerItem(advancedJackhammer, "ironjackhammer");
bronzeSword = new ItemTRSword(Reference.BRONZE);
registerItem(bronzeSword, "bronzeSword");
bronzePickaxe = new ItemTRPickaxe(Reference.BRONZE);
registerItem(bronzePickaxe, "bronzePickaxe");
bronzeSpade = new ItemTRSpade(Reference.BRONZE);
registerItem(bronzeSpade, "bronzeSpade");
bronzeAxe = new ItemTRAxe(Reference.BRONZE);
registerItem(bronzeAxe, "bronzeAxe");
bronzeHoe = new ItemTRHoe(Reference.BRONZE);
registerItem(bronzeHoe, "bronzeHoe");
if(ConfigTechReborn.enableGemArmorAndTools){
bronzeSword = new ItemTRSword(Reference.BRONZE);
registerItem(bronzeSword, "bronzeSword");
bronzePickaxe = new ItemTRPickaxe(Reference.BRONZE);
registerItem(bronzePickaxe, "bronzePickaxe");
bronzeSpade = new ItemTRSpade(Reference.BRONZE);
registerItem(bronzeSpade, "bronzeSpade");
bronzeAxe = new ItemTRAxe(Reference.BRONZE);
registerItem(bronzeAxe, "bronzeAxe");
bronzeHoe = new ItemTRHoe(Reference.BRONZE);
registerItem(bronzeHoe, "bronzeHoe");
bronzeHelmet = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.HEAD);
registerItem(bronzeHelmet, "bronzeHelmet");
bronzeChestplate = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.CHEST);
registerItem(bronzeChestplate, "bronzeChestplate");
bronzeLeggings = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.LEGS);
registerItem(bronzeLeggings, "bronzeLeggings");
bronzeBoots = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.FEET);
registerItem(bronzeBoots, "bronzeBoots");
bronzeHelmet = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.HEAD);
registerItem(bronzeHelmet, "bronzeHelmet");
bronzeChestplate = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.CHEST);
registerItem(bronzeChestplate, "bronzeChestplate");
bronzeLeggings = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.LEGS);
registerItem(bronzeLeggings, "bronzeLeggings");
bronzeBoots = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.FEET);
registerItem(bronzeBoots, "bronzeBoots");
rubySword = new ItemTRSword(Reference.RUBY);
registerItem(rubySword, "rubySword");
rubyPickaxe = new ItemTRPickaxe(Reference.RUBY);
registerItem(rubyPickaxe, "rubyPickaxe");
rubySpade = new ItemTRSpade(Reference.RUBY);
registerItem(rubySpade, "rubySpade");
rubyAxe = new ItemTRAxe(Reference.RUBY);
registerItem(rubyAxe, "rubyAxe");
rubyHoe = new ItemTRHoe(Reference.RUBY);
registerItem(rubyHoe, "rubyHoe");
rubySword = new ItemTRSword(Reference.RUBY);
registerItem(rubySword, "rubySword");
rubyPickaxe = new ItemTRPickaxe(Reference.RUBY);
registerItem(rubyPickaxe, "rubyPickaxe");
rubySpade = new ItemTRSpade(Reference.RUBY);
registerItem(rubySpade, "rubySpade");
rubyAxe = new ItemTRAxe(Reference.RUBY);
registerItem(rubyAxe, "rubyAxe");
rubyHoe = new ItemTRHoe(Reference.RUBY);
registerItem(rubyHoe, "rubyHoe");
rubyHelmet = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.HEAD);
registerItem(rubyHelmet, "rubyHelmet");
rubyChestplate = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.CHEST);
registerItem(rubyChestplate, "rubyChestplate");
rubyLeggings = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.LEGS);
registerItem(rubyLeggings, "rubyLeggings");
rubyBoots = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.FEET);
registerItem(rubyBoots, "rubyBoots");
rubyHelmet = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.HEAD);
registerItem(rubyHelmet, "rubyHelmet");
rubyChestplate = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.CHEST);
registerItem(rubyChestplate, "rubyChestplate");
rubyLeggings = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.LEGS);
registerItem(rubyLeggings, "rubyLeggings");
rubyBoots = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.FEET);
registerItem(rubyBoots, "rubyBoots");
sapphireSword = new ItemTRSword(Reference.SAPPHIRE);
registerItem(sapphireSword, "sapphireSword");
sapphirePickaxe = new ItemTRPickaxe(Reference.SAPPHIRE);
registerItem(sapphirePickaxe, "sapphirePickaxe");
sapphireSpade = new ItemTRSpade(Reference.SAPPHIRE);
registerItem(sapphireSpade, "sapphireSpade");
sapphireAxe = new ItemTRAxe(Reference.SAPPHIRE);
registerItem(sapphireAxe, "sapphireAxe");
sapphireHoe = new ItemTRHoe(Reference.SAPPHIRE);
registerItem(sapphireHoe, "sapphireHoe");
sapphireSword = new ItemTRSword(Reference.SAPPHIRE);
registerItem(sapphireSword, "sapphireSword");
sapphirePickaxe = new ItemTRPickaxe(Reference.SAPPHIRE);
registerItem(sapphirePickaxe, "sapphirePickaxe");
sapphireSpade = new ItemTRSpade(Reference.SAPPHIRE);
registerItem(sapphireSpade, "sapphireSpade");
sapphireAxe = new ItemTRAxe(Reference.SAPPHIRE);
registerItem(sapphireAxe, "sapphireAxe");
sapphireHoe = new ItemTRHoe(Reference.SAPPHIRE);
registerItem(sapphireHoe, "sapphireHoe");
sapphireHelmet = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.HEAD);
registerItem(sapphireHelmet, "sapphireHelmet");
sapphireChestplate = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.CHEST);
registerItem(sapphireChestplate, "sapphireChestplate");
sapphireLeggings = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.LEGS);
registerItem(sapphireLeggings, "sapphireLeggings");
sapphireBoots = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.FEET);
registerItem(sapphireBoots, "sapphireBoots");
sapphireHelmet = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.HEAD);
registerItem(sapphireHelmet, "sapphireHelmet");
sapphireChestplate = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.CHEST);
registerItem(sapphireChestplate, "sapphireChestplate");
sapphireLeggings = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.LEGS);
registerItem(sapphireLeggings, "sapphireLeggings");
sapphireBoots = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.FEET);
registerItem(sapphireBoots, "sapphireBoots");
peridotSword = new ItemTRSword(Reference.PERIDOT);
registerItem(peridotSword, "peridotSword");
peridotPickaxe = new ItemTRPickaxe(Reference.PERIDOT);
registerItem(peridotPickaxe, "peridotPickaxe");
peridotSpade = new ItemTRSpade(Reference.PERIDOT);
registerItem(peridotSpade, "peridotSpade");
peridotAxe = new ItemTRAxe(Reference.PERIDOT);
registerItem(peridotAxe, "peridotAxe");
peridotHoe = new ItemTRHoe(Reference.PERIDOT);
registerItem(peridotHoe, "peridotHoe");
peridotSword = new ItemTRSword(Reference.PERIDOT);
registerItem(peridotSword, "peridotSword");
peridotPickaxe = new ItemTRPickaxe(Reference.PERIDOT);
registerItem(peridotPickaxe, "peridotPickaxe");
peridotSpade = new ItemTRSpade(Reference.PERIDOT);
registerItem(peridotSpade, "peridotSpade");
peridotAxe = new ItemTRAxe(Reference.PERIDOT);
registerItem(peridotAxe, "peridotAxe");
peridotHoe = new ItemTRHoe(Reference.PERIDOT);
registerItem(peridotHoe, "peridotHoe");
peridotHelmet = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.HEAD);
registerItem(peridotHelmet, "peridotHelmet");
peridotChestplate = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.CHEST);
registerItem(peridotChestplate, "peridotChestplate");
peridotLeggings = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.LEGS);
registerItem(peridotLeggings, "peridotLeggings");
peridotBoots = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET);
registerItem(peridotBoots, "peridotBoots");
}
peridotHelmet = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.HEAD);
registerItem(peridotHelmet, "peridotHelmet");
peridotChestplate = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.CHEST);
registerItem(peridotChestplate, "peridotChestplate");
peridotLeggings = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.LEGS);
registerItem(peridotLeggings, "peridotLeggings");
peridotBoots = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET);
registerItem(peridotBoots, "peridotBoots");
wrench = new ItemWrench();
registerItem(wrench, "wrench");

View file

@ -495,28 +495,30 @@ public class ModRecipes
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ironFence, 6), " ", "RRR", "RRR", 'R',
ItemIngots.getIngotByName("refinedIron"));
addGemToolRecipes(new ItemStack(ModItems.rubySword), new ItemStack(ModItems.rubyPickaxe),
new ItemStack(ModItems.rubyAxe), new ItemStack(ModItems.rubyHoe), new ItemStack(ModItems.rubySpade),
new ItemStack(ModItems.rubyHelmet), new ItemStack(ModItems.rubyChestplate),
new ItemStack(ModItems.rubyLeggings), new ItemStack(ModItems.rubyBoots), "gemRuby");
if(ConfigTechReborn.enableGemArmorAndTools){
addGemToolRecipes(new ItemStack(ModItems.rubySword), new ItemStack(ModItems.rubyPickaxe),
new ItemStack(ModItems.rubyAxe), new ItemStack(ModItems.rubyHoe), new ItemStack(ModItems.rubySpade),
new ItemStack(ModItems.rubyHelmet), new ItemStack(ModItems.rubyChestplate),
new ItemStack(ModItems.rubyLeggings), new ItemStack(ModItems.rubyBoots), "gemRuby");
addGemToolRecipes(new ItemStack(ModItems.sapphireSword), new ItemStack(ModItems.sapphirePickaxe),
new ItemStack(ModItems.sapphireAxe), new ItemStack(ModItems.sapphireHoe),
new ItemStack(ModItems.sapphireSpade), new ItemStack(ModItems.sapphireHelmet),
new ItemStack(ModItems.sapphireChestplate), new ItemStack(ModItems.sapphireLeggings),
new ItemStack(ModItems.sapphireBoots), "gemSapphire");
addGemToolRecipes(new ItemStack(ModItems.sapphireSword), new ItemStack(ModItems.sapphirePickaxe),
new ItemStack(ModItems.sapphireAxe), new ItemStack(ModItems.sapphireHoe),
new ItemStack(ModItems.sapphireSpade), new ItemStack(ModItems.sapphireHelmet),
new ItemStack(ModItems.sapphireChestplate), new ItemStack(ModItems.sapphireLeggings),
new ItemStack(ModItems.sapphireBoots), "gemSapphire");
addGemToolRecipes(new ItemStack(ModItems.peridotSword), new ItemStack(ModItems.peridotPickaxe),
new ItemStack(ModItems.peridotAxe), new ItemStack(ModItems.peridotHoe),
new ItemStack(ModItems.peridotSpade), new ItemStack(ModItems.peridotHelmet),
new ItemStack(ModItems.peridotChestplate), new ItemStack(ModItems.peridotLeggings),
new ItemStack(ModItems.peridotBoots), "gemPeridot");
addGemToolRecipes(new ItemStack(ModItems.peridotSword), new ItemStack(ModItems.peridotPickaxe),
new ItemStack(ModItems.peridotAxe), new ItemStack(ModItems.peridotHoe),
new ItemStack(ModItems.peridotSpade), new ItemStack(ModItems.peridotHelmet),
new ItemStack(ModItems.peridotChestplate), new ItemStack(ModItems.peridotLeggings),
new ItemStack(ModItems.peridotBoots), "gemPeridot");
addGemToolRecipes(new ItemStack(ModItems.bronzeSword), new ItemStack(ModItems.bronzePickaxe),
new ItemStack(ModItems.bronzeAxe), new ItemStack(ModItems.bronzeHoe),
new ItemStack(ModItems.bronzeSpade), new ItemStack(ModItems.bronzeHelmet),
new ItemStack(ModItems.bronzeChestplate), new ItemStack(ModItems.bronzeLeggings),
new ItemStack(ModItems.bronzeBoots), "ingotBronze");
addGemToolRecipes(new ItemStack(ModItems.bronzeSword), new ItemStack(ModItems.bronzePickaxe),
new ItemStack(ModItems.bronzeAxe), new ItemStack(ModItems.bronzeHoe),
new ItemStack(ModItems.bronzeSpade), new ItemStack(ModItems.bronzeHelmet),
new ItemStack(ModItems.bronzeChestplate), new ItemStack(ModItems.bronzeLeggings),
new ItemStack(ModItems.bronzeBoots), "ingotBronze");
}
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModItems.ironChainsaw), " SS", "SCS", "BS ", 'S', "ingotSteel", 'B',