From 101d626c47d8948c257454015f80521fc127b16e Mon Sep 17 00:00:00 2001 From: Tinytimrob Date: Wed, 29 Aug 2012 18:39:05 +0000 Subject: [PATCH] Added configuration properties for redstoneChipset and pipeWaterproof --- common/buildcraft/BuildCraftSilicon.java | 5 ++++- common/buildcraft/BuildCraftTransport.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index d0404df0..629f71d3 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -11,6 +11,7 @@ package buildcraft; import net.minecraft.src.Block; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; +import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Property; import buildcraft.api.bptblocks.BptBlockInventory; import buildcraft.api.bptblocks.BptBlockRotateMeta; @@ -60,6 +61,8 @@ public class BuildCraftSilicon { Property laserId = BuildCraftCore.mainConfiguration.getOrCreateBlockIdProperty("laser.id", DefaultProps.LASER_ID); Property assemblyTableId = BuildCraftCore.mainConfiguration.getOrCreateBlockIdProperty("assemblyTable.id", DefaultProps.ASSEMBLY_TABLE_ID); + + Property redstoneChipsetId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("redstoneChipset.id", Configuration.CATEGORY_ITEM, DefaultProps.REDSTONE_CHIPSET); BuildCraftCore.mainConfiguration.save(); @@ -71,7 +74,7 @@ public class BuildCraftSilicon { ProxyCore.proxy.addName(assemblyTableBlock.setBlockName("assemblyTableBlock"), "Assembly Table"); ProxyCore.proxy.registerBlock(assemblyTableBlock); - redstoneChipset = new ItemRedstoneChipset(DefaultProps.REDSTONE_CHIPSET); + redstoneChipset = new ItemRedstoneChipset(Integer.parseInt(redstoneChipsetId.value)); redstoneChipset.setItemName("redstoneChipset"); } diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 995540be..9ee39d41 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -235,8 +235,10 @@ public class BuildCraftTransport { groupItemsTrigger = Integer.parseInt(groupItemsTriggerProp.value); Property genericPipeId = BuildCraftCore.mainConfiguration.getOrCreateBlockIdProperty("pipe.id", DefaultProps.GENERIC_PIPE_ID); + + Property pipeWaterproofId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("pipeWaterproof.id", Configuration.CATEGORY_ITEM, DefaultProps.PIPE_WATERPROOF_ID); - pipeWaterproof = new ItemBuildCraft(DefaultProps.PIPE_WATERPROOF_ID).setIconIndex(2 * 16 + 1); + pipeWaterproof = new ItemBuildCraft(Integer.parseInt(pipeWaterproofId.value)).setIconIndex(2 * 16 + 1); pipeWaterproof.setItemName("pipeWaterproof"); LanguageRegistry.addName(pipeWaterproof, "Pipe Waterproof"); genericPipeBlock = new BlockGenericPipe(Integer.parseInt(genericPipeId.value));