Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moved default IDs to safer ranges

Browse source
This commit is contained in:
CovertJaguar 2012-12-05 15:07:37 -08:00
parent 7b6b21a40d
commit b4e7451ad1
3 changed files with 73 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/buildcraft/BuildCraftTransport.java
View file

@ -99,7 +99,7 @@ public class BuildCraftTransport {
public static boolean alwaysConnectPipes;
public static boolean usePipeLoss;
public static int maxItemsInPipes;
public static float pipeDuribility;
public static float pipeDurability;
public static Item pipeWaterproof;
public static Item pipeGate;
@ -219,9 +219,9 @@ public class BuildCraftTransport {
pipeLoss.comment = "Set to false to turn off energy loss over distance on all power pipes";
usePipeLoss = pipeLoss.getBoolean(DefaultProps.USE_PIPELOSS);
Property duribility = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "pipes.duribility", DefaultProps.PIPES_DURIBILITY);
duribility.comment = "How long a pipe will take to break";
pipeDuribility = (float)duribility.getDouble(DefaultProps.PIPES_DURIBILITY);
Property durability = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "pipes.durability", DefaultProps.PIPES_DURABILITY);
durability.comment = "How long a pipe will take to break";
pipeDurability = (float)durability.getDouble(DefaultProps.PIPES_DURABILITY);
Property exclusionItemList = BuildCraftCore.mainConfiguration.get( Configuration.CATEGORY_BLOCK,"woodenPipe.item.exclusion", "");

144
common/buildcraft/core/DefaultProps.java
View file

@ -32,92 +32,84 @@ public class DefaultProps {
public static final String DEFAULT_LANGUAGE = "en_US";
public static int WOODEN_GEAR_ID = 3800;
public static int STONE_GEAR_ID = 3801;
public static int IRON_GEAR_ID = 3802;
public static int GOLDEN_GEAR_ID = 3803;
public static int DIAMOND_GEAR_ID = 3804;
public static int TEMPLATE_ITEM_ID = 3805;
public static int WRENCH_ID = 3806;
public static int BUCKET_OIL_ID = 3807;
public static int FUEL_ID = 3808;
public static int PIPE_WATERPROOF_ID = 3809;
public static int BUCKET_FUEL_ID = 3810;
public static int GATE_ID = 3811;
public static int RED_PIPE_WIRE = 3813;
public static int BLUE_PIPE_WIRE = 3814;
public static int GREEN_PIPE_WIRE = 3815;
public static int YELLOW_PIPE_WIRE = 3816;
public static int REDSTONE_CHIPSET = 3817;
public static int BLUEPRINT_ITEM_ID = 3818;
public static int WOODEN_GEAR_ID = 19100;
public static int STONE_GEAR_ID = 19101;
public static int IRON_GEAR_ID = 19102;
public static int GOLDEN_GEAR_ID = 19103;
public static int DIAMOND_GEAR_ID = 19104;
public static int TEMPLATE_ITEM_ID = 19105;
public static int WRENCH_ID = 19106;
public static int BUCKET_OIL_ID = 19107;
public static int FUEL_ID = 19108;
public static int PIPE_WATERPROOF_ID = 19109;
public static int BUCKET_FUEL_ID = 19110;
public static int GATE_ID = 19111;
public static int RED_PIPE_WIRE = 19113;
public static int BLUE_PIPE_WIRE = 19114;
public static int GREEN_PIPE_WIRE = 19115;
public static int YELLOW_PIPE_WIRE = 19116;
public static int REDSTONE_CHIPSET = 19117;
public static int BLUEPRINT_ITEM_ID = 19118;
// Moving to safer id range
public static int GATE_AUTARCHIC_ID = 19000;
public static int PIPE_FACADE_ID = 19001;
public static int GATE_AUTARCHIC_ID = 19140;
public static int PIPE_FACADE_ID = 19141;
public static int PIPE_ITEMS_WOOD_ID = 4050;
public static int PIPE_ITEMS_COBBLESTONE_ID = 4051;
public static int PIPE_ITEMS_STONE_ID = 4052;
public static int PIPE_ITEMS_IRON_ID = 4053;
public static int PIPE_ITEMS_GOLD_ID = 4054;
public static int PIPE_ITEMS_DIAMOND_ID = 4055;
public static int PIPE_ITEMS_OBSIDIAN_ID = 4056;
public static int PIPE_ITEMS_WOOD_ID = 19160;
public static int PIPE_ITEMS_COBBLESTONE_ID = 19161;
public static int PIPE_ITEMS_STONE_ID = 19162;
public static int PIPE_ITEMS_IRON_ID = 19163;
public static int PIPE_ITEMS_GOLD_ID = 19164;
public static int PIPE_ITEMS_DIAMOND_ID = 19165;
public static int PIPE_ITEMS_OBSIDIAN_ID = 19166;
public static int PIPE_LIQUIDS_WOOD_ID = 4057;
public static int PIPE_LIQUIDS_COBBLESTONE_ID = 4058;
public static int PIPE_LIQUIDS_STONE_ID = 4059;
public static int PIPE_LIQUIDS_IRON_ID = 4060;
public static int PIPE_LIQUIDS_GOLD_ID = 4061;
public static int PIPE_LIQUIDS_DIAMOND_ID = 4062;
public static int PIPE_LIQUIDS_OBSIDIAN_ID = 4063;
public static int PIPE_LIQUIDS_WOOD_ID = 19180;
public static int PIPE_LIQUIDS_COBBLESTONE_ID = 19181;
public static int PIPE_LIQUIDS_STONE_ID = 19182;
public static int PIPE_LIQUIDS_IRON_ID = 19183;
public static int PIPE_LIQUIDS_GOLD_ID = 19184;
public static int PIPE_LIQUIDS_DIAMOND_ID = 19185;
public static int PIPE_LIQUIDS_OBSIDIAN_ID = 19186;
public static int PIPE_POWER_WOOD_ID = 4064;
public static int PIPE_POWER_COBBLESTONE_ID = 4065;
public static int PIPE_POWER_STONE_ID = 4066;
public static int PIPE_POWER_IRON_ID = 4067;
public static int PIPE_POWER_GOLD_ID = 4068;
public static int PIPE_POWER_DIAMOND_ID = 4069;
public static int PIPE_POWER_OBSIDIAN_ID = 4070;
public static int PIPE_POWER_WOOD_ID = 19200;
public static int PIPE_POWER_COBBLESTONE_ID = 19201;
public static int PIPE_POWER_STONE_ID = 19202;
public static int PIPE_POWER_IRON_ID = 19203;
public static int PIPE_POWER_GOLD_ID = 19204;
public static int PIPE_POWER_DIAMOND_ID = 19205;
public static int PIPE_POWER_OBSIDIAN_ID = 19206;
public static int PIPE_ITEMS_STRIPES_ID = 4071;
public static int PIPE_STRUCTURE_COBBLESTONE_ID = 4072;
public static int PIPE_ITEMS_VOID_ID = 19150;
public static int PIPE_LIQUIDS_VOID_ID = 19151;
public static int PIPE_ITEMS_SANDSTONE_ID = 19152;
public static int PIPE_LIQUIDS_SANDSTONE_ID = 19153;
public static int PIPE_ITEMS_VOID_ID = 19220;
public static int PIPE_LIQUIDS_VOID_ID = 19221;
public static int PIPE_ITEMS_SANDSTONE_ID = 19222;
public static int PIPE_LIQUIDS_SANDSTONE_ID = 19223;
public static int PIPE_STRUCTURE_COBBLESTONE_ID = 19224;
public static int WOODEN_PIPE_ID = 145; // LEGACY
public static int STONE_PIPE_ID = 146; // LEGACY
public static int IRON_PIPE_ID = 147; // LEGACY
public static int GOLDEN_PIPE_ID = 148; // LEGACY
public static int DIAMOND_PIPE_ID = 149; // LEGACY
public static int MINING_WELL_ID = 150;
public static int DRILL_ID = 151;
public static int AUTO_WORKBENCH_ID = 152;
public static int QUARRY_ID = 153;
public static int MARKER_ID = 154;
public static int FILLER_ID = 155;
public static int OBSIDIAN_PIPE_ID = 156; // LEGACY
public static int BUILDER_ID = 157;
public static int ARCHITECT_ID = 158;
public static int COBBLESTONE_PIPE_ID = 159; // LEGACY
public static int FRAME_ID = 160;
public static int ENGINE_ID = 161;
public static int OIL_MOVING_ID = 162;
public static int OIL_STILL_ID = 163;
public static int PUMP_ID = 164;
public static int TANK_ID = 165;
public static int GENERIC_PIPE_ID = 166;
public static int REFINERY_ID = 167;
public static int BLUEPRINT_LIBRARY_ID = 168;
public static int LASER_ID = 169;
public static int ASSEMBLY_TABLE_ID = 170;
public static int PATH_MARKER_ID = 171;
public static int HOPPER_ID = 172;
public static int MINING_WELL_ID = 1500;
public static int DRILL_ID = 1501;
public static int AUTO_WORKBENCH_ID = 1502;
public static int QUARRY_ID = 1503;
public static int MARKER_ID = 1504;
public static int FILLER_ID = 1505;
public static int BUILDER_ID = 1507;
public static int ARCHITECT_ID = 1508;
public static int FRAME_ID = 1509;
public static int ENGINE_ID = 1510;
public static int PUMP_ID = 1511;
public static int TANK_ID = 1512;
public static int GENERIC_PIPE_ID = 1513;
public static int REFINERY_ID = 1514;
public static int BLUEPRINT_LIBRARY_ID = 1515;
public static int LASER_ID = 1516;
public static int ASSEMBLY_TABLE_ID = 1517;
public static int PATH_MARKER_ID = 1518;
public static int HOPPER_ID = 1519;
public static int OIL_MOVING_ID = 150;
public static int OIL_STILL_ID = 151;
public static boolean CURRENT_CONTINUOUS = false;
public static boolean PIPES_ALWAYS_CONNECT = false;
public static double PIPES_DURIBILITY = 0.25D;
public static double PIPES_DURABILITY = 0.25D;
public static boolean FILLER_DESTROY = false;
public static boolean USE_PIPELOSS = true;

2
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -52,7 +52,7 @@ public class BlockGenericPipe extends BlockContainer {
@Override
public float getBlockHardness(World par1World, int par2, int par3, int par4) {
return BuildCraftTransport.pipeDuribility;
return BuildCraftTransport.pipeDurability;
}
@Override