Add config value for crafting endstone

SlimeKnights · Jan 2, 2014 · 37f48e6 · 37f48e6
1 parent ffb0948
commit 37f48e6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java
@@ -1221,7 +1221,7 @@ private void addRecipesForCraftingTable ()
         GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 3), new ItemStack(manualBook, 1, 2));
         // alternative Vanilla Book Recipe
         GameRegistry.addShapelessRecipe(new ItemStack(Item.book), Item.paper, Item.paper, Item.paper, Item.silk, blankPattern, blankPattern);
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.nameTag), "P~ ", "~O ", "  ~", '~', Item.silk, 'P', Item.paper, 'O', "slimeball" ));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.nameTag), "P~ ", "~O ", "  ~", '~', Item.silk, 'P', Item.paper, 'O', "slimeball"));
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(slimeExplosive, 1, 0), "slimeball", Block.tnt));
         // Paperstack Recipe
         GameRegistry.addRecipe(new ItemStack(materials, 1, 0), "pp", "pp", 'p', Item.paper);
@@ -1731,7 +1731,8 @@ private void addRecipesForBasinCasting ()
         basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 5), new FluidStack(moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.cobblestone), true, 100);
         basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), new FluidStack(moltenEmeraldFluid, 640 * 9), null, true, 100); //emerald
         basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new FluidStack(moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Block.gravel), true, 100); //brownstone
-        basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone
+        if (PHConstruct.craftEndstone)
+            basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone
         basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender
         basinCasting.addCastingRecipe(new ItemStack(glueBlock), new FluidStack(glueFluid, TConstruct.blockLiquidValue), null, true, 100); //glue
 

diff --git a/src/tconstruct/items/armor/ExoArmor.java b/src/tconstruct/items/armor/ExoArmor.java
@@ -43,13 +43,6 @@ public String getArmorTexture (ItemStack stack, Entity entity, int slot, int lay
         return "tinker:textures/armor/" + textureName + "_" + layer + ".png";
     }
 
-    /*public Multimap getItemAttributeModifiers ()
-    {
-        Multimap multimap = super.getItemAttributeModifiers();
-        multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(speed, "Exosuit speed", (double) 0.5, 0));
-        return multimap;
-    }*/
-
     public void getSubItems (int par1, CreativeTabs par2CreativeTabs, List par3List)
     {
         ItemStack armor = new ItemStack(par1, 1, 0);

diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java
@@ -65,6 +65,7 @@ public static void initProps (File location)
         stencilTableCrafting = config.get("Difficulty Changes", "Craft Stencil Tables", true).getBoolean(true);
         miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true);
         denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false);
+        craftEndstone = config.get("Difficulty Changes", "Allow creation of endstone", true).getBoolean(true);
 
 		ingotsPerOre = config.get("Smeltery Output Modification", "Ingots per ore", 2, "Number of ingots returned from smelting ores in the smeltery").getInt(2);
 		ingotsBronzeAlloy = config.get("Smeltery Output Modification", "Bronze ingot return", 4, "Number of ingots returned from smelting Bronze in the smeltery").getInt(4);
@@ -697,6 +698,7 @@ public static void initProps (File location)
 	public static int ingotsAlumiteAlloy;
 	public static int ingotsManyullynAlloy;
     public static int ingotsPigironAlloy;
+    public static boolean craftEndstone;
 
     //Ultra Hardcore modifiers
     public static boolean enableHealthRegen;