diff --git a/.gitignore b/.gitignore index f2b6e0f58..3fe8e29ba 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ eclipse options.txt /out /classes +*.bat # IntelliJ .idea @@ -23,4 +24,4 @@ options.txt # Blender backup files *.blend1 -*.blend2 +*.blend2 \ No newline at end of file diff --git a/src/main/java/mods/eln/Eln.java b/src/main/java/mods/eln/Eln.java index 61ee66945..f9e6ed266 100644 --- a/src/main/java/mods/eln/Eln.java +++ b/src/main/java/mods/eln/Eln.java @@ -24,7 +24,6 @@ import mods.eln.ghost.GhostManager; import mods.eln.ghost.GhostManagerNbt; import mods.eln.gridnode.electricalpole.ElectricalPoleDescriptor; -import mods.eln.i18n.I18N; import mods.eln.item.*; import mods.eln.item.electricalinterface.ItemEnergyInventoryProcess; import mods.eln.item.electricalitem.*; @@ -227,6 +226,7 @@ public class Eln { public static ItemArmor helmetCopper, plateCopper, legsCopper, bootsCopper; public static ItemArmor helmetECoal, plateECoal, legsECoal, bootsECoal; + public static ItemArmor helmetEDiamond, plateEDiamond, legsEDiamond, bootsEDiamond; public static SharedItem sharedItem; public static SharedItem sharedItemStackOne; @@ -253,13 +253,26 @@ public class Eln { public int electricalInterSystemOverSampling; public CopperCableDescriptor copperCableDescriptor; + public GraphiteDescriptor GraphiteDescriptor; public ElectricalCableDescriptor veryHighVoltageCableDescriptor; + public ElectricalCableDescriptor veryHighVoltageLQCableDescriptor; + public ElectricalCableDescriptor veryHighVoltageHQCableDescriptor; + public ElectricalCableDescriptor veryHighVoltagePQCableDescriptor; public ElectricalCableDescriptor highVoltageCableDescriptor; + public ElectricalCableDescriptor highVoltageLQCableDescriptor; + public ElectricalCableDescriptor highVoltageHQCableDescriptor; + public ElectricalCableDescriptor highVoltagePQCableDescriptor; public ElectricalCableDescriptor signalCableDescriptor; public ElectricalCableDescriptor lowVoltageCableDescriptor; + public ElectricalCableDescriptor lowVoltageLQCableDescriptor; + public ElectricalCableDescriptor lowVoltageHQCableDescriptor; + public ElectricalCableDescriptor lowVoltagePQCableDescriptor; public ElectricalCableDescriptor batteryCableDescriptor; - public ElectricalCableDescriptor meduimVoltageCableDescriptor; + public ElectricalCableDescriptor mediumVoltageCableDescriptor; + public ElectricalCableDescriptor mediumVoltageLQCableDescriptor; + public ElectricalCableDescriptor mediumVoltageHQCableDescriptor; + public ElectricalCableDescriptor mediumVoltagePQCableDescriptor; public OreRegenerate oreRegenerate; @@ -540,8 +553,8 @@ public void preInit(FMLPreInitializationEvent event) { oreItem = (OreItem) Item.getItemFromBlock(oreBlock); /* * - * int id = 0,subId = 0,completId; String name; - */ + * int id = 0,subId = 0,completId; String name; + */ SixNode.sixNodeCacheList.add(new SixNodeCacheStd()); @@ -630,6 +643,7 @@ public void preInit(FMLPreInitializationEvent event) { registerMiningPipe(17); registerTreeResinAndRubber(64); registerRawCable(65); + registerCableQualityItems(70); registerBrush(119); registerMiscItem(120); registerElectricalTool(121); @@ -893,11 +907,11 @@ private void registerComputer() { TestBlock testBlock; private void registerTestBlock() { - /* - * testBlock = new TestBlock(); testBlock.setCreativeTab(creativeTab).setBlockName("TestBlock"); GameRegistry.registerBlock(testBlock, "Eln.TestBlock"); TileEntity.addMapping(TestEntity.class, "Eln.TestEntity"); //LanguageRegistry.addName(testBlock,"Test Block"); NodeManager.instance.registerUuid(TestNode.getInfoStatic().getUuid(), TestNode.class); - * - * GameRegistry.registerCustomItemStack("Test Block", new ItemStack(testBlock)); - */ + /* + * testBlock = new TestBlock(); testBlock.setCreativeTab(creativeTab).setBlockName("TestBlock"); GameRegistry.registerBlock(testBlock, "Eln.TestBlock"); TileEntity.addMapping(TestEntity.class, "Eln.TestEntity"); //LanguageRegistry.addName(testBlock,"Test Block"); NodeManager.instance.registerUuid(TestNode.getInfoStatic().getUuid(), TestNode.class); + * + * GameRegistry.registerCustomItemStack("Test Block", new ItemStack(testBlock)); + */ } private void checkRecipe() { @@ -955,15 +969,15 @@ public void postInit(FMLPostInitializationEvent event) { } - /* - * @EventHandler public void clientStart(Client event) { - * - * - * } - */ + /* + * @EventHandler public void clientStart(Client event) { + * + * + * } + */ @EventHandler - /* Remember to use the right event! */ + /* Remember to use the right event! */ public void onServerStopped(FMLServerStoppedEvent ev) { TutorialSignElement.resetBalise(); @@ -1028,7 +1042,7 @@ public void onServerStart(FMLServerAboutToStartEvent ev) { } @EventHandler - /* Remember to use the right event! */ + /* Remember to use the right event! */ public void onServerStarting(FMLServerStartingEvent ev) { { @@ -1092,12 +1106,15 @@ public void onServerStarting(FMLServerStartingEvent ev) { public double LVP() { return 1000 * cablePowerFactor; } + public double MVP() { return 2000 * cablePowerFactor; } + public double HVP() { return 5000 * cablePowerFactor; } + public double VVP() { return 15000 * cablePowerFactor; } @@ -1148,134 +1165,159 @@ private void registerElectricalCable(int id) { } - { - subId = 4; - - name = TR_NAME(Type.NONE, "Low Voltage Cable"); - - stdCableRender50V = new CableRenderDescriptor("eln", - "sprites/cable.png", 1.95f, 0.95f); - - desc = new ElectricalCableDescriptor(name, stdCableRender50V, - "For low voltage with high current.", false); - - lowVoltageCableDescriptor = desc; - - desc.setPhysicalConstantLikeNormalCable(LVU, LVP(), 0.2 / 20,// electricalNominalVoltage, - // electricalNominalPower, - // electricalNominalPowerDrop, - LVU * 1.3, LVP() * 1.2,// electricalMaximalVoltage, - // electricalMaximalPower, - 20,// electricalOverVoltageStartPowerLost, - cableWarmLimit, -100,// thermalWarmLimit, thermalCoolLimit, - cableHeatingTime, cableThermalConductionTao// thermalNominalHeatTime, - // thermalConductivityTao - ); - - sixNodeItem.addDescriptor(subId + (id << 6), desc); - - desc = new ElectricalCableDescriptor(name, stdCableRender50V, - "For low voltage with high current.", false); - - desc.setPhysicalConstantLikeNormalCable( - LVU, LVP() / 4, 0.2 / 20,// electricalNominalVoltage, - // electricalNominalPower, - // electricalNominalPowerDrop, - LVU * 1.3, LVP() * 1.2,// electricalMaximalVoltage, - // electricalMaximalPower, - 20,// electricalOverVoltageStartPowerLost, - cableWarmLimit, -100,// thermalWarmLimit, thermalCoolLimit, - cableHeatingTime, cableThermalConductionTao// thermalNominalHeatTime, - // thermalConductivityTao - ); - batteryCableDescriptor = desc; - - } - - { - subId = 8; - - name = TR_NAME(Type.NONE, "Medium Voltage Cable"); - - stdCableRender200V = new CableRenderDescriptor("eln", - "sprites/cable.png", 2.95f, 0.95f); - - desc = new ElectricalCableDescriptor(name, stdCableRender200V, - "miaou", false); - - meduimVoltageCableDescriptor = desc; - - desc.setPhysicalConstantLikeNormalCable(MVU, MVP(), 0.10 / 20,// electricalNominalVoltage, - // electricalNominalPower, - // electricalNominalPowerDrop, - MVU * 1.3, MVP() * 1.2,// electricalMaximalVoltage, - // electricalMaximalPower, - 30,// electricalOverVoltageStartPowerLost, - cableWarmLimit, -100,// thermalWarmLimit, thermalCoolLimit, - cableHeatingTime, cableThermalConductionTao// thermalNominalHeatTime, - // thermalConductivityTao - ); - - sixNodeItem.addDescriptor(subId + (id << 6), desc); - - } - { - subId = 12; - - // highVoltageCableId = subId; - name = TR_NAME(Type.NONE, "High Voltage Cable"); - - stdCableRender800V = new CableRenderDescriptor("eln", - "sprites/cable.png", 3.95f, 1.95f); - - desc = new ElectricalCableDescriptor(name, stdCableRender800V, - "miaou2", false); - - highVoltageCableDescriptor = desc; - - desc.setPhysicalConstantLikeNormalCable(HVU, HVP(), 0.025 * 5 / 4 / 20,// electricalNominalVoltage, - // electricalNominalPower, - // electricalNominalPowerDrop, - HVU * 1.3, HVP() * 1.2,// electricalMaximalVoltage, - // electricalMaximalPower, - 40,// electricalOverVoltageStartPowerLost, - cableWarmLimit, -100,// thermalWarmLimit, thermalCoolLimit, - cableHeatingTime, cableThermalConductionTao// thermalNominalHeatTime, - // thermalConductivityTao - ); - - sixNodeItem.addDescriptor(subId + (id << 6), desc); - - } - - - { - subId = 16; - - // highVoltageCableId = subId; - name = TR_NAME(Type.NONE, "Very High Voltage Cable"); - - stdCableRender3200V = new CableRenderDescriptor("eln", - "sprites/cableVHV.png", 3.95f, 1.95f); - - desc = new ElectricalCableDescriptor(name, stdCableRender3200V, - "miaou2", false); - - veryHighVoltageCableDescriptor = desc; - - desc.setPhysicalConstantLikeNormalCable(VVU, VVP(), 0.025 * 5 / 4 / 20 / 8,// electricalNominalVoltage, - // electricalNominalPower, - // electricalNominalPowerDrop, - VVU * 1.3, VVP() * 1.2,// electricalMaximalVoltage, - // electricalMaximalPower, - 40,// electricalOverVoltageStartPowerLost, - cableWarmLimit, -100,// thermalWarmLimit, thermalCoolLimit, - cableHeatingTime, cableThermalConductionTao// thermalNominalHeatTime, - // thermalConductivityTao - ); - - sixNodeItem.addDescriptor(subId + (id << 6), desc); + double power = 0; + double nominalcablevoltage = 0; + double nominalcablepower = 0; + + stdCableRender50V = new CableRenderDescriptor("eln", "sprites/cable.png", 1.95f, 0.95f); + stdCableRender200V = new CableRenderDescriptor("eln", "sprites/cable.png", 2.95f, 0.95f); + stdCableRender800V = new CableRenderDescriptor("eln", "sprites/cable.png", 3.95f, 1.95f); + stdCableRender3200V = new CableRenderDescriptor("eln", "sprites/cableVHV.png", 3.95f, 1.95f); + + List voltages = new ArrayList<>(Arrays.asList( //The order in which to register cable voltages + "Low ", //50V + "Medium ", //200V + "High ", //800V + "Very High "));//3200V + List qualities = new ArrayList<>(Arrays.asList( //The order in which to register cables quality + "Standard ", //Normal Cable + "Shoddy ", //Bad Cable + "Quality ", //Great Cable + "Perfect "));//Best Cable + List valuelist = new ArrayList<>(Arrays.asList( //Power Factor of each cable quality, in Double + 1d, //Normal + 0.5d, //Half + 2d, //Double + 10d)); //Dectuple + List textures = new ArrayList<>(Arrays.asList( //List of textures for each cable + "sprites/cable.png", //Most cables use the same texture + "sprites/cableshoddy.png", + "sprites/cablequality.png", + "sprites/cableperfect.png", + "sprites/cableVHV.png", //VHV cables have their own textures + "sprites/cableVHVshoddy.png", + "sprites/cableVHVquality.png", + "sprites/cableVHVperfect.png")); + List sizes = new ArrayList<>(Arrays.asList( //Contains the cable size values. + 1.95f, //First size value for 50V cable + 0.95f, //Second size value for 50V cable + 2.95f, //First size value for the 200V cable + 0.95f, //Second size value for 200V cable + 3.95f, //First size value for 800V/3200V cables + 1.95f));//Second size value for 800V/3200V cables + + int renderspriteindex = 0; //This value tells the register where to point in the texture list + int renderfloatindex = 0; //This value tells the register which size the cable ought to be + subId = 3; + for (int cablevoltage = 0; cablevoltage <= 3; cablevoltage++) { //It goes through each voltage, from low to very high + for (int cablequality = 0; cablequality <= 3; cablequality++) { //Within those voltages, it registers the quality of each voltage + subId++; + name = TR_NAME(Type.NONE, qualities.get(cablequality) + voltages.get(cablevoltage) + "Voltage Cable"); //Constructs the cable's name from the names in the first two tables. (quality and voltage) + + renderspriteindex = cablequality; + + switch (cablevoltage) { //Tells the register which voltage rating to give the active cable + case 0: + power = LVP(); + nominalcablevoltage = LVU; + renderfloatindex = 0; + break; + case 1: + power = MVP(); + nominalcablevoltage = MVU; + renderfloatindex = 2; + break; + case 2: + power = HVP(); + nominalcablevoltage = HVU; + renderfloatindex = 4; + break; + case 3: + power = VVP(); + nominalcablevoltage = VVU; + renderfloatindex = 4; + renderspriteindex = renderspriteindex + 4; //VHV cables have their own pool of textures + break; + } + CableRenderDescriptor activerendermodel = new CableRenderDescriptor("eln", textures.get(renderspriteindex), sizes.get(renderfloatindex), sizes.get(renderfloatindex + 1)); //construct the model using data stored in each list + desc = new ElectricalCableDescriptor(name, activerendermodel, "A Conduit of Electrical Power", false); //Create the descriptor. + nominalcablepower = power * valuelist.get(cablequality); + switch (cablequality) { //Finds out which descriptor to bind the active cable to + case 0: + switch (cablevoltage) { //register Standard Cables + case 0: + lowVoltageCableDescriptor = desc; + break; + case 1: + mediumVoltageCableDescriptor = desc; + break; + case 2: + highVoltageCableDescriptor = desc; + break; + case 3: + veryHighVoltageCableDescriptor = desc; + break; + } + case 1: + switch (cablevoltage) { //register Low Quality Cables + case 0: + lowVoltageLQCableDescriptor = desc; + break; + case 1: + mediumVoltageLQCableDescriptor = desc; + break; + case 2: + highVoltageLQCableDescriptor = desc; + break; + case 3: + veryHighVoltageLQCableDescriptor = desc; + break; + } + case 2: + switch (cablevoltage) { //register High Quality Cables + case 0: + lowVoltageHQCableDescriptor = desc; + break; + case 1: + mediumVoltageHQCableDescriptor = desc; + break; + case 2: + highVoltageHQCableDescriptor = desc; + break; + case 3: + veryHighVoltageHQCableDescriptor = desc; + break; + } + case 3: + switch (cablevoltage) { //register Perfect Quality Cables + case 0: + lowVoltagePQCableDescriptor = desc; + break; + case 1: + mediumVoltagePQCableDescriptor = desc; + break; + case 2: + highVoltagePQCableDescriptor = desc; + break; + case 3: + veryHighVoltagePQCableDescriptor = desc; + break; + } + } + desc.setPhysicalConstantLikeNormalCable( //now we register it into the... register. + nominalcablevoltage, + nominalcablepower, + 0.10 / 20, + nominalcablevoltage * 1.3, + nominalcablepower * 1.2, 30, + cableWarmLimit, + -100, + cableHeatingTime, + cableThermalConductionTao + ); + sixNodeItem.addDescriptor(subId + (id << 6), desc); //and just like that, it's all over. + } } } @@ -1325,10 +1367,13 @@ private void registerBattery(int id) { int subId, completId; String name; double heatTIme = 30; + double[] voltageFunctionTableCapacitor = {0, 0, 0, 0, 0, 0, + 0}; double[] voltageFunctionTable = {0.000, 0.9, 1.0, 1.025, 1.04, 1.05, 2.0}; FunctionTable voltageFunction = new FunctionTable(voltageFunctionTable, 6.0 / 5); + FunctionTable voltageFunctionCapacitor = new FunctionTable(voltageFunctionTableCapacitor, 6.0 / 5); double[] condoVoltageFunctionTable = {0.000, 0.89, 0.90, 0.905, 0.91, 1.1, 1.5}; FunctionTable condoVoltageFunction = new FunctionTable(condoVoltageFunctionTable, @@ -1339,7 +1384,7 @@ private void registerBattery(int id) { double stdDischargeTime = 4 * 60; double stdU = LVU; double stdP = LVP() / 4; - double stdEfficiency = 1.0 - 2.0 / 50.0; + double stdEfficiency = 0.76; double condoEfficiency = 1.0 - 2.0 / 50.0; batteryVoltageFunctionTable = voltageFunction; @@ -1347,17 +1392,23 @@ private void registerBattery(int id) { subId = 0; name = TR_NAME(Type.NONE, "Cost Oriented Battery"); - BatteryDescriptor desc = new BatteryDescriptor(name, - "BatteryBig", batteryCableDescriptor, 0.5, true, true, voltageFunction, stdU, - stdP * 1.2, 0.000, // electricalU, - // electricalPMax,electricalDischargeRate - stdP, stdDischargeTime * batteryCapacityFactor, stdEfficiency, stdBatteryHalfLife, // electricalStdP, - // electricalStdDischargeTime, - // electricalStdEfficiency, - // electricalStdHalfLife, - heatTIme, 60, -100, // thermalHeatTime, thermalWarmLimit, - // thermalCoolLimit, - "Cheap battery" // name, description) + BatteryDescriptor desc = new BatteryDescriptor( + name, //name + "BatteryBig", //model name + batteryCableDescriptor, //Cable Descriptor + 0.5, //Start Charge + true, //IsRechargable + true, //IsLifeEnabled + voltageFunction, //Voltage Curve + stdU, //Voltage Rating + stdP * 1.2, //Max Power Limit + 0.000, //Self-Discharge Rate + stdP, //Nominal Power Limit + stdDischargeTime * batteryCapacityFactor, //Battery Capacity (in time) + stdEfficiency, //Battery Efficiency (in %) + stdBatteryHalfLife, //Battery Decay Rate + heatTIme, 60, -100, //Heat Code + "A framework battery which can be modified to fit your needs, or used as-is." ); desc.setRenderSpec("lowcost"); desc.setCurrentDrop(desc.electricalU * 1.2, desc.electricalStdP * 1.0); @@ -1367,17 +1418,24 @@ private void registerBattery(int id) { subId = 1; name = TR_NAME(Type.NONE, "Capacity Oriented Battery"); - BatteryDescriptor desc = new BatteryDescriptor(name, - "BatteryBig", batteryCableDescriptor, 0.5, true, true, voltageFunction, - stdU / 4, stdP / 2 * 1.2, 0.000, // electricalU, - // electricalPMax,electricalDischargeRate - stdP / 2, stdDischargeTime * 8 * batteryCapacityFactor, stdEfficiency, stdBatteryHalfLife, // electricalStdP, - // electricalStdDischargeTime, - // electricalStdEfficiency, - // electricalStdHalfLife, - heatTIme, 60, -100, // thermalHeatTime, thermalWarmLimit, - // thermalCoolLimit, - "the battery" // name, description) + BatteryDescriptor desc = new BatteryDescriptor( + name, + "BatteryBig", + batteryCableDescriptor, + 0.5, + true, + true, + voltageFunction, + stdU / 4, stdP / 2 * 1.2, + 0.000, + stdP / 8, + stdDischargeTime * 8 * batteryCapacityFactor, + stdEfficiency, + stdBatteryHalfLife, + heatTIme, + 60, + -100, + "By using a Lower Voltage and supporting Less Power, you can squeeze out every last bit of Capacity." ); desc.setRenderSpec("capacity"); desc.setCurrentDrop(desc.electricalU * 1.2, desc.electricalStdP * 1.0); @@ -1387,17 +1445,23 @@ private void registerBattery(int id) { subId = 2; name = TR_NAME(Type.NONE, "Voltage Oriented Battery"); - BatteryDescriptor desc = new BatteryDescriptor(name, - "BatteryBig", meduimVoltageCableDescriptor, 0.5, true, true, voltageFunction, stdU * 4, - stdP * 1.2, 0.000, // electricalU, - // electricalPMax,electricalDischargeRate - stdP, stdDischargeTime * batteryCapacityFactor, stdEfficiency, stdBatteryHalfLife, // electricalStdP, - // electricalStdDischargeTime, - // electricalStdEfficiency, - // electricalStdHalfLife, - heatTIme, 60, -100, // thermalHeatTime, thermalWarmLimit, - // thermalCoolLimit, - "the battery" // name, description) + BatteryDescriptor desc = new BatteryDescriptor( + name, + "BatteryBig", + mediumVoltageCableDescriptor, + 0.5, + true, + true, + voltageFunction, + stdU * 4, stdP * 2 * 1.2, 0.000, + stdP * 2, + stdDischargeTime * batteryCapacityFactor, + stdEfficiency * 1.13, //85.88% + stdBatteryHalfLife, + heatTIme, + 60, + -100, + "A different layout increase the voltage, power, and efficiency of this battery." ); desc.setRenderSpec("highvoltage"); desc.setCurrentDrop(desc.electricalU * 1.2, desc.electricalStdP * 1.0); @@ -1408,17 +1472,25 @@ private void registerBattery(int id) { subId = 3; name = TR_NAME(Type.NONE, "Current Oriented Battery"); - BatteryDescriptor desc = new BatteryDescriptor(name, - "BatteryBig", batteryCableDescriptor, 0.5, true, true, voltageFunction, stdU, - stdP * 1.2 * 4, 0.000, // electricalU, - // electricalPMax,electricalDischargeRate - stdP * 4, stdDischargeTime / 6 * batteryCapacityFactor, stdEfficiency, stdBatteryHalfLife, // electricalStdP, - // electricalStdDischargeTime, - // electricalStdEfficiency, - // electricalStdHalfLife, - heatTIme, 60, -100, // thermalHeatTime, thermalWarmLimit, - // thermalCoolLimit, - "the battery" // name, description) + BatteryDescriptor desc = new BatteryDescriptor( + name, + "BatteryBig", + batteryCableDescriptor, + 0.5, + true, + true, + voltageFunction, + stdU, + stdP * 1.2 * 4, + 0.000, + stdP * 4, + stdDischargeTime / 6 * batteryCapacityFactor, + stdEfficiency, + stdBatteryHalfLife, + heatTIme, + 60, + -100, + "You've tapped into the raw speed of Lead Acid at the cost of Capacity." // name, description) ); desc.setRenderSpec("current"); desc.setCurrentDrop(desc.electricalU * 1.2, desc.electricalStdP * 1.0); @@ -1428,17 +1500,22 @@ private void registerBattery(int id) { subId = 4; name = TR_NAME(Type.NONE, "Life Oriented Battery"); - BatteryDescriptor desc = new BatteryDescriptor(name, - "BatteryBig", batteryCableDescriptor, 0.5, true, true, voltageFunction, stdU, - stdP * 1.2, 0.000, // electricalU, - // electricalPMax,electricalDischargeRate - stdP, stdDischargeTime * batteryCapacityFactor, stdEfficiency, stdBatteryHalfLife * 8, // electricalStdP, - // electricalStdDischargeTime, - // electricalStdEfficiency, - // electricalStdHalfLife, - heatTIme, 60, -100, // thermalHeatTime, thermalWarmLimit, - // thermalCoolLimit, - "the battery" // name, description) + BatteryDescriptor desc = new BatteryDescriptor( + name, + "BatteryBig", + batteryCableDescriptor, + 0.5, + true, + true, + voltageFunction, + stdU, + stdP * 1.2, + 0.000, + stdP, stdDischargeTime * batteryCapacityFactor, + stdEfficiency * 1.25, //95% + stdBatteryHalfLife * 8, + heatTIme, 60, -100, + "It's design is far more efficient, which allows it to last much longer." ); desc.setRenderSpec("life"); desc.setCurrentDrop(desc.electricalU * 1.2, desc.electricalStdP * 1.0); @@ -1449,63 +1526,67 @@ private void registerBattery(int id) { subId = 5; name = TR_NAME(Type.NONE, "Single-use Battery"); - BatteryDescriptor desc = new BatteryDescriptor(name, - "BatteryBig", batteryCableDescriptor, 1.0, false, false, voltageFunction, stdU, - stdP * 1.2 * 2, 0.000, // electricalU, - // electricalPMax,electricalDischargeRate - stdP * 2, stdDischargeTime * batteryCapacityFactor, stdEfficiency, stdBatteryHalfLife * 8, // electricalStdP, - // electricalStdDischargeTime, - // electricalStdEfficiency, - // electricalStdHalfLife, - heatTIme, 60, -100, // thermalHeatTime, thermalWarmLimit, - // thermalCoolLimit, - "the battery" // name, description) + BatteryDescriptor desc = new BatteryDescriptor( + name, + "BatteryBig", + batteryCableDescriptor, + 1.0, + false, + true, + voltageFunction, + stdU, + stdP * 1.2 * 2, + 0.000, + stdP * 2, + stdDischargeTime / 4 * batteryCapacityFactor, + stdEfficiency * 0.76, //57.76% + stdBatteryHalfLife / 100, + heatTIme, 60, -100, + "A single use battery. It's crude and inefficient. Do NOT attempt to recharge it." ); desc.setRenderSpec("coal"); transparentNodeItem.addDescriptor(subId + (id << 6), desc); } { - subId = 32; - name = TR_NAME(Type.NONE, "50V Condensator"); + subId = 6; + name = TR_NAME(Type.NONE, "Experimental Battery"); BatteryDescriptor desc = new BatteryDescriptor(name, - "condo200", batteryCableDescriptor, 0.0, true, false, - condoVoltageFunction, - stdU, stdP * 1.2 * 8, 0.005, // electricalU,// - // electricalPMax,electricalDischargeRate - stdP * 8, 4, condoEfficiency, stdBatteryHalfLife, // electricalStdP, - // electricalStdDischargeTime, - // electricalStdEfficiency, - // electricalStdHalfLife, - heatTIme, 60, -100, // thermalHeatTime, thermalWarmLimit, - // thermalCoolLimit, - "Obselete, must be deleted" // name, description) + "BatteryBig", batteryCableDescriptor, 0.5, true, false,voltageFunctionCapacitor, stdU * 2, + stdP * 1.2 * 8, + 0.025, + stdP * 8, stdDischargeTime / 4 * batteryCapacityFactor, + stdEfficiency, + stdBatteryHalfLife * 8, + heatTIme, + 60, + -100, + "A prototype battery which combines the benefits of the other batteries. Too bad leaks power, though." ); - desc.setCurrentDrop(desc.electricalU * 1.2, desc.electricalStdP * 2.0); - desc.setDefaultIcon("empty-texture"); - transparentNodeItem.addWithoutRegistry(subId + (id << 6), desc); + desc.setRenderSpec("highvoltage"); + desc.setCurrentDrop(desc.electricalU * 1.2, desc.electricalStdP * 1.0); + transparentNodeItem.addDescriptor(subId + (id << 6), desc); } - { - subId = 36; - name = TR_NAME(I18N.Type.NONE, "200V Condensator"); + subId = 7; + name = TR_NAME(Type.NONE, "Crypto Capacitor"); BatteryDescriptor desc = new BatteryDescriptor(name, - "condo200", highVoltageCableDescriptor, 0.0, true, false, - condoVoltageFunction, - MVU, MVP() * 1.5, 0.005, // electricalU,// - // electricalPMax,electricalDischargeRate - MVP(), 4, condoEfficiency, stdBatteryHalfLife, // electricalStdP, - // electricalStdDischargeTime, - // electricalStdEfficiency, - // electricalStdHalfLife, - heatTIme, 60, -100, // thermalHeatTime, thermalWarmLimit, - // thermalCoolLimit, - "the battery" // name, description) + "BatteryBig", batteryCableDescriptor, 0, true, false, voltageFunction, stdU*1.2380952380952380952380952380952, //this is a dirty hack because somebody hardcoded battery max value + 2110 * 1000000, //totalpower + 0, //no self-discharge + 2110, //power (as seen on the GUI) + 10, //time (in seconds) to fill battery + .99999, //efficiency + stdBatteryHalfLife * 9001, + heatTIme, + 60, + -100, + "Literally just a capacitor in a battery case. Has infinite life and 100% efficiency, but bad storage" ); - desc.setCurrentDrop(desc.electricalU * 1.2, desc.electricalStdP * 2.0); - desc.setDefaultIcon("empty-texture"); - transparentNodeItem.addWithoutRegistry(subId + (id << 6), desc); + desc.setRenderSpec("lowcost"); + desc.setCurrentDrop(desc.electricalU * 1.2, desc.electricalStdP * 1.0); + transparentNodeItem.addDescriptor(subId + (id << 6), desc); } } @@ -1700,7 +1781,7 @@ private void registerLampSocket(int id) { sixNodeItem.addDescriptor(16 + (id << 6), new EmergencyLampDescriptor(TR_NAME(Type.NONE, "200V Emergency Lamp"), - meduimVoltageCableDescriptor, 10 * 60 * 20, 25, 10, 8, obj.getObj("EmergencyExitLighting"))); + mediumVoltageCableDescriptor, 10 * 60 * 20, 25, 10, 8, obj.getObj("EmergencyExitLighting"))); } private void registerLampSupply(int id) { @@ -1991,7 +2072,7 @@ private void registerSwitch(int id) { name = TR_NAME(Type.NONE, "Medium Voltage Switch"); desc = new ElectricalSwitchDescriptor(name, stdCableRender200V, - obj.getObj("LowVoltageSwitch"), MVU, MVP(), meduimVoltageCableDescriptor.electricalRs * 2,// nominalVoltage, + obj.getObj("LowVoltageSwitch"), MVU, MVP(), mediumVoltageCableDescriptor.electricalRs * 2,// nominalVoltage, // nominalPower, // nominalDropFactor, MVU * 1.5, MVP() * 1.2,// maximalVoltage, maximalPower @@ -2142,7 +2223,7 @@ private void registerElectricalManager(int id) { name = TR_NAME(Type.NONE, "Lead Fuse for medium voltage cables"); - ElectricalFuseDescriptor desc = new ElectricalFuseDescriptor(name, meduimVoltageCableDescriptor, obj.getObj("ElectricalFuse")); + ElectricalFuseDescriptor desc = new ElectricalFuseDescriptor(name, mediumVoltageCableDescriptor, obj.getObj("ElectricalFuse")); sharedItem.addElement(subId + (id << 6), desc); } { @@ -2498,7 +2579,7 @@ private void registerElectricalRelay(int id) { desc = new ElectricalRelayDescriptor( name, obj.getObj("RelayBig"), - meduimVoltageCableDescriptor); + mediumVoltageCableDescriptor); sixNodeItem.addDescriptor(subId + (id << 6), desc); } @@ -2692,12 +2773,12 @@ private void registerHeatFurnace(int id) { name = TR_NAME(Type.NONE, "Stone Heat Furnace"); HeatFurnaceDescriptor desc = new HeatFurnaceDescriptor(name, - "stonefurnace", 1000, + "stonefurnace", 4000, Utils.getCoalEnergyReference() * 2 / 3,// double // nominalPower, // double // nominalCombustibleEnergy, - 2, 500,// int combustionChamberMax,double + 8, 500,// int combustionChamberMax,double // combustionChamberPower, new ThermalLoadInitializerByPowerDrop(780, -100, 10, 2) // thermal ); @@ -2729,7 +2810,7 @@ private void registerTurbine(int id) { name = TR_NAME(Type.NONE, "50V Turbine"); double RsFactor = 0.1; double nominalU = LVU; - double nominalP = 300 * heatTurbinePowerFactor; + double nominalP = 1000 * heatTurbinePowerFactor; double nominalDeltaT = 250; TurbineDescriptor desc = new TurbineDescriptor(name, "turbineb", lowVoltageCableDescriptor.render, TtoU.duplicate(nominalDeltaT, nominalU), PoutToPin.duplicate(nominalP, nominalP), nominalDeltaT, @@ -2743,11 +2824,11 @@ private void registerTurbine(int id) { name = TR_NAME(Type.NONE, "200V Turbine"); double RsFactor = 0.10; double nominalU = MVU; - double nominalP = 500 * heatTurbinePowerFactor; + double nominalP = 2000 * heatTurbinePowerFactor; double nominalDeltaT = 350; - TurbineDescriptor desc = new TurbineDescriptor(name, "turbinebblue", meduimVoltageCableDescriptor.render, + TurbineDescriptor desc = new TurbineDescriptor(name, "turbinebblue", mediumVoltageCableDescriptor.render, TtoU.duplicate(nominalDeltaT, nominalU), PoutToPin.duplicate(nominalP, nominalP), nominalDeltaT, - nominalU, nominalP, nominalP / 40, meduimVoltageCableDescriptor.electricalRs * RsFactor, 50.0, + nominalU, nominalP, nominalP / 40, mediumVoltageCableDescriptor.electricalRs * RsFactor, 50.0, nominalDeltaT / 40, nominalP / (nominalU / 25), "eln:heat_turbine_200v"); transparentNodeItem.addDescriptor(subId + (id << 6), desc); } @@ -2888,11 +2969,10 @@ private void registerMacerator(int id) { name = TR_NAME(Type.NONE, "200V Macerator"); MaceratorDescriptor desc = new MaceratorDescriptor(name, - "maceratorb", MVU, 400,// double nominalU,double nominalP, - MVU * 1.25,// double maximalU, - new ThermalLoadInitializer(80, -100, 10, 100000.0),// thermal, - meduimVoltageCableDescriptor,// ElectricalCableDescriptor - // cable + "maceratorb", MVU, 2000, + MVU * 1.25, + new ThermalLoadInitializer(80, -100, 10, 100000.0), + mediumVoltageCableDescriptor, maceratorRecipes); transparentNodeItem.addDescriptor(subId + (id << 6), desc); @@ -2900,8 +2980,8 @@ private void registerMacerator(int id) { } } - private RecipesList compressorRecipes = new RecipesList(); - private RecipesList plateMachineRecipes = new RecipesList(); + public RecipesList compressorRecipes = new RecipesList(); + public RecipesList plateMachineRecipes = new RecipesList(); private void registerPlateMachine(int id) { @@ -2912,12 +2992,12 @@ private void registerPlateMachine(int id) { name = TR_NAME(Type.NONE, "50V Plate Machine"); PlateMachineDescriptor desc = new PlateMachineDescriptor( - name,// String name, + name, obj.getObj("platemachinea"), - LVU, 200,// double nominalU,double nominalP, - LVU * 1.25,// double maximalU, - new ThermalLoadInitializer(80, -100, 10, 100000.0),// thermal, - lowVoltageCableDescriptor,// ElectricalCableDescriptor cable + LVU, 200, + LVU * 1.25, + new ThermalLoadInitializer(80, -100, 10, 100000.0), + lowVoltageCableDescriptor, plateMachineRecipes); transparentNodeItem.addDescriptor(subId + (id << 6), desc); @@ -2930,13 +3010,12 @@ private void registerPlateMachine(int id) { name = TR_NAME(Type.NONE, "200V Plate Machine"); PlateMachineDescriptor desc = new PlateMachineDescriptor( - name,// String name, + name, obj.getObj("platemachineb"), - MVU, 400,// double nominalU,double nominalP, - MVU * 1.25,// double maximalU, - new ThermalLoadInitializer(80, -100, 10, 100000.0),// thermal, - meduimVoltageCableDescriptor,// ElectricalCableDescriptor - // cable + MVU, 2000, + MVU * 1.25, + new ThermalLoadInitializer(80, -100, 10, 100000.0), + mediumVoltageCableDescriptor, plateMachineRecipes); transparentNodeItem.addDescriptor(subId + (id << 6), desc); @@ -2990,13 +3069,12 @@ private void registerCompressor(int id) { name = TR_NAME(Type.NONE, "200V Compressor"); CompressorDescriptor desc = new CompressorDescriptor( - name,// String name, + name, obj.getObj("compressorb"), - MVU, 400,// double nominalU,double nominalP, - MVU * 1.25,// double maximalU, - new ThermalLoadInitializer(80, -100, 10, 100000.0),// thermal, - meduimVoltageCableDescriptor,// ElectricalCableDescriptor - // cable + MVU, 2000, + MVU * 1.25, + new ThermalLoadInitializer(80, -100, 10, 100000.0), + mediumVoltageCableDescriptor, compressorRecipes); transparentNodeItem.addDescriptor(subId + (id << 6), desc); @@ -3034,13 +3112,12 @@ private void registerMagnetizer(int id) { name = TR_NAME(Type.NONE, "200V Magnetizer"); MagnetizerDescriptor desc = new MagnetizerDescriptor( - name,// String name, + name, obj.getObj("magnetizerb"), - MVU, 400,// double nominalU,double nominalP, - MVU * 1.25,// double maximalU, - new ThermalLoadInitializer(80, -100, 10, 100000.0),// thermal, - meduimVoltageCableDescriptor,// ElectricalCableDescriptor - // cable + MVU, 2000, + MVU * 1.25, + new ThermalLoadInitializer(80, -100, 10, 100000.0), + mediumVoltageCableDescriptor, magnetizerRecipes); transparentNodeItem.addDescriptor(subId + (id << 6), desc); @@ -3118,7 +3195,7 @@ private void registerSolarPanel(int id) { ghostGroup.removeElement(0, 0, 0); SolarPanelDescriptor desc = new SolarPanelDescriptor(name, - obj.getObj("bigSolarPanel"), meduimVoltageCableDescriptor.render, + obj.getObj("bigSolarPanel"), mediumVoltageCableDescriptor.render, ghostGroup, 1, 1, 0, groundCoordinate, LVSolarU * 2, solarPanelBasePower * solarPanelPowerFactor * 8, @@ -3139,7 +3216,7 @@ private void registerSolarPanel(int id) { ghostGroup.removeElement(0, 0, 0); SolarPanelDescriptor desc = new SolarPanelDescriptor(name, - obj.getObj("bigSolarPanelrot"), meduimVoltageCableDescriptor.render, + obj.getObj("bigSolarPanelrot"), mediumVoltageCableDescriptor.render, ghostGroup, 1, 1, 1, groundCoordinate, LVSolarU * 2, solarPanelBasePower * solarPanelPowerFactor * 8, @@ -3184,7 +3261,7 @@ private void registerHeatingCorp(int id) { // name, MVU, 400,// electricalNominalU, electricalNominalP, 500,// electricalMaximalP) - meduimVoltageCableDescriptor); + mediumVoltageCableDescriptor); sharedItem.addElement(completId, element); } { @@ -3225,7 +3302,7 @@ private void registerHeatingCorp(int id) { // name, MVU, 600,// electricalNominalU, electricalNominalP, 750,// electricalMaximalP) - meduimVoltageCableDescriptor); + mediumVoltageCableDescriptor); sharedItem.addElement(completId, element); } { @@ -3266,7 +3343,7 @@ private void registerHeatingCorp(int id) { TR_NAME(Type.NONE, "Small 200V Tungsten Heating Corp"),// iconId, name, MVU, 800,// electricalNominalU, electricalNominalP, 1000,// electricalMaximalP) - meduimVoltageCableDescriptor); + mediumVoltageCableDescriptor); sharedItem.addElement(completId, element); } { @@ -3520,7 +3597,7 @@ private void registerFerromagneticCore(int id) { element = new FerromagneticCoreDescriptor( TR_NAME(Type.NONE, "Cheap Ferromagnetic Core"), obj.getObj("feromagneticcorea"),// iconId, // name, - 10); + 100); sharedItem.addElement(completId, element); } { @@ -3529,7 +3606,7 @@ private void registerFerromagneticCore(int id) { element = new FerromagneticCoreDescriptor( TR_NAME(Type.NONE, "Average Ferromagnetic Core"), obj.getObj("feromagneticcorea"),// iconId, // name, - 4); + 50); sharedItem.addElement(completId, element); } { @@ -3642,9 +3719,7 @@ private void registerDust(int id) { completId = subId + (id << 6); name = TR_NAME(Type.NONE, "Copper Dust"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"It can be magnetized into Redstone"}); dustCopper = element; sharedItem.addElement(completId, element); Data.addResource(element.newItemStack()); @@ -3655,23 +3730,41 @@ private void registerDust(int id) { completId = subId + (id << 6); name = TR_NAME(Type.NONE, "Iron Dust"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"Used to make Alloy Dust"}); dustCopper = element; sharedItem.addElement(completId, element); Data.addResource(element.newItemStack()); addToOre("dustIron", element.newItemStack()); } + { + subId = 3; + completId = subId + (id << 6); + + name = TR_NAME(Type.NONE, "Lapis Dust"); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"For making solar panels and canisters"}); + dustCopper = element; + sharedItem.addElement(completId, element); + Data.addResource(element.newItemStack()); + addToOre("dustLapis", element.newItemStack()); + } + { + subId = 4; + completId = subId + (id << 6); + + name = TR_NAME(Type.NONE, "Diamond Dust"); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"Used to make a Canister"}); + dustCopper = element; + sharedItem.addElement(completId, element); + Data.addResource(element.newItemStack()); + addToOre("dustDiamond", element.newItemStack()); + } { id = 5; name = TR_NAME(Type.NONE, "Lead Dust"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"Used to refine Copper"}); sharedItem.addElement(id, element); Data.addResource(element.newItemStack()); addToOre("dustLead", element.newItemStack()); @@ -3681,9 +3774,7 @@ private void registerDust(int id) { name = TR_NAME(Type.NONE, "Tungsten Dust"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"Used to make Alloy Dust"}); sharedItem.addElement(id, element); Data.addResource(element.newItemStack()); addToOre(dictTungstenDust, element.newItemStack()); @@ -3693,9 +3784,7 @@ private void registerDust(int id) { id = 7; name = TR_NAME(Type.NONE, "Gold Dust"); - - element = new GenericItemUsingDamageDescriptorWithComment( - name, new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"Not useful, but it is pretty"}); sharedItem.addElement(id, element); Data.addResource(element.newItemStack()); addToOre("dustGold", element.newItemStack()); @@ -3706,9 +3795,7 @@ private void registerDust(int id) { name = TR_NAME(Type.NONE, "Coal Dust"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"Used to make Resistive Dust"}); sharedItem.addElement(id, element); Data.addResource(element.newItemStack()); addToOre("dustCoal", element.newItemStack()); @@ -3718,9 +3805,7 @@ private void registerDust(int id) { name = TR_NAME(Type.NONE, "Alloy Dust"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"Smelt it to make a powerful ingot"}); sharedItem.addElement(id, element); Data.addResource(element.newItemStack()); addToOre("dustAlloy", element.newItemStack()); @@ -3731,13 +3816,21 @@ private void registerDust(int id) { name = TR_NAME(Type.NONE, "Cinnabar Dust"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"Just looking around in creative? This stuff does nothing. I don't even know why we even keep it around."}); sharedItem.addElement(id, element); Data.addResource(element.newItemStack()); addToOre("dustCinnabar", element.newItemStack()); } + { + id = 11; + + name = TR_NAME(Type.NONE, "Resistive Dust"); + + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"Used to set Resistance in Resistors"}); + sharedItem.addElement(id, element); + Data.addResource(element.newItemStack()); + addToOre("dustResistive", element.newItemStack()); + } } @@ -3755,12 +3848,8 @@ private void registerIngot(int id) { completId = subId + (id << 6); name = TR_NAME(Type.NONE, "Copper Ingot"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{}); sharedItem.addElement(completId, element); - // GameRegistry.registerCustomItemStack(name, - // element.newItemStack(1)); copperIngot = element; Data.addResource(element.newItemStack()); addToOre("ingotCopper", element.newItemStack()); @@ -3771,12 +3860,8 @@ private void registerIngot(int id) { completId = subId + (id << 6); name = TR_NAME(Type.NONE, "Lead Ingot"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{}); sharedItem.addElement(completId, element); - // GameRegistry.registerCustomItemStack(name, - // element.newItemStack(1)); plumbIngot = element; Data.addResource(element.newItemStack()); addToOre("ingotLead", element.newItemStack()); @@ -3788,12 +3873,8 @@ private void registerIngot(int id) { completId = subId + (id << 6); name = TR_NAME(Type.NONE, "Tungsten Ingot"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{}); sharedItem.addElement(completId, element); - // GameRegistry.registerCustomItemStack(name, - // element.newItemStack(1)); tungstenIngot = element; Data.addResource(element.newItemStack()); addToOre(dictTungstenIngot, element.newItemStack()); @@ -3804,13 +3885,8 @@ private void registerIngot(int id) { completId = subId + (id << 6); name = TR_NAME(Type.NONE, "Ferrite Ingot"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{"useless", "Really useless"}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"useless", "Really useless"}); sharedItem.addElement(completId, element); - // GameRegistry.registerCustomItemStack(name, - // element.newItemStack(1)); - Data.addResource(element.newItemStack()); addToOre("ingotFerrite", element.newItemStack()); } @@ -3820,13 +3896,8 @@ private void registerIngot(int id) { completId = subId + (id << 6); name = TR_NAME(Type.NONE, "Alloy Ingot"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{}); sharedItem.addElement(completId, element); - // GameRegistry.registerCustomItemStack(name, - // element.newItemStack(1)); - Data.addResource(element.newItemStack()); addToOre("ingotAlloy", element.newItemStack()); } @@ -3836,16 +3907,22 @@ private void registerIngot(int id) { completId = subId + (id << 6); name = TR_NAME(Type.NONE, "Mercury"); - element = new GenericItemUsingDamageDescriptorWithComment(name,// iconId, - // name, - new String[]{"useless", "miaou"}); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{"useless", "miaou"}); sharedItem.addElement(completId, element); - // GameRegistry.registerCustomItemStack(name, - // element.newItemStack(1)); - Data.addResource(element.newItemStack()); addToOre("quicksilver", element.newItemStack()); } + { + subId = 9; + completId = subId + (id << 6); + + name = TR_NAME(Type.NONE, "Silver Ingot"); + element = new GenericItemUsingDamageDescriptorWithComment(name, new String[]{}); + sharedItem.addElement(completId, element); + silverIngot = element; + Data.addResource(element.newItemStack()); + addToOre("ingotSilver", element.newItemStack()); + } } private void registerElectricalMotor(int id) { @@ -3889,7 +3966,7 @@ private void registerElectricalMotor(int id) { private void registerArmor() { ItemStack stack; String name; - + //register Copper Set { name = TR_NAME(Type.ITEM, "Copper Helmet"); helmetCopper = (ItemArmor) (new genericArmorItem(ArmorMaterial.IRON, 2, ArmourType.Helmet, "eln:textures/armor/copper_layer_1.png", "eln:textures/armor/copper_layer_2.png")).setUnlocalizedName(name).setTextureName("eln:copper_helmet").setCreativeTab(creativeTab); @@ -3914,7 +3991,7 @@ private void registerArmor() { GameRegistry.registerItem(bootsCopper, "Eln." + name); GameRegistry.registerCustomItemStack(name, new ItemStack(bootsCopper)); } - + //register E-Coal Set int armorPoint; String t1, t2; t1 = "eln:textures/armor/ecoal_layer_1.png"; @@ -3986,19 +4063,88 @@ private void registerArmor() { GameRegistry.registerItem(bootsECoal, "Eln." + name); GameRegistry.registerCustomItemStack(name, new ItemStack(bootsECoal)); } - } - - private void registerTool() { - ItemStack stack; - String name; - { - name = TR_NAME(Type.ITEM, "Copper Sword"); - swordCopper = (new ItemSword(ToolMaterial.IRON)).setUnlocalizedName(name).setTextureName("eln:copper_sword").setCreativeTab(creativeTab); - GameRegistry.registerItem(swordCopper, "Eln." + name); - GameRegistry.registerCustomItemStack(name, new ItemStack(swordCopper)); - } + //register E-Diamond Set + t1 = "eln:textures/armor/ediamond_layer_1.png"; + t2 = "eln:textures/armor/ediamond_layer_2.png"; + energyPerDamage = 250; + ArmorMaterial eDiamondMaterial = net.minecraftforge.common.util.EnumHelper.addArmorMaterial("EDiamond", 10, new int[]{2, 6, 5, 2}, 9); { - name = TR_NAME(Type.ITEM, "Copper Hoe"); + name = TR_NAME(Type.ITEM, "E-Diamond Helmet"); + armor = 2; + armorMarge = 1; + helmetEDiamond = (ItemArmor) (new ElectricalArmor(eDiamondMaterial, 2, ArmourType.Helmet, t1, t2, + (armor + armorMarge) * energyPerDamage, 250.0,// double + // energyStorage,double + // chargePower + armor / 20.0, armor * energyPerDamage,// double + // ratioMax,double + // ratioMaxEnergy, + energyPerDamage// double energyPerDamage + )).setUnlocalizedName(name).setTextureName("eln:ediamond_helmet").setCreativeTab(creativeTab); + GameRegistry.registerItem(helmetEDiamond, "Eln." + name); + GameRegistry.registerCustomItemStack(name, new ItemStack(helmetEDiamond)); + } + { + name = TR_NAME(Type.ITEM, "E-Diamond Chestplate"); + armor = 6; + armorMarge = 2; + plateEDiamond = (ItemArmor) (new ElectricalArmor(eDiamondMaterial, 2, ArmourType.Chestplate, t1, t2, + (armor + armorMarge) * energyPerDamage, 250.0,// double + // energyStorage,double + // chargePower + armor / 20.0, armor * energyPerDamage,// double + // ratioMax,double + // ratioMaxEnergy, + energyPerDamage// double energyPerDamage + )).setUnlocalizedName(name).setTextureName("eln:ediamond_chestplate").setCreativeTab(creativeTab); + GameRegistry.registerItem(plateEDiamond, "Eln." + name); + GameRegistry.registerCustomItemStack(name, new ItemStack(plateEDiamond)); + } + { + name = TR_NAME(Type.ITEM, "E-Diamond Leggings"); + armor = 5; + armorMarge = 2; + legsEDiamond = (ItemArmor) (new ElectricalArmor(eDiamondMaterial, 2, ArmourType.Leggings, t1, t2, + (armor + armorMarge) * energyPerDamage, 250.0,// double + // energyStorage,double + // chargePower + armor / 20.0, armor * energyPerDamage,// double + // ratioMax,double + // ratioMaxEnergy, + energyPerDamage// double energyPerDamage + )).setUnlocalizedName(name).setTextureName("eln:ediamond_leggings").setCreativeTab(creativeTab); + GameRegistry.registerItem(legsEDiamond, "Eln." + name); + GameRegistry.registerCustomItemStack(name, new ItemStack(legsEDiamond)); + } + { + name = TR_NAME(Type.ITEM, "E-Diamond Boots"); + armor = 2; + armorMarge = 1; + bootsEDiamond = (ItemArmor) (new ElectricalArmor(eDiamondMaterial, 2, ArmourType.Boots, t1, t2, + (armor + armorMarge) * energyPerDamage, 250.0,// double + // energyStorage,double + // chargePower + armor / 20.0, armor * energyPerDamage,// double + // ratioMax,double + // ratioMaxEnergy, + energyPerDamage// double energyPerDamage + )).setUnlocalizedName(name).setTextureName("eln:ediamond_boots").setCreativeTab(creativeTab); + GameRegistry.registerItem(bootsEDiamond, "Eln." + name); + GameRegistry.registerCustomItemStack(name, new ItemStack(bootsEDiamond)); + } + } + + private void registerTool() { + ItemStack stack; + String name; + { + name = TR_NAME(Type.ITEM, "Copper Sword"); + swordCopper = (new ItemSword(ToolMaterial.IRON)).setUnlocalizedName(name).setTextureName("eln:copper_sword").setCreativeTab(creativeTab); + GameRegistry.registerItem(swordCopper, "Eln." + name); + GameRegistry.registerCustomItemStack(name, new ItemStack(swordCopper)); + } + { + name = TR_NAME(Type.ITEM, "Copper Hoe"); hoeCopper = (new ItemHoe(ToolMaterial.IRON)).setUnlocalizedName(name).setTextureName("eln:copper_hoe").setCreativeTab(creativeTab); GameRegistry.registerItem(hoeCopper, "Eln." + name); GameRegistry.registerCustomItemStack(name, new ItemStack(hoeCopper)); @@ -4107,14 +4253,14 @@ private void registerFuelGenerator(int id) { subId = 1; FuelGeneratorDescriptor descriptor = new FuelGeneratorDescriptor(TR_NAME(Type.NONE, "50V Fuel Generator"), obj.getObj("FuelGenerator50V"), - lowVoltageCableDescriptor, fuelGeneratorPowerFactor * 300, LVU * 1.05, fuelGeneratorTankCapacity); + lowVoltageCableDescriptor, fuelGeneratorPowerFactor * 1200, LVU * 1.25, fuelGeneratorTankCapacity); transparentNodeItem.addDescriptor(subId + (id << 6), descriptor); } { subId = 2; FuelGeneratorDescriptor descriptor = new FuelGeneratorDescriptor(TR_NAME(Type.NONE, "200V Fuel Generator"), obj.getObj("FuelGenerator200V"), - meduimVoltageCableDescriptor, fuelGeneratorPowerFactor * 1500, MVU * 1.05, + mediumVoltageCableDescriptor, fuelGeneratorPowerFactor * 6000, MVU * 1.25, fuelGeneratorTankCapacity); transparentNodeItem.addDescriptor(subId + (id << 6), descriptor); } @@ -4170,7 +4316,7 @@ private void registerThermalDissipatorPassiveAndActive(int id) { MVU, 60,// double nominalElectricalU,double // electricalNominalP, 1200,// double nominalElectricalCoolingPower, - meduimVoltageCableDescriptor,// ElectricalCableDescriptor + mediumVoltageCableDescriptor,// ElectricalCableDescriptor // cableDescriptor, 130, -100,// double warmLimit,double coolLimit, 200, 30,// double nominalP,double nominalT, @@ -4307,7 +4453,7 @@ private void registerElectricalAntenna(int id) { // electricalNominalPower, MVU * 1.3, P * 1.3,// electricalMaximalVoltage,double // electricalMaximalPower, - meduimVoltageCableDescriptor); + mediumVoltageCableDescriptor); transparentNodeItem.addDescriptor(subId + (id << 6), desc); } { @@ -4322,7 +4468,7 @@ private void registerElectricalAntenna(int id) { // electricalNominalPower, MVU * 1.3, P * 1.3,// electricalMaximalVoltage,double // electricalMaximalPower, - meduimVoltageCableDescriptor); + mediumVoltageCableDescriptor); transparentNodeItem.addDescriptor(subId + (id << 6), desc); } @@ -4456,7 +4602,7 @@ private void registerBatteryCharger(int id) { descriptor = new BatteryChargerDescriptor( name, obj.getObj("batterychargera"), - lowVoltageCableDescriptor,// ElectricalCableDescriptor + lowVoltageLQCableDescriptor,// ElectricalCableDescriptor // cable, LVU, 200// double nominalVoltage,double nominalPower ); @@ -4482,7 +4628,7 @@ private void registerBatteryCharger(int id) { descriptor = new BatteryChargerDescriptor( name, obj.getObj("batterychargera"), - meduimVoltageCableDescriptor,// ElectricalCableDescriptor + mediumVoltageCableDescriptor,// ElectricalCableDescriptor // cable, MVU, 1000// double nominalVoltage,double nominalPower ); @@ -4525,6 +4671,26 @@ private void registerElectricalDrill(int id) { ); sharedItem.addElement(completId, descriptor); } + { + subId = 3; + completId = subId + (id << 6); + name = TR_NAME(Type.NONE, "Turbo Electrical Drill"); + + descriptor = new ElectricalDrillDescriptor(name,// iconId, name, + 1, 10000 // double operationTime,double operationEnergy + ); + sharedItem.addElement(completId, descriptor); + } + { + subId = 4; + completId = subId + (id << 6); + name = TR_NAME(Type.NONE, "Irresponsible Electrical Drill"); + + descriptor = new ElectricalDrillDescriptor(name,// iconId, name, + 0.1, 20000 // double operationTime,double operationEnergy + ); + sharedItem.addElement(completId, descriptor); + } } @@ -4642,6 +4808,84 @@ private void registerRawCable(int id) { } } + private void registerCableQualityItems(int id) { + int subId, completId; + String name; + + { + subId = 0; + name = TR_NAME(Type.NONE, "Copper Folded Plate"); + GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( + name, new String[]{"Now it can fit inside a bucket"}); + sharedItem.addElement(subId + (id << 6), desc); + Data.addResource(desc.newItemStack()); + } + { + subId = 1; + name = TR_NAME(Type.NONE, "Copper Folded Plate in a Bucket"); + GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( + name, new String[]{"It just needs smelting now"}); + sharedItem.addElement(subId + (id << 6), desc); + Data.addResource(desc.newItemStack()); + } + { + subId = 2; + name = TR_NAME(Type.NONE, "Molten Copper Bucket"); + GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( + name, new String[]{"Next we add Lead Dust"}); + sharedItem.addElement(subId + (id << 6), desc); + Data.addResource(desc.newItemStack()); + } + { + subId = 3; + name = TR_NAME(Type.NONE, "Peppered Molten Copper Bucket"); + GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( + name, new String[]{"Now to melt the Lead Dust into the mix"}); + sharedItem.addElement(subId + (id << 6), desc); + Data.addResource(desc.newItemStack()); + } + { + subId = 4; + name = TR_NAME(Type.NONE, "Copper Slag Bucket"); + GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( + name, new String[]{"Pour into a bucket to get Lead and Slag"}); + sharedItem.addElement(subId + (id << 6), desc); + Data.addResource(desc.newItemStack()); + } + { + subId = 5; + name = TR_NAME(Type.NONE, "Seperated Molten Copper Bucket"); + GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( + name, new String[]{"Cool it to get your resources"}); + sharedItem.addElement(subId + (id << 6), desc); + Data.addResource(desc.newItemStack()); + } + { + subId = 6; + name = TR_NAME(Type.NONE, "Copper Slag"); + GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( + name, new String[]{"Contains Silver"}); + sharedItem.addElement(subId + (id << 6), desc); + Data.addResource(desc.newItemStack()); + } + { + subId = 7; + name = TR_NAME(Type.NONE, "Pure Copper Ingot"); + GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( + name, new String[]{"Great for building High Quality Cables"}); + sharedItem.addElement(subId + (id << 6), desc); + Data.addResource(desc.newItemStack()); + } + { + subId = 8; + name = TR_NAME(Type.NONE, "Glorious Copper Plate"); + GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( + name, new String[]{"It's been folded 1000 times"}); + sharedItem.addElement(subId + (id << 6), desc); + Data.addResource(desc.newItemStack()); + } + } + private void registerBrush(int id) { int subId, completId; @@ -4836,6 +5080,14 @@ private void registerMiscItem(int id) { Data.addResource(desc.newItemStack()); OreDictionary.registerOre(dictAdvancedChip, desc.newItemStack()); } + { + subId = 1337; + name = TR_NAME(Type.NONE, "Elite Chip"); + GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( + name, new String[]{}); + sharedItem.addElement(subId + (id << 6), desc); + Data.addResource(desc.newItemStack()); + } { subId = 2; name = TR_NAME(Type.NONE, "Machine Block"); @@ -4945,7 +5197,14 @@ private void registerMiscItem(int id) { Data.addResource(desc.newItemStack()); addToOre("ingotSilicon", desc.newItemStack()); } - + { + subId = 18; + name = TR_NAME(Type.NONE, "LED Plate"); + GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( + name, new String[]{"Contains diodes which produce light from electricity. \nCan also be modified to produce electricity from sunlight."}); + sharedItem.addElement(subId + (id << 6), desc); + Data.addResource(desc.newItemStack()); + } { subId = 22; name = TR_NAME(Type.NONE, "Machine Booster"); @@ -4955,7 +5214,7 @@ private void registerMiscItem(int id) { { subId = 23; GenericItemUsingDamageDescriptorWithComment desc = new GenericItemUsingDamageDescriptorWithComment( - TR_NAME(Type.NONE, "Advanced Machine Block"), new String[]{}); // TODO: Description. + TR_NAME(Type.NONE, "Advanced Machine Block"), new String[]{}); //todo add description sharedItem.addElement(subId + (id << 6), desc); Data.addResource(desc.newItemStack()); addToOre("casingMachineAdvanced", desc.newItemStack()); @@ -5048,56 +5307,142 @@ private void recipeElectricalSource() { } private void recipeElectricalCable() { - addRecipe(signalCableDescriptor.newItemStack(1), - "R", + addRecipe(signalCableDescriptor.newItemStack(2), //signal wire + "R", //rubber + "C", //iron cable "C", 'C', findItemStack("Iron Cable"), 'R', "itemRubber"); - addRecipe(lowVoltageCableDescriptor.newItemStack(1), + addRecipe(lowVoltageCableDescriptor.newItemStack(2), //Low Voltage Cable "R", "C", + "C", 'C', findItemStack("Copper Cable"), 'R', "itemRubber"); - addRecipe(meduimVoltageCableDescriptor.newItemStack(1), + addRecipe(mediumVoltageCableDescriptor.newItemStack(1), //Medium Voltage Cable "R", "C", 'C', lowVoltageCableDescriptor.newItemStack(1), 'R', "itemRubber"); + addRecipe(mediumVoltageLQCableDescriptor.newItemStack(1), //Shoddy Medium Voltage Cable + "W", + "C", + 'C', lowVoltageLQCableDescriptor.newItemStack(1), + 'W', "plankWood"); + addRecipe(mediumVoltageHQCableDescriptor.newItemStack(1), //Quality Medium Voltage Cable + "R", + "C", + "G", + 'C', lowVoltageHQCableDescriptor.newItemStack(1), + 'R', "itemRubber", + 'G', findItemStack("Gold Dust")); + addRecipe(mediumVoltagePQCableDescriptor.newItemStack(1), //Perfect Medium Voltage Cable + "R", + "C", + "D", + 'C', lowVoltagePQCableDescriptor.newItemStack(1), + 'R', "itemRubber", + 'D', findItemStack("Diamond Dust")); - addRecipe(highVoltageCableDescriptor.newItemStack(1), + addRecipe(highVoltageCableDescriptor.newItemStack(1), //High Voltage Cable "R", "C", - 'C', meduimVoltageCableDescriptor.newItemStack(1), + 'C', mediumVoltageCableDescriptor.newItemStack(1), 'R', "itemRubber"); + addRecipe(highVoltageLQCableDescriptor.newItemStack(1), //Shoddy High Voltage Cable + "W", + "C", + 'C', mediumVoltageLQCableDescriptor.newItemStack(1), + 'W', "plankWood"); + addRecipe(highVoltageHQCableDescriptor.newItemStack(1), //Quality High Voltage Cable + "R", + "C", + "G", + 'C', mediumVoltageHQCableDescriptor.newItemStack(1), + 'R', "itemRubber", + 'G', findItemStack("Gold Dust")); + addRecipe(highVoltagePQCableDescriptor.newItemStack(1), //Perfect High Voltage Cable + "R", + "C", + "D", + 'C', mediumVoltagePQCableDescriptor.newItemStack(1), + 'R', "itemRubber", + 'D', findItemStack("Diamond Dust")); - addRecipe(signalCableDescriptor.newItemStack(6), + addRecipe(signalCableDescriptor.newItemStack(12), //Signal Wire "RRR", "CCC", "RRR", 'C', new ItemStack(Items.iron_ingot), 'R', "itemRubber"); - addRecipe(lowVoltageCableDescriptor.newItemStack(6), + addRecipe(lowVoltageCableDescriptor.newItemStack(12), "RRR", "CCC", "RRR", 'C', "ingotCopper", 'R', "itemRubber"); + addRecipe(lowVoltageLQCableDescriptor.newItemStack(12), //Shoddy Low Voltage Cable + "WWW", + " C ", + "WWW", + 'C', "ingotCopper", + 'W', "plankWood"); - addRecipe(veryHighVoltageCableDescriptor.newItemStack(6), + addRecipe(lowVoltageHQCableDescriptor.newItemStack(12), //Quality Low Voltage Cable "RRR", "CCC", + "GGG", + 'C', findItemStack("Pure Copper Ingot"), + 'G', findItemStack("Gold Dust"), + 'R', "itemRubber"); + + addRecipe(lowVoltagePQCableDescriptor.newItemStack(12), //Perfect Low Voltage Cable "RRR", + "CCC", + "DDD", + 'C', findItemStack("Glorious Copper Plate"), + 'R', "itemRubber", + 'D', findItemStack("Diamond Dust")); + + + addRecipe(veryHighVoltageLQCableDescriptor.newItemStack(12), //Shoddy Very High Voltage Cable + "WWW", + " C ", + "WWW", 'C', "ingotAlloy", + 'W', "plankWood"); + + addRecipe(veryHighVoltageCableDescriptor.newItemStack(12), //Very High Voltage Cable + "RRR", + "CCC", + "RRR", + 'C', findItemStack("Alloy Ingot"), 'R', "itemRubber"); + addRecipe(veryHighVoltageHQCableDescriptor.newItemStack(12), //Quality Very High Voltage Cable + "RRR", + "CCC", + "GGG", + 'C', findItemStack("Alloy Plate"), + 'R', "itemRubber", + 'G', findItemStack("Gold Dust")); + + addRecipe(veryHighVoltagePQCableDescriptor.newItemStack(4), //Perfect Very High Voltage Cable + "RRR", + "CCC", + "DDD", + 'C', findItemStack("Alloy Plate"), + 'R', "itemRubber", + 'D', findItemStack("Diamond Dust")); + } private void recipeThermalCable() { - addRecipe(findItemStack("Copper Thermal Cable", 6), + addRecipe(findItemStack("Copper Thermal Cable", 12), "SSS", "CCC", "SSS", @@ -5120,9 +5465,9 @@ private void recipeLampSocket() { 'I', new ItemStack(Items.iron_ingot)); addRecipe(findItemStack("Lamp Socket B Projector", 3), - " I", - "IG", - " I", + " G", + "GI", + " G", 'G', new ItemStack(Blocks.glass_pane), 'I', new ItemStack(Items.iron_ingot)); @@ -5140,7 +5485,7 @@ private void recipeLampSocket() { addRecipe(findItemStack("Flat Lamp Socket", 3), "IGI", 'G', new ItemStack(Blocks.glass_pane), - 'I', new ItemStack(Items.iron_ingot)); + 'I', findItemStack("Iron Cable")); addRecipe(findItemStack("Simple Lamp Socket", 3), " I ", "GGG", @@ -5149,8 +5494,8 @@ private void recipeLampSocket() { addRecipe(findItemStack("Fluorescent Lamp Socket", 3), " I ", - "I I", - 'G', new ItemStack(Blocks.glass_pane), + "G G", + 'G', findItemStack("Iron Cable"), 'I', new ItemStack(Items.iron_ingot)); @@ -5158,14 +5503,14 @@ private void recipeLampSocket() { "I", "G", 'G', findItemStack("Robust Lamp Socket"), - 'I', new ItemStack(Items.iron_ingot)); + 'I', findItemStack("Iron Cable")); addRecipe(findItemStack("Long Suspended Lamp Socket", 2), "I", "I", "G", 'G', findItemStack("Robust Lamp Socket"), - 'I', new ItemStack(Items.iron_ingot)); + 'I', findItemStack("Iron Cable")); addRecipe(findItemStack("Sconce Lamp Socket", 2), "GCG", @@ -5178,7 +5523,7 @@ private void recipeLampSocket() { "cbc", " l ", " g ", - 'c', findItemStack("Low Voltage Cable"), + 'c', findItemStack("Standard Low Voltage Cable"), 'b', findItemStack("Portable Battery Pack"), 'l', findItemStack("50V LED Bulb"), 'g', new ItemStack(Blocks.glass_pane)); @@ -5187,7 +5532,7 @@ private void recipeLampSocket() { "cbc", " l ", " g ", - 'c', findItemStack("Medium Voltage Cable"), + 'c', findItemStack("Standard Medium Voltage Cable"), 'b', findItemStack("Portable Battery Pack"), 'l', findItemStack("200V LED Bulb"), 'g', new ItemStack(Blocks.glass_pane)); @@ -5210,20 +5555,20 @@ private void recipePowerSocket() { 'R', "itemRubber", 'U', findItemStack("Copper Plate"), 'A', findItemStack("Alloy Plate"), - 'C', findItemStack("Low Voltage Cable")); + 'C', findItemStack("Standard Low Voltage Cable")); addRecipe(findItemStack("200V Power Socket", 16), "RUR", "ACA", 'R', "itemRubber", 'U', findItemStack("Copper Plate"), 'A', findItemStack("Alloy Plate"), - 'C', findItemStack("Medium Voltage Cable")); + 'C', findItemStack("Standard Medium Voltage Cable")); } private void recipePassiveComponent() { addRecipe(findItemStack("Signal Diode", 4), " RB", - "IIR", + " IR", " RB", 'R', new ItemStack(Items.redstone), 'I', findItemStack("Iron Cable"), @@ -5234,7 +5579,7 @@ private void recipePassiveComponent() { "IIR", " RB", 'R', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'B', "itemRubber"); addRecipe(findItemStack("25A Diode"), @@ -5252,20 +5597,18 @@ private void recipePassiveComponent() { 'P', "plateIron"); addRecipe(findItemStack("Power Inductor"), - " P ", + " ", "cIc", - "IPI", + " ", 'I', new ItemStack(Items.iron_ingot), - 'c', findItemStack("Copper Cable"), - 'P', "plateIron"); + 'c', findItemStack("Copper Cable")); addRecipe(findItemStack("Power Resistor"), - " P ", - "c c", - "IPI", - 'I', new ItemStack(Items.iron_ingot), + " ", + "cCc", + " ", 'c', findItemStack("Copper Cable"), - 'P', "plateCopper"); + 'C', findItemStack("Resistive Dust")); addRecipe(findItemStack("Rheostat"), " R ", @@ -5279,13 +5622,11 @@ private void recipePassiveComponent() { ); addRecipe(findItemStack("Thermistor"), - " P ", + " ", "csc", - "IPI", + " ", 's', "dustSilicon", - 'I', new ItemStack(Items.iron_ingot), - 'c', findItemStack("Copper Cable"), - 'P', "plateCopper"); + 'c', findItemStack("Copper Cable")); addRecipe(findItemStack("Large Rheostat"), " ", @@ -5298,11 +5639,11 @@ private void recipePassiveComponent() { } private void recipeSwitch() { - /* - * addRecipe(findItemStack("Signal Switch"), " I", " I ", "CAC", 'R', new ItemStack(Items.redstone), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), 'C', findItemStack("Signal Cable")); - * - * addRecipe(findItemStack("Signal Switch with LED"), " RI", " I ", "CAC", 'R', new ItemStack(Items.redstone), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), 'C', findItemStack("Signal Cable")); - */ + /* + * addRecipe(findItemStack("Signal Switch"), " I", " I ", "CAC", 'R', new ItemStack(Items.redstone), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), 'C', findItemStack("Signal Cable")); + * + * addRecipe(findItemStack("Signal Switch with LED"), " RI", " I ", "CAC", 'R', new ItemStack(Items.redstone), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), 'C', findItemStack("Signal Cable")); + */ addRecipe(findItemStack("Low Voltage Switch"), " I", @@ -5311,7 +5652,7 @@ private void recipeSwitch() { 'R', new ItemStack(Items.redstone), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), - 'C', findItemStack("Low Voltage Cable")); + 'C', findItemStack("Standard Low Voltage Cable")); addRecipe(findItemStack("Medium Voltage Switch"), " I", @@ -5320,7 +5661,7 @@ private void recipeSwitch() { 'R', new ItemStack(Items.redstone), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), - 'C', findItemStack("Medium Voltage Cable")); + 'C', findItemStack("Standard Medium Voltage Cable")); addRecipe(findItemStack("High Voltage Switch"), "AAI", @@ -5329,7 +5670,7 @@ private void recipeSwitch() { 'R', new ItemStack(Items.redstone), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), - 'C', findItemStack("High Voltage Cable")); + 'C', findItemStack("Standard High Voltage Cable")); addRecipe(findItemStack("Very High Voltage Switch"), "AAI", @@ -5338,7 +5679,7 @@ private void recipeSwitch() { 'R', new ItemStack(Items.redstone), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), - 'C', findItemStack("Very High Voltage Cable")); + 'C', findItemStack("Standard Very High Voltage Cable")); } @@ -5348,51 +5689,51 @@ private void recipeElectricalRelay() { "OIO", "CRC", 'R', new ItemStack(Items.redstone), - 'O', new ItemStack(Items.iron_ingot), + 'O', findItemStack("Iron Cable"), 'G', new ItemStack(Blocks.glass_pane), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), - 'C', findItemStack("Low Voltage Cable")); + 'C', findItemStack("Standard Low Voltage Cable")); addRecipe(findItemStack("Medium Voltage Relay"), "GGG", "OIO", "CRC", 'R', new ItemStack(Items.redstone), - 'O', new ItemStack(Items.iron_ingot), + 'O', findItemStack("Iron Cable"), 'G', new ItemStack(Blocks.glass_pane), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), - 'C', findItemStack("Medium Voltage Cable")); + 'C', findItemStack("Standard Medium Voltage Cable")); addRecipe(findItemStack("High Voltage Relay"), "GGG", "OIO", "CRC", 'R', new ItemStack(Items.redstone), - 'O', new ItemStack(Items.iron_ingot), + 'O', findItemStack("Iron Cable"), 'G', new ItemStack(Blocks.glass_pane), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), - 'C', findItemStack("High Voltage Cable")); + 'C', findItemStack("Standard High Voltage Cable")); addRecipe(findItemStack("Very High Voltage Relay"), "GGG", "OIO", "CRC", 'R', new ItemStack(Items.redstone), - 'O', new ItemStack(Items.iron_ingot), + 'O', findItemStack("Iron Cable"), 'G', new ItemStack(Blocks.glass_pane), 'A', "itemRubber", 'I', findItemStack("Copper Cable"), - 'C', findItemStack("Very High Voltage Cable")); + 'C', findItemStack("Standard Very High Voltage Cable")); addRecipe(findItemStack("Signal Relay"), "GGG", "OIO", "CRC", 'R', new ItemStack(Items.redstone), - 'O', new ItemStack(Items.iron_ingot), + 'O', findItemStack("Iron Cable"), 'G', new ItemStack(Blocks.glass_pane), 'I', findItemStack("Copper Cable"), 'C', findItemStack("Signal Cable")); @@ -5404,7 +5745,7 @@ private void recipeWirelessSignal() { " R ", "ICI", 'R', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'C', dictCheapChip, 'S', findItemStack("Signal Antenna")); @@ -5413,7 +5754,7 @@ private void recipeWirelessSignal() { "R R", "ICI", 'R', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'C', dictCheapChip, 'S', findItemStack("Signal Antenna")); @@ -5421,7 +5762,7 @@ private void recipeWirelessSignal() { " S ", "ICI", 'R', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'C', dictCheapChip, 'S', findItemStack("Signal Antenna")); } @@ -5584,7 +5925,7 @@ private void recipeChips() { 'd', findItemStack("Dielectric"), 'c', findItemStack("Copper Cable"), 'C', findItemStack("Copper Plate"), - 'D', findItemStack("Coal Dust"), + 'D', findItemStack("Resistive Dust"), 's', dictCheapChip); } @@ -5622,7 +5963,7 @@ private void recipeTurbine() { "HMH", " E ", 'M', findItemStack("Machine Block"), - 'E', findItemStack("Low Voltage Cable"), + 'E', findItemStack("Standard Low Voltage Cable"), 'H', findItemStack("Copper Thermal Cable"), 'm', findItemStack("Electrical Motor") @@ -5633,7 +5974,7 @@ private void recipeTurbine() { "IEI", 'I', "itemRubber", 'M', findItemStack("Advanced Machine Block"), - 'E', findItemStack("Medium Voltage Cable"), + 'E', findItemStack("Standard Medium Voltage Cable"), 'H', findItemStack("Copper Thermal Cable"), 'm', findItemStack("Advanced Electrical Motor")); addRecipe(findItemStack("Generator"), @@ -5643,7 +5984,7 @@ private void recipeTurbine() { 'm', findItemStack("Advanced Electrical Motor"), 'M', findItemStack("Advanced Machine Block"), 'a', firstExistingOre("ingotAluminum", "ingotIron"), - 'E', findItemStack("High Voltage Cable") + 'E', findItemStack("Standard High Voltage Cable") ); addRecipe(findItemStack("Steam Turbine"), " a ", @@ -5705,43 +6046,44 @@ private void recipeBattery() { "C C", "PPP", "PPP", - 'C', findItemStack("Low Voltage Cable"), + 'C', findItemStack("Standard Low Voltage Cable"), 'P', "ingotLead", 'I', new ItemStack(Items.iron_ingot)); addRecipe(findItemStack("Capacity Oriented Battery"), - "PPP", "PBP", - "PPP", 'B', findItemStack("Cost Oriented Battery"), 'P', "ingotLead"); addRecipe(findItemStack("Voltage Oriented Battery"), - "PPP", "PBP", - "PPP", 'B', findItemStack("Cost Oriented Battery"), - 'P', new ItemStack(Items.iron_ingot)); + 'P', findItemStack("Iron Cable")); addRecipe(findItemStack("Current Oriented Battery"), - "PPP", "PBP", - "PPP", 'B', findItemStack("Cost Oriented Battery"), 'P', "ingotCopper"); addRecipe(findItemStack("Life Oriented Battery"), - "P P", - " B ", - "P P", + "PBP", 'B', findItemStack("Cost Oriented Battery"), 'P', new ItemStack(Items.gold_ingot)); + addRecipe(findItemStack("Experimental Battery"), + " S ", + "LDV", + " C ", + 'S', findItemStack("Capacity Oriented Battery"), + 'L', findItemStack("Life Oriented Battery"), + 'V', findItemStack("Voltage Oriented Battery"), + 'C', findItemStack("Current Oriented Battery"), + 'D', new ItemStack(Items.diamond)); addRecipe(findItemStack("Single-use Battery"), "ppp", "III", "ppp", - 'C', findItemStack("Low Voltage Cable"), + 'C', findItemStack("Standard Low Voltage Cable"), 'p', new ItemStack(Items.coal, 1, 0), 'I', "ingotCopper"); @@ -5749,7 +6091,7 @@ private void recipeBattery() { "ppp", "III", "ppp", - 'C', findItemStack("Low Voltage Cable"), + 'C', findItemStack("Shoddy Low Voltage Cable"), 'p', new ItemStack(Items.coal, 1, 1), 'I', "ingotCopper"); } @@ -5778,7 +6120,8 @@ private void recipeGridDevices(HashSet oreNames) { "WWW", "IWI", " W ", - 'I', "ingotIron" + 'I', "ingotIron", + 'W', "logWood" ); } addRecipe(findItemStack("Utility Pole w/DC-DC Converter"), @@ -5786,10 +6129,36 @@ private void recipeGridDevices(HashSet oreNames) { " TC", " PH", 'P', findItemStack("Utility Pole"), - 'H', findItemStack("High Voltage Cable"), + 'H', findItemStack("Standard High Voltage Cable"), 'C', findItemStack("Optimal Ferromagnetic Core"), 'T', findItemStack("DC-DC Converter") ); + + for (String type : new String[]{ + "Aluminum", + "Aluminium", + "Steel" + }) { + String blockType = "block" + type; + String ingotType = "ingot" + type; + if (oreNames.contains(blockType)) { + addRecipe(findItemStack("Transmission Tower"), + "ii ", + "mi ", + " B ", + Character.valueOf('i'), ingotType, + Character.valueOf('B'), blockType, + Character.valueOf('m'), findItemStack("Machine Block")); + addRecipe(findItemStack("Grid DC-DC Converter"), + "i i", + "mtm", + "imi", + Character.valueOf('i'), ingotType, + Character.valueOf('t'), findItemStack("DC-DC Converter"), + Character.valueOf('m'), findItemStack("Advanced Machine Block")); + } + } + // if (oreNames.contains("sheetPlastic")) { // addRecipe(findItemStack("Downlink"), // "H H", @@ -5797,7 +6166,7 @@ private void recipeGridDevices(HashSet oreNames) { // "PPP", // 'P', "sheetPlastic", // 'M', findItemStack("Machine Block"), -// 'H', findItemStack("High Voltage Cable") +// 'H', findItemStack("Standard High Voltage Cable") // ); // } else { // addRecipe(findItemStack("Downlink"), @@ -5806,7 +6175,7 @@ private void recipeGridDevices(HashSet oreNames) { // "PPP", // 'P', "itemRubber", // 'M', findItemStack("Machine Block"), -// 'H', findItemStack("High Voltage Cable") +// 'H', findItemStack("Standard High Voltage Cable") // ); // } } @@ -5817,7 +6186,7 @@ private void recipeElectricalFurnace() { "III", "IFI", "ICI", - 'C', findItemStack("Low Voltage Cable"), + 'C', findItemStack("Standard Low Voltage Cable"), 'F', new ItemStack(Blocks.furnace), 'I', new ItemStack(Items.iron_ingot)); } @@ -5828,21 +6197,21 @@ private void recipeSixNodeMisc() { "III", 'c', findItemStack("Iron Cable"), 'r', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot)); + 'I', findItemStack("Iron Cable")); addRecipe(findItemStack("Digital Watch"), "rcr", "III", 'c', findItemStack("Iron Cable"), 'r', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot)); + 'I', findItemStack("Iron Cable")); addRecipe(findItemStack("Hub"), "I I", " c ", "I I", 'c', findItemStack("Copper Cable"), - 'I', new ItemStack(Items.iron_ingot)); + 'I', findItemStack("Iron Cable")); addRecipe(findItemStack("Energy Meter"), @@ -5851,7 +6220,7 @@ private void recipeSixNodeMisc() { "IcI", 'c', findItemStack("Copper Cable"), 'R', dictCheapChip, - 'I', new ItemStack(Items.iron_ingot)); + 'I', findItemStack("Iron Cable")); addRecipe(findItemStack("Advanced Energy Meter"), " c ", @@ -5902,7 +6271,7 @@ private void recipeFuelGenerator() { 'I', "plateIron", 'B', findItemStack("Machine Block"), 'A', findItemStack("Analogic Regulator"), - 'C', findItemStack("Low Voltage Cable"), + 'C', findItemStack("Standard Low Voltage Cable"), 'M', findItemStack("Electrical Motor")); addRecipe(findItemStack("200V Fuel Generator"), @@ -5912,18 +6281,18 @@ private void recipeFuelGenerator() { 'I', "plateIron", 'B', findItemStack("Advanced Machine Block"), 'A', findItemStack("Analogic Regulator"), - 'C', findItemStack("Medium Voltage Cable"), + 'C', findItemStack("Standard Medium Voltage Cable"), 'M', findItemStack("Advanced Electrical Motor")); } private void recipeSolarPanel() { addRecipe(findItemStack("Small Solar Panel"), + "LLL", + "SSS", "III", - "CSC", - "III", - 'S', "plateSilicon", - 'I', new ItemStack(Items.iron_ingot), - 'C', findItemStack("Low Voltage Cable")); + 'S', findItemStack("LED Plate"), + 'L', findItemStack("Lapis Dust"), + 'I', new ItemStack(Items.iron_ingot)); addRecipe(findItemStack("Small Rotating Solar Panel"), "ISI", @@ -5932,8 +6301,8 @@ private void recipeSolarPanel() { 'M', findItemStack("Electrical Motor"), 'I', new ItemStack(Items.iron_ingot)); - for (String metal : new String[] { "blockSteel", "blockAluminum", "blockAluminium", "casingMachineAdvanced" }) { - for (String panel : new String[] {"Small Solar Panel", "Small Rotating Solar Panel"}) { + for (String metal : new String[]{"blockSteel", "blockAluminum", "blockAluminium", "casingMachineAdvanced"}) { + for (String panel : new String[]{"Small Solar Panel", "Small Rotating Solar Panel"}) { addRecipe(findItemStack("2x3 Solar Panel"), "PPP", "PPP", @@ -5960,16 +6329,6 @@ private void recipeThermalDissipatorPassiveAndActive() { 'I', "ingotCopper", 'C', findItemStack("Copper Thermal Cable")); - /* addRecipe( - findItemStack("Small Active Thermal Dissipator"), - "RMR", - "I I", - "III", - 'I', "ingotCopper", - 'M', findItemStack("Electrical Motor"), - 'R', "itemRubber", - 'C', findItemStack("Copper Thermal Cable"));*/ - addRecipe( findItemStack("Small Active Thermal Dissipator"), "RMR", @@ -5978,16 +6337,6 @@ private void recipeThermalDissipatorPassiveAndActive() { 'M', findItemStack("Electrical Motor"), 'R', "itemRubber"); - /* addRecipe( - findItemStack("200V Active Thermal Dissipator"), - "RMR", - "I I", - "III", - 'I', "ingotCopper", - 'M', findItemStack("Advanced Electrical Motor"), - 'R', "itemRubber", - 'C', findItemStack("Copper Thermal Cable"));*/ - addRecipe( findItemStack("200V Active Thermal Dissipator"), "RMR", @@ -6012,10 +6361,8 @@ private void recipeHeatingCorp() { 'C', findItemStack("Copper Cable")); addRecipe(findItemStack("50V Copper Heating Corp"), - "C C", - "CCC", - "C C", - 'C', "ingotCopper"); + "CC", + 'C', findItemStack("Small 50V Copper Heating Corp")); addRecipe(findItemStack("Small 200V Copper Heating Corp"), "CC", @@ -6031,10 +6378,8 @@ private void recipeHeatingCorp() { "C C", 'C', findItemStack("Iron Cable")); addRecipe(findItemStack("50V Iron Heating Corp"), - "C C", - "CCC", - "C C", - 'C', new ItemStack(Items.iron_ingot)); + "CC", + 'C', findItemStack("Small 50V Iron Heating Corp")); addRecipe(findItemStack("Small 200V Iron Heating Corp"), "CC", @@ -6051,10 +6396,8 @@ private void recipeHeatingCorp() { 'C', findItemStack("Tungsten Cable")); addRecipe(findItemStack("50V Tungsten Heating Corp"), - "C C", - "CCC", - "C C", - 'C', findItemStack("Tungsten Ingot")); + "CC", + 'C', findItemStack("Small 50V Tungsten Heating Corp")); addRecipe(findItemStack("Small 200V Tungsten Heating Corp"), "CC", @@ -6070,27 +6413,27 @@ private void recipeRegulatorItem() { " R ", " I ", 'R', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot)); + 'I', findItemStack("Iron Cable")); addRecipe(findItemStack("On/OFF Regulator 1 Percent", 1), "RRR", " I ", 'R', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot)); + 'I', findItemStack("Iron Cable")); addRecipe(findItemStack("Analogic Regulator", 1), "R R", " C ", " I ", 'R', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'C', dictCheapChip); } private void recipeLampItem() { // Tungsten addRecipe( - findItemStack("Small 50V Incandescent Light Bulb", 4), + findItemStack("Small 50V Incandescent Light Bulb", 64), " G ", "GFG", " S ", @@ -6098,24 +6441,24 @@ private void recipeLampItem() { 'F', dictTungstenIngot, 'S', findItemStack("Copper Cable")); - addRecipe(findItemStack("50V Incandescent Light Bulb", 4), + addRecipe(findItemStack("50V Incandescent Light Bulb", 64), " G ", "GFG", " S ", 'G', new ItemStack(Blocks.glass_pane), 'F', dictTungstenIngot, - 'S', findItemStack("Low Voltage Cable")); + 'S', findItemStack("Standard Low Voltage Cable")); - addRecipe(findItemStack("200V Incandescent Light Bulb", 4), + addRecipe(findItemStack("200V Incandescent Light Bulb", 64), " G ", "GFG", " S ", 'G', new ItemStack(Blocks.glass_pane), 'F', dictTungstenIngot, - 'S', findItemStack("Medium Voltage Cable")); + 'S', findItemStack("Standard Medium Voltage Cable")); // CARBON - addRecipe(findItemStack("Small 50V Carbon Incandescent Light Bulb", 4), + addRecipe(findItemStack("Small 50V Carbon Incandescent Light Bulb", 16), " G ", "GFG", " S ", @@ -6123,7 +6466,7 @@ private void recipeLampItem() { 'F', new ItemStack(Items.coal), 'S', findItemStack("Copper Cable")); - addRecipe(findItemStack("Small 50V Carbon Incandescent Light Bulb", 4), + addRecipe(findItemStack("Small 50V Carbon Incandescent Light Bulb", 16), " G ", "GFG", " S ", @@ -6132,21 +6475,21 @@ private void recipeLampItem() { 'S', findItemStack("Copper Cable")); addRecipe( - findItemStack("50V Carbon Incandescent Light Bulb", 4), + findItemStack("50V Carbon Incandescent Light Bulb", 16), " G ", "GFG", " S ", 'G', new ItemStack(Blocks.glass_pane), 'F', new ItemStack(Items.coal), - 'S', findItemStack("Low Voltage Cable")); + 'S', findItemStack("Standard Low Voltage Cable")); - addRecipe(findItemStack("50V Carbon Incandescent Light Bulb", 4), + addRecipe(findItemStack("50V Carbon Incandescent Light Bulb", 16), " G ", "GFG", " S ", 'G', new ItemStack(Blocks.glass_pane), 'F', new ItemStack(Items.coal, 1, 1), - 'S', findItemStack("Low Voltage Cable")); + 'S', findItemStack("Standard Low Voltage Cable")); addRecipe( findItemStack("Small 50V Economic Light Bulb", 4), @@ -6163,7 +6506,7 @@ private void recipeLampItem() { " S ", 'G', new ItemStack(Blocks.glass_pane), 'F', new ItemStack(Items.glowstone_dust), - 'S', findItemStack("Low Voltage Cable")); + 'S', findItemStack("Standard Low Voltage Cable")); addRecipe(findItemStack("200V Economic Light Bulb", 4), " G ", @@ -6171,7 +6514,7 @@ private void recipeLampItem() { " S ", 'G', new ItemStack(Blocks.glass_pane), 'F', new ItemStack(Items.glowstone_dust), - 'S', findItemStack("Medium Voltage Cable")); + 'S', findItemStack("Standard Medium Voltage Cable")); addRecipe(findItemStack("50V Farming Lamp", 2), "GGG", @@ -6179,7 +6522,7 @@ private void recipeLampItem() { "GSG", 'G', new ItemStack(Blocks.glass_pane), 'F', dictTungstenIngot, - 'S', findItemStack("Low Voltage Cable")); + 'S', findItemStack("Standard Low Voltage Cable")); addRecipe(findItemStack("200V Farming Lamp", 2), "GGG", @@ -6187,23 +6530,23 @@ private void recipeLampItem() { "GSG", 'G', new ItemStack(Blocks.glass_pane), 'F', dictTungstenIngot, - 'S', findItemStack("Medium Voltage Cable")); + 'S', findItemStack("Standard Medium Voltage Cable")); - addRecipe(findItemStack("50V LED Bulb", 2), + addRecipe(findItemStack("50V LED Bulb", 1), "GGG", - "SSS", + " S ", " C ", 'G', new ItemStack(Blocks.glass_pane), - 'S', findItemStack("Silicon Ingot"), - 'C', findItemStack("Low Voltage Cable")); + 'S', findItemStack("LED Plate"), + 'C', findItemStack("Standard Low Voltage Cable")); - addRecipe(findItemStack("200V LED Bulb", 2), + addRecipe(findItemStack("200V LED Bulb", 1), "GGG", - "SSS", + " S ", " C ", 'G', new ItemStack(Blocks.glass_pane), - 'S', findItemStack("Silicon Ingot"), - 'C', findItemStack("Medium Voltage Cable")); + 'S', findItemStack("LED Plate"), + 'C', findItemStack("Standard Medium Voltage Cable")); } @@ -6235,7 +6578,7 @@ private void recipeFerromagneticCore() { "LLL", "L ", "LLL", - 'L', Items.iron_ingot); + 'L', findItemStack("Iron Cable")); addRecipe(findItemStack("Average Ferromagnetic Core"), "PCP", @@ -6243,23 +6586,53 @@ private void recipeFerromagneticCore() { 'P', "plateIron"); addRecipe(findItemStack("Optimal Ferromagnetic Core"), - "P", - "C", - "P", + " P ", + "PCP", + " P ", 'C', findItemStack("Average Ferromagnetic Core"), 'P', "plateIron"); } private void recipeIngot() { - // Done + + addRecipe(findItemStack("Copper Folded Plate in a Bucket"), + "P", + "B", + 'B', new ItemStack(Items.bucket), + 'P', findItemStack("Copper Folded Plate") + ); + addRecipe(findItemStack("Peppered Molten Copper Bucket"), + "P", + "B", + 'B', findItemStack("Molten Copper Bucket"), + 'P', findItemStack("Lead Dust") + ); + addRecipe(findItemStack("Pure Copper Ingot"), + "BW", + 'B', findItemStack("Seperated Molten Copper Bucket"), + 'W', new ItemStack(Items.water_bucket) + ); } private void recipeDust() { addShapelessRecipe(findItemStack("Alloy Dust", 2), - "dustIron", "dustIron", "dustCoal", + dictTungstenDust, + dictTungstenDust, + dictTungstenDust, dictTungstenDust); + addShapelessRecipe(findItemStack("Coal Dust", 1), + "dustResistive", + "dustResistive", + "dustResistive", + "dustResistive", + "dustResistive", + "dustResistive", + "dustResistive", + "dustResistive"); + addShapelessRecipe(findItemStack("Resistive Dust", 8), + "dustCoal"); } @@ -6272,8 +6645,8 @@ private void recipeElectricalMotor() { " C ", "III", "C C", - 'I', new ItemStack(Items.iron_ingot), - 'C', findItemStack("Low Voltage Cable")); + 'I', findItemStack("Iron Cable"), + 'C', findItemStack("Standard Low Voltage Cable")); addRecipe(findItemStack("Advanced Electrical Motor"), "RCR", @@ -6282,9 +6655,7 @@ private void recipeElectricalMotor() { 'M', findItemStack("Advanced Magnet"), 'I', new ItemStack(Items.iron_ingot), 'R', new ItemStack(Items.redstone), - 'C', findItemStack("Medium Voltage Cable")); - - // TODO + 'C', findItemStack("Standard Medium Voltage Cable")); } @@ -6356,7 +6727,8 @@ private void recipeElectricalDrill() { addRecipe(findItemStack("Average Electrical Drill"), "RCR", " D ", - " d ", 'R', Items.redstone, + " d ", + 'R', Items.redstone, 'C', dictCheapChip, 'D', findItemStack("Cheap Electrical Drill"), 'd', new ItemStack(Items.diamond)); @@ -6369,7 +6741,6 @@ private void recipeElectricalDrill() { 'C', dictAdvancedChip, 'M', findItemStack("Advanced Electrical Motor"), 'P', new ItemStack(Items.diamond_pickaxe)); - } private void recipeOreScanner() { @@ -6379,14 +6750,13 @@ private void recipeOreScanner() { "IGI", 'C', dictCheapChip, 'R', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'G', new ItemStack(Items.gold_ingot)); } private void recipeMiningPipe() { addRecipe(findItemStack("Mining Pipe", 4), - "A", "A", "A", 'A', "ingotAlloy"); @@ -6404,18 +6774,17 @@ private void recipeTreeResinAndRubber() { } private void recipeRawCable() { - addRecipe(findItemStack("Copper Cable", 6), + addRecipe(findItemStack("Copper Cable", 12), "III", 'I', "ingotCopper"); - addRecipe(findItemStack("Iron Cable", 6), + addRecipe(findItemStack("Iron Cable", 12), "III", 'I', new ItemStack(Items.iron_ingot)); addRecipe(findItemStack("Tungsten Cable", 6), "III", 'I', dictTungstenIngot); - } private void recipeBatteryItem() { @@ -6464,7 +6833,7 @@ private void recipeElectricalTool() { "PBP", 'C', dictAdvancedChip, 'B', findItemStack("Portable Battery"), - 'P', new ItemStack(Items.iron_ingot), + 'P', findItemStack("Iron Cable"), 'G', findItemStack("Ore Scanner")); } @@ -6523,33 +6892,42 @@ private void recipeMiscItem() { 'S', "ingotSilicon", 'R', new ItemStack(Items.redstone)); addRecipe(findItemStack("Advanced Chip"), - "LRL", + "SRS", "RCR", - "LRL", + "SRS", 'C', dictCheapChip, - 'L', "ingotSilicon", + 'S', "ingotSilicon", 'R', new ItemStack(Items.redstone)); + addRecipe(findItemStack("Elite Chip"), + "LRL", + "RCR", + "LRL", + 'C', dictAdvancedChip, + 'L', findItemStack("LED Plate"), + 'R', new ItemStack(Blocks.redstone_block)); addRecipe(findItemStack("Machine Block"), - "LLL", + "rLr", "LcL", - "LLL", - 'L', new ItemStack(Items.iron_ingot), - 'c', findItemStack("Copper Cable")); + "rLr", + 'L', findItemStack("Iron Cable"), + 'c', findItemStack("Copper Cable"), + 'r', findItemStack("Tree Resin") + ); addRecipe(findItemStack("Advanced Machine Block"), - " C ", + "rCr", "CcC", - " C ", + "rCr", 'C', "plateAlloy", - 'L', "ingotAlloy", + 'r', findItemStack("Tree Resin"), 'c', findItemStack("Copper Cable")); addRecipe(findItemStack("Electrical Probe Chip"), " R ", "RCR", " R ", - 'C', findItemStack("High Voltage Cable"), + 'C', findItemStack("Standard High Voltage Cable"), 'R', new ItemStack(Items.redstone)); addRecipe(findItemStack("Thermal Probe Chip"), @@ -6557,7 +6935,7 @@ private void recipeMiscItem() { "RIR", " C ", 'G', new ItemStack(Items.gold_ingot), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'C', "ingotCopper", 'R', new ItemStack(Items.redstone)); @@ -6577,7 +6955,7 @@ private void recipeMiscItem() { " c ", "cc ", " c", - 'c', new ItemStack(Items.iron_ingot)); + 'c', findItemStack("Iron Cable")); addRecipe(findItemStack("Player Filter"), " g", @@ -6593,18 +6971,18 @@ private void recipeMiscItem() { 'g', new ItemStack(Blocks.glass_pane), 'c', new ItemStack(Items.dye, 1, 1)); - addRecipe(findItemStack("Casing", 8), + addRecipe(findItemStack("Casing", 1), "ppp", "p p", "ppp", - 'p', findItemStack("Iron Plate")); + 'p', findItemStack("Iron Cable")); } private void recipeMacerator() { float f = 4000; - maceratorRecipes.addRecipe(new Recipe(new ItemStack(Blocks.coal_ore, 1), - new ItemStack(Items.coal, 3, 0), 1.0 * f)); + maceratorRecipes.addRecipe(new Recipe(new ItemStack(Blocks.coal_ore, 1), + new ItemStack(Items.coal, 3, 0), 1.0 * f)); maceratorRecipes.addRecipe(new Recipe(findItemStack("Copper Ore"), new ItemStack[]{findItemStack("Copper Dust", 2)}, 1.0 * f)); maceratorRecipes.addRecipe(new Recipe(new ItemStack(Blocks.iron_ore), @@ -6616,13 +6994,19 @@ private void recipeMacerator() { maceratorRecipes.addRecipe(new Recipe(findItemStack("Tungsten Ore"), new ItemStack[]{findItemStack("Tungsten Dust", 2)}, 2.0 * f)); maceratorRecipes.addRecipe(new Recipe(new ItemStack(Items.coal, 1, 0), - new ItemStack[]{findItemStack("Coal Dust", 2)}, 1.0 * f)); + new ItemStack[]{findItemStack("Coal Dust", 1)}, 1.0 * f)); maceratorRecipes.addRecipe(new Recipe(new ItemStack(Items.coal, 1, 1), - new ItemStack[]{findItemStack("Coal Dust", 2)}, 1.0 * f)); + new ItemStack[]{findItemStack("Coal Dust", 1)}, 1.0 * f)); + maceratorRecipes.addRecipe(new Recipe(new ItemStack(Items.flint, 4), + new ItemStack[]{findItemStack("Silicon Dust", 1)}, 1.0 * f)); maceratorRecipes.addRecipe(new Recipe(new ItemStack(Blocks.sand, 1), new ItemStack[]{findItemStack("Silicon Dust", 1)}, 3.0 * f)); maceratorRecipes.addRecipe(new Recipe(findItemStack("Cinnabar Ore"), - new ItemStack[]{findItemStack("Cinnabar Dust", 2)}, 2.0 * f)); + new ItemStack[]{findItemStack("Cinnabar Dust", 1)}, 2.0 * f)); + maceratorRecipes.addRecipe(new Recipe(new ItemStack(Items.dye, 1, 4), + new ItemStack[]{findItemStack("Lapis Dust", 1)}, 2.0 * f)); + maceratorRecipes.addRecipe(new Recipe(new ItemStack(Items.diamond, 1), + new ItemStack[]{findItemStack("Diamond Dust", 1)}, 2.0 * f)); maceratorRecipes.addRecipe(new Recipe(findItemStack("Copper Ingot"), new ItemStack[]{findItemStack("Copper Dust", 1)}, 0.5 * f)); @@ -6639,9 +7023,31 @@ private void recipeMacerator() { new ItemStack[]{new ItemStack(Blocks.gravel)}, 1.0 * f)); maceratorRecipes.addRecipe(new Recipe(new ItemStack(Blocks.gravel), new ItemStack[]{new ItemStack(Items.flint)}, 1.0 * f)); - maceratorRecipes.addRecipe(new Recipe(new ItemStack(Blocks.dirt), new ItemStack[]{new ItemStack(Blocks.sand)}, 1.0 * f)); + double batf = 50000 * batteryCapacityFactor + f; //"Prevent overunity by using more power than a new battery stores." + //recycling recipes + maceratorRecipes.addRecipe(new Recipe(findItemStack("E-Coal Helmet"), + new ItemStack[]{findItemStack("Coal Dust", 16)}, batf)); + maceratorRecipes.addRecipe(new Recipe(findItemStack("E-Coal Boots"), + new ItemStack[]{findItemStack("Coal Dust", 12)}, batf)); + maceratorRecipes.addRecipe(new Recipe(findItemStack("E-Coal Chestplate"), + new ItemStack[]{findItemStack("Coal Dust", 24)}, batf)); + maceratorRecipes.addRecipe(new Recipe(findItemStack("E-Coal Leggings"), + new ItemStack[]{findItemStack("Coal Dust", 24)}, batf)); + maceratorRecipes.addRecipe(new Recipe(findItemStack("Cost Oriented Battery"), + new ItemStack[]{findItemStack("Lead Dust", 6)}, batf)); + maceratorRecipes.addRecipe(new Recipe(findItemStack("Life Oriented Battery"), + new ItemStack[]{findItemStack("Lead Dust", 6)}, batf)); + maceratorRecipes.addRecipe(new Recipe(findItemStack("Current Oriented Battery"), + new ItemStack[]{findItemStack("Lead Dust", 6)}, batf / 2)); + maceratorRecipes.addRecipe(new Recipe(findItemStack("Voltage Oriented Battery"), + new ItemStack[]{findItemStack("Lead Dust", 6)}, batf)); + maceratorRecipes.addRecipe(new Recipe(findItemStack("Capacity Oriented Battery"), + new ItemStack[]{findItemStack("Lead Dust", 6)}, batf * 2)); + maceratorRecipes.addRecipe(new Recipe(findItemStack("Single-use Battery"), + new ItemStack[]{findItemStack("Copper Dust", 3)}, 2 * f)); + //end recycling recipes } private void recipeMaceratorModOres() { @@ -6686,6 +7092,9 @@ private void recipePlateMachine() { plateMachineRecipes.addRecipe(new Recipe( findItemStack("Copper Ingot", plateConversionRatio), findItemStack("Copper Plate"), 1.0 * f)); + plateMachineRecipes.addRecipe(new Recipe( + findItemStack("Copper Plate", 8), + findItemStack("Copper Folded Plate"), 4.0 * f)); plateMachineRecipes.addRecipe(new Recipe(findItemStack("Lead Ingot", plateConversionRatio), findItemStack("Lead Plate"), 1.0 * f)); @@ -6694,6 +7103,14 @@ private void recipePlateMachine() { findItemStack("Silicon Ingot", 4), findItemStack("Silicon Plate"), 1.0 * f)); + plateMachineRecipes.addRecipe(new Recipe( + findItemStack("Silicon Plate", 1), + findItemStack("LED Plate"), 100.0 * f)); + + plateMachineRecipes.addRecipe(new Recipe( + findItemStack("Pure Copper Ingot", 50), + findItemStack("Glorious Copper Plate"), 20.0 * f)); + plateMachineRecipes.addRecipe(new Recipe(findItemStack("Alloy Ingot", plateConversionRatio), findItemStack("Alloy Plate"), 1.0 * f)); @@ -6703,17 +7120,16 @@ private void recipePlateMachine() { plateMachineRecipes.addRecipe(new Recipe(new ItemStack(Items.gold_ingot, plateConversionRatio, 0), findItemStack("Gold Plate"), 1.0 * f)); + } private void recipeCompressor() { - compressorRecipes.addRecipe(new Recipe(findItemStack("Coal Plate", 4), - new ItemStack[]{new ItemStack(Items.diamond)}, 80000.0)); // extractorRecipes.addRecipe(new // Recipe("dustCinnabar",new // ItemStack[]{findItemStack("Purified Cinnabar Dust",1)}, 1000.0)); compressorRecipes.addRecipe(new Recipe(findItemStack("Coal Dust", 4), - findItemStack("Coal Plate"), 4000.0)); + findItemStack("Coal Plate"), 40000.0)); compressorRecipes.addRecipe(new Recipe(new ItemStack(Blocks.sand), findItemStack("Dielectric"), 2000.0)); @@ -6728,6 +7144,13 @@ private void recipeMagnetizer() { new ItemStack[]{findItemStack("Basic Magnet")}, 5000.0)); magnetizerRecipes.addRecipe(new Recipe(findItemStack("Alloy Ingot", 2), new ItemStack[]{findItemStack("Advanced Magnet")}, 15000.0)); + magnetizerRecipes.addRecipe(new Recipe(findItemStack("Copper Dust", 1), + new ItemStack[]{new ItemStack(Items.redstone)}, 5000.0)); + magnetizerRecipes.addRecipe(new Recipe(findItemStack("Basic Magnet", 3), + new ItemStack[]{findItemStack("Optimal Ferromagnetic Core")}, 5000.0)); + + magnetizerRecipes.addRecipe(new Recipe(new ItemStack(Items.ender_pearl), + new ItemStack[]{new ItemStack(Items.experience_bottle, 20)}, 100000.0)); } private void recipeFuelBurnerItem() { @@ -6796,6 +7219,13 @@ private void recipeFurnace() { in = findItemStack("Silicon Dust"); Utils.addSmelting(in.getItem(), in.getItemDamage(), findItemStack("Silicon Ingot")); + in = findItemStack("Copper Folded Plate in a Bucket"); + Utils.addSmelting(in.getItem(), in.getItemDamage(), + findItemStack("Molten Copper Bucket")); + in = findItemStack("Peppered Molten Copper Bucket"); + Utils.addSmelting(in.getItem(), in.getItemDamage(), + findItemStack("Seperated Molten Copper Bucket")); + // in = findItemStack("Purified Cinnabar Dust"); in = findItemStack("dustCinnabar"); @@ -6836,7 +7266,7 @@ private void recipeTransporter() { "RMR", " R ", 'M', findItemStack("Advanced Machine Block"), - 'C', findItemStack("High Voltage Cable"), + 'C', findItemStack("Standard High Voltage Cable"), 'R', dictAdvancedChip); } @@ -6861,7 +7291,7 @@ private void recipeMachine() { 'M', findItemStack("Machine Block"), 'c', findItemStack("Electrical Motor"), 'F', new ItemStack(Items.flint), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.redstone)); addRecipe(findItemStack("200V Macerator", 1), "ICI", @@ -6880,7 +7310,7 @@ private void recipeMachine() { 'M', findItemStack("Machine Block"), 'c', findItemStack("Electrical Motor"), 'F', "plateIron", - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.redstone)); addRecipe(findItemStack("200V Compressor", 1), "ICI", @@ -6898,7 +7328,7 @@ private void recipeMachine() { "IcI", 'M', findItemStack("Machine Block"), 'c', findItemStack("Electrical Motor"), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.redstone)); addRecipe(findItemStack("200V Plate Machine", 1), @@ -6917,7 +7347,7 @@ private void recipeMachine() { "III", 'M', findItemStack("Machine Block"), 'c', findItemStack("Electrical Motor"), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.redstone)); addRecipe(findItemStack("200V Magnetizer", 1), @@ -6928,7 +7358,6 @@ private void recipeMachine() { 'C', dictAdvancedChip, 'c', findItemStack("Advanced Electrical Motor"), 'I', "ingotAlloy"); - } private void recipeElectricalGate() { @@ -6942,7 +7371,7 @@ private void recipeElectricalGate() { "IcI", 'I', new ItemStack(Items.iron_ingot), 'c', findItemStack("Signal Cable"), - 'C', dictCheapChip); + 'C', dictAdvancedChip); } private void recipeElectricalRedstone() { @@ -6982,7 +7411,7 @@ private void recipeElectricalEnvironmentalSensor() { " R ", "I I", 'R', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot)); + 'I', findItemStack("Iron Cable")); addRecipe(findItemStack("Electrical Entity Sensor"), " G ", @@ -7022,7 +7451,7 @@ private void recipeElectricalVuMeter() { "WSW", 'W', new ItemStack(Blocks.planks, 1, idx), 'R', new ItemStack(Items.redstone), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'r', new ItemStack(Items.dye, 1, 1), 'S', findItemStack("Signal Cable")); } @@ -7053,27 +7482,27 @@ private void recipeFuses() { "i", " ", "i", - 'i', new ItemStack(Items.iron_ingot)); + 'i', findItemStack("Iron Cable")); addRecipe(findItemStack("Lead Fuse for low voltage cables", 4), "rcr", 'r', findItemStack("itemRubber"), - 'c', findItemStack("Low Voltage Cable")); + 'c', findItemStack("Standard Low Voltage Cable")); addRecipe(findItemStack("Lead Fuse for medium voltage cables", 4), "rcr", 'r', findItemStack("itemRubber"), - 'c', findItemStack("Medium Voltage Cable")); + 'c', findItemStack("Standard Medium Voltage Cable")); addRecipe(findItemStack("Lead Fuse for high voltage cables", 4), "rcr", 'r', findItemStack("itemRubber"), - 'c', findItemStack("High Voltage Cable")); + 'c', findItemStack("Standard High Voltage Cable")); addRecipe(findItemStack("Lead Fuse for very high voltage cables", 4), "rcr", 'r', findItemStack("itemRubber"), - 'c', findItemStack("Very High Voltage Cable")); + 'c', findItemStack("Standard Very High Voltage Cable")); } @@ -7095,7 +7524,7 @@ private void recipeElectricalGateSource() { 'M', findItemStack("Machine Block"), 'c', findItemStack("Signal Cable"), 'r', "itemRubber", - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.redstone)); addRecipe(findItemStack("Signal Button", 3), @@ -7105,7 +7534,7 @@ private void recipeElectricalGateSource() { 'M', findItemStack("Machine Block"), 'c', findItemStack("Signal Cable"), 'r', "itemRubber", - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.redstone)); addRecipe(findItemStack("Wireless Switch", 3), @@ -7117,7 +7546,7 @@ private void recipeElectricalGateSource() { 'C', dictCheapChip, 'a', findItemStack("Signal Antenna"), 'r', "itemRubber", - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.redstone)); addRecipe(findItemStack("Wireless Button", 3), @@ -7129,7 +7558,7 @@ private void recipeElectricalGateSource() { 'C', dictCheapChip, 'a', findItemStack("Signal Antenna"), 'r', "itemRubber", - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.redstone)); // Wireless Switch @@ -7173,7 +7602,7 @@ private void recipeElectricalAlarm() { "IcI", 'c', findItemStack("Signal Cable"), 'T', new ItemStack(Blocks.redstone_torch), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'M', new ItemStack(Blocks.noteblock)); addRecipe(findItemStack("Standard Alarm", 1), "MTM", @@ -7181,7 +7610,7 @@ private void recipeElectricalAlarm() { "III", 'c', findItemStack("Signal Cable"), 'T', new ItemStack(Blocks.redstone_torch), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'M', new ItemStack(Blocks.noteblock)); } @@ -7243,16 +7672,16 @@ private void recipeBatteryCharger() { "RIR", "III", "RcR", - 'c', findItemStack("Low Voltage Cable"), - 'I', new ItemStack(Items.iron_ingot), + 'c', findItemStack("Shoddy Low Voltage Cable"), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.redstone)); addRecipe(findItemStack("50V Battery Charger", 1), "RIR", "ICI", "RcR", 'C', dictCheapChip, - 'c', findItemStack("Low Voltage Cable"), - 'I', new ItemStack(Items.iron_ingot), + 'c', findItemStack("Standard Low Voltage Cable"), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.redstone)); addRecipe(findItemStack("200V Battery Charger", 1), @@ -7260,8 +7689,8 @@ private void recipeBatteryCharger() { "ICI", "RcR", 'C', dictAdvancedChip, - 'c', findItemStack("Medium Voltage Cable"), - 'I', new ItemStack(Items.iron_ingot), + 'c', findItemStack("Standard Medium Voltage Cable"), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.redstone)); } @@ -7285,8 +7714,8 @@ private void recipeEnergyConverter() { "cCR", "III", 'C', dictCheapChip, - 'c', findItemStack("Low Voltage Cable"), - 'I', new ItemStack(Items.iron_ingot), + 'c', findItemStack("Standard Low Voltage Cable"), + 'I', findItemStack("Iron Cable"), 'R', "ingotCopper"); addRecipe(new ItemStack(elnToOtherBlockMvu), @@ -7294,8 +7723,8 @@ private void recipeEnergyConverter() { "cCR", "III", 'C', dictCheapChip, - 'c', findItemStack("Medium Voltage Cable"), - 'I', new ItemStack(Items.iron_ingot), + 'c', findItemStack("Standard Medium Voltage Cable"), + 'I', findItemStack("Iron Cable"), 'R', dictTungstenIngot); addRecipe(new ItemStack(elnToOtherBlockHvu), @@ -7303,8 +7732,8 @@ private void recipeEnergyConverter() { "cCR", "III", 'C', dictAdvancedChip, - 'c', findItemStack("High Voltage Cable"), - 'I', new ItemStack(Items.iron_ingot), + 'c', findItemStack("Standard High Voltage Cable"), + 'I', findItemStack("Iron Cable"), 'R', new ItemStack(Items.gold_ingot)); } @@ -7318,7 +7747,7 @@ private void recipeComputerProbe() { "WIc", 'C', dictAdvancedChip, 'c', findItemStack("Signal Cable"), - 'I', new ItemStack(Items.iron_ingot), + 'I', findItemStack("Iron Cable"), 'w', findItemStack("Wireless Signal Receiver"), 'W', findItemStack("Wireless Signal Transmitter")); } diff --git a/src/main/java/mods/eln/item/GraphiteDescriptor.java b/src/main/java/mods/eln/item/GraphiteDescriptor.java new file mode 100644 index 000000000..f627aac00 --- /dev/null +++ b/src/main/java/mods/eln/item/GraphiteDescriptor.java @@ -0,0 +1,10 @@ +package mods.eln.item; + +import mods.eln.generic.GenericItemUsingDamageDescriptor; + +public class GraphiteDescriptor extends GenericItemUsingDamageDescriptor { + + public GraphiteDescriptor(String name) { + super(name); + } +} diff --git a/src/main/java/mods/eln/sixnode/electricalsource/ElectricalSourceRender.java b/src/main/java/mods/eln/sixnode/electricalsource/ElectricalSourceRender.java index f0e21a193..f673879c4 100644 --- a/src/main/java/mods/eln/sixnode/electricalsource/ElectricalSourceRender.java +++ b/src/main/java/mods/eln/sixnode/electricalsource/ElectricalSourceRender.java @@ -60,8 +60,8 @@ public CableRenderDescriptor getCableRender(LRDU lrdu) { if (descriptor.isSignalSource()) return Eln.instance.signalCableDescriptor.render; if (voltage < Eln.instance.lowVoltageCableDescriptor.electricalMaximalVoltage) return Eln.instance.lowVoltageCableDescriptor.render; - if (voltage < Eln.instance.meduimVoltageCableDescriptor.electricalMaximalVoltage) - return Eln.instance.meduimVoltageCableDescriptor.render; + if (voltage < Eln.instance.mediumVoltageCableDescriptor.electricalMaximalVoltage) + return Eln.instance.mediumVoltageCableDescriptor.render; if (voltage > Eln.instance.highVoltageCableDescriptor.electricalMaximalVoltage) return Eln.instance.highVoltageCableDescriptor.render; return Eln.instance.veryHighVoltageCableDescriptor.render; diff --git a/src/main/java/mods/eln/sixnode/resistor/ResistorContainer.java b/src/main/java/mods/eln/sixnode/resistor/ResistorContainer.java index fb4a477c4..edf398907 100644 --- a/src/main/java/mods/eln/sixnode/resistor/ResistorContainer.java +++ b/src/main/java/mods/eln/sixnode/resistor/ResistorContainer.java @@ -18,9 +18,10 @@ public class ResistorContainer extends BasicContainer { public ResistorContainer(EntityPlayer player, IInventory inventory) { super(player, inventory, new Slot[]{ - new SlotFilter(inventory, coreId, 132, 8, 64, ItemStackFilter.OreDict("dustCoal"), + new SlotFilter(inventory, coreId, 135, 8, 64, ItemStackFilter.OreDict("dustResistive"), ISlotSkin.SlotSkin.medium, - new String[]{tr("Coal dust slot"), tr("(Sets resistance)")}) - }); + new String[]{tr("Resistive Dust slot"), tr("(Each dust adds more resistance)")}) + } + ); } } diff --git a/src/main/java/mods/eln/transparentnode/turret/TurretDescriptor.java b/src/main/java/mods/eln/transparentnode/turret/TurretDescriptor.java index ca792f804..6e0b06ce6 100644 --- a/src/main/java/mods/eln/transparentnode/turret/TurretDescriptor.java +++ b/src/main/java/mods/eln/transparentnode/turret/TurretDescriptor.java @@ -45,15 +45,15 @@ public Properties() { impulseEnergy = 1000; gunMinElevation = -40; gunMaxElevation = 70; - turretSeekAnimationSpeed = 40; - turretAimAnimationSpeed = 70; - gunArmAnimationSpeed = 3; + turretSeekAnimationSpeed = 100; + turretAimAnimationSpeed = 140; + gunArmAnimationSpeed = 6; gunDisarmAnimationSpeed = 0.5f; - gunAimAnimationSpeed = 100; + gunAimAnimationSpeed = 200; minimalVoltage = 600; minimalVoltageHysteresisFactor = 0.1; maximalVoltage = 1050; - basePower = 25; + basePower = 75; chargePower = 1000; entityDetectionInterval = 0.25; } diff --git a/src/main/java/mods/eln/transparentnode/turret/TurretSlowProcess.java b/src/main/java/mods/eln/transparentnode/turret/TurretSlowProcess.java index 2173b6bbf..7d1c1255f 100644 --- a/src/main/java/mods/eln/transparentnode/turret/TurretSlowProcess.java +++ b/src/main/java/mods/eln/transparentnode/turret/TurretSlowProcess.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Random; + public class TurretSlowProcess extends StateMachine { private static final Random rand = new Random(); private double actualPower; @@ -206,7 +207,11 @@ else if (element.getTurretAngle() <= -element.getDescriptor().getProperties().ac } if (visible) { - element.play(new SoundCommand("eln:TurretFire").mulVolume(0.4)); + if(entity.getHealth() > 0) { + element.play(new SoundCommand("eln:TurretFire").mulVolume(0.4)); + } else { + element.play(new SoundCommand("eln:TurretKill").mulVolume(0.4)); + } return new AimingState(entity); } } @@ -237,7 +242,7 @@ public void enter() { @Override public State state(double time) { - if (target.isDead) return new SeekingState(); + if (target.getHealth() <= 0) return new SeekingState(); Class filterClass = null; ItemStack filterStack = element.getInventory().getStackInSlot(TurretContainer.filterId); @@ -319,14 +324,17 @@ public ShootState(EntityLivingBase target) { @Override public void enter() { - if (target != null) target.attackEntityFrom(new DamageSource("Unknown"), 5); - element.shoot(); + if (target != null){ + target.hurtResistantTime = 0; + target.attackEntityFrom(new DamageSource("Unknown"), 5); + element.shoot(); element.play(new SoundCommand("eln:LaserGun")); + } } @Override public State state(double time) { - if (target == null || target.isDead) + if (target == null || target.getHealth() <= 0) return new SeekingState(); else return new AimingState(target); diff --git a/src/main/resources/assets/eln/lang/en.lang b/src/main/resources/assets/eln/lang/en.lang index a0fcdd29b..955d90599 100644 --- a/src/main/resources/assets/eln/lang/en.lang +++ b/src/main/resources/assets/eln/lang/en.lang @@ -118,7 +118,10 @@ Green_Brush.name=Green Brush Ground_Cable.name=Ground Cable High_Power_Receiver_Antenna.name=High Power Receiver Antenna High_Power_Transmitter_Antenna.name=High Power Transmitter Antenna +Shoddy_High_Voltage_Cable.name=Shoddy High Voltage Cable High_Voltage_Cable.name=High Voltage Cable +Quality_High_Voltage_Cable.name=Quality High Voltage Cable +Perfect_High_Voltage_Cable.name=Perfect High Voltage Cable High_Voltage_Relay.name=High Voltage Relay High_Voltage_Switch.name=High Voltage Switch Hub.name=Hub @@ -142,7 +145,10 @@ Lime_Brush.name=Lime Brush Long_Suspended_Lamp_Socket.name=Long Suspended Lamp Socket Low_Power_Receiver_Antenna.name=Low Power Receiver Antenna Low_Power_Transmitter_Antenna.name=Low Power Transmitter Antenna +Shoddy_Low_Voltage_Cable.name=Shoddy Low Voltage Cable Low_Voltage_Cable.name=Low Voltage Cable +Quality_Low_Voltage_Cable.name=Quality Low Voltage Cable +Perfect_Low_Voltage_Cable.name=Perfect Low Voltage Cable Low_Voltage_Relay.name=Low Voltage Relay Low_Voltage_Switch.name=Low Voltage Switch Machine_Block.name=Machine Block @@ -150,7 +156,10 @@ Machine_Booster.name=Machine Booster Magenta_Brush.name=Magenta Brush Medium_Power_Receiver_Antenna.name=Medium Power Receiver Antenna Medium_Power_Transmitter_Antenna.name=Medium Power Transmitter Antenna +Shoddy_Medium_Voltage_Cable.name=Shoddy Medium Voltage Cable Medium_Voltage_Cable.name=Medium Voltage Cable +Quality_Medium_Voltage_Cable.name=Quality Medium Voltage Cable +Perfect_Medium_Voltage_Cable.name=Perfect Medium Voltage Cable Medium_Voltage_Relay.name=Medium Voltage Relay Medium_Voltage_Switch.name=Medium Voltage Switch Mercury.name=Mercury @@ -244,7 +253,10 @@ Tungsten_Dust.name=Tungsten Dust Tungsten_Ingot.name=Tungsten Ingot Tungsten_Ore.name=Tungsten Ore Tutorial_Sign.name=Tutorial Sign +Shoddy_Very_High_Voltage_Cable.name=Shoddy Very High Voltage Cable Very_High_Voltage_Cable.name=Very High Voltage Cable +Quality_Very_High_Voltage_Cable.name=Quality Very High Voltage Cable +Perfect_Very_High_Voltage_Cable.name=Perfect Very High Voltage Cable Very_High_Voltage_Relay.name=Very High Voltage Relay Very_High_Voltage_Switch.name=Very High Voltage Switch Voltage-to-Redstone_Converter.name=Voltage-to-Redstone Converter diff --git a/src/main/resources/assets/eln/lang/en_US.lang b/src/main/resources/assets/eln/lang/en_US.lang index 775daf81e..b99af6a36 100644 --- a/src/main/resources/assets/eln/lang/en_US.lang +++ b/src/main/resources/assets/eln/lang/en_US.lang @@ -12,7 +12,6 @@ achievement.open_guide.desc=Open the wiki guide 200V_Active_Thermal_Dissipator.name=200V Active Thermal Dissipator 200V_Battery_Charger.name=200V Battery Charger 200V_Compressor.name=200V Compressor -200V_Condensator.name=200V Capacitor 200V_Copper_Heating_Corp.name=200V Copper Heating Corp 200V_Economic_Light_Bulb.name=200V Economic Light Bulb 200V_Emergency_Lamp.name=200V Emergency Lamp @@ -33,7 +32,6 @@ achievement.open_guide.desc=Open the wiki guide 50V_Battery_Charger.name=50V Battery Charger 50V_Carbon_Incandescent_Light_Bulb.name=50V Carbon Incandescent Light Bulb 50V_Compressor.name=50V Compressor -50V_Condensator.name=50V Capacitor 50V_Copper_Heating_Corp.name=50V Copper Heating Corp 50V_Economic_Light_Bulb.name=50V Economic Light Bulb 50V_Egg_Incubator.name=50V Egg Incubator @@ -87,17 +85,23 @@ Combustion_Chamber.name=Combustion Chamber Configurable_summing_unit.name=Configurable summing unit Copper_Cable.name=Copper Cable Copper_Dust.name=Copper Dust +Copper_Folded_Plate.name=Copper Folded Plate +Copper_Folded_Plate_in_a_Bucket.name=Copper Folded Plate in a Bucket Copper_Ingot.name=Copper Ingot Copper_Ore.name=Copper Ore Copper_Plate.name=Copper Plate +Copper_Slag.name=Copper Slag +Copper_Slag_Bucket.name=Copper Slag Bucket Copper_Thermal_Cable.name=Copper Thermal Cable Cost_Oriented_Battery.name=Cost Oriented Battery +Crypto_Capacitor.name=Crypto Capacitor Current_Oriented_Battery.name=Current Oriented Battery Cyan_Brush.name=Cyan Brush DC-DC_Converter.name=DC-DC Converter D_Flip_Flop_Chip.name=D Flip Flop Chip Data_Logger.name=Data Logger Data_Logger_Print.name=Data Logger Print +Diamond_Dust.name=Diamond Dust Dielectric.name=Dielectric Digital_Watch.name=Digital Watch Electrical_Anemometer_Sensor.name=Electrical Anemometer Sensor @@ -116,7 +120,9 @@ Electrical_Source.name=Electrical Source Electrical_Timer.name=Electrical Timer Electrical_Weather_Sensor.name=Electrical Weather Sensor Electrical_age_wrench,\nCan_be_used_to_turn\nsmall_wall_blocks=Electrical age wrench,\nCan be used to turn\nsmall wall blocks +Elite_Chip.name=Elite Chip Energy_Meter.name=Energy Meter +Experimental_Battery.name=Experimental Battery Experimental_Transporter.name=Experimental Transporter Fast_Electrical_Drill.name=Fast Electrical Drill Ferrite_Ingot.name=Ferrite Ingot @@ -126,6 +132,7 @@ Flywheel.name=Flywheel Fuel_Heat_Furnace.name=Fuel Heat Furnace Gas_Turbine.name=Gas Turbine Generator.name=Generator +Glorious_Copper_Plate.name=Glorious Copper Plate Gold_Dust.name=Gold Dust Gold_Plate.name=Gold Plate Gray_Brush.name=Gray Brush @@ -133,7 +140,6 @@ Green_Brush.name=Green Brush Ground_Cable.name=Ground Cable High_Power_Receiver_Antenna.name=High Power Receiver Antenna High_Power_Transmitter_Antenna.name=High Power Transmitter Antenna -High_Voltage_Cable.name=High Voltage Cable High_Voltage_Relay.name=High Voltage Relay High_Voltage_Switch.name=High Voltage Switch Hub.name=Hub @@ -141,13 +147,16 @@ Industrial_Data_Logger.name=Industrial Data Logger Iron_Cable.name=Iron Cable Iron_Dust.name=Iron Dust Iron_Plate.name=Iron Plate +Irresponsible_Electrical_Drill.name=Irresponsible Electrical Drill JK_Flip_Flop_Chip.name=JK Flip Flop Chip Joint.name=Joint Joint_hub.name=Joint hub +LED_Plate.name=LED Plate LED_vuMeter.name=LED vuMeter Lamp_Socket_A.name=Lamp Socket A Lamp_Socket_B_Projector.name=Lamp Socket B Projector Lamp_Supply.name=Lamp Supply +Lapis_Dust.name=Lapis Dust Large_Rheostat.name=Large Rheostat Lead_Dust.name=Lead Dust Lead_Fuse_for_high_voltage_cables.name=Lead Fuse for high voltage cables @@ -163,7 +172,6 @@ Lime_Brush.name=Lime Brush Long_Suspended_Lamp_Socket.name=Long Suspended Lamp Socket Low_Power_Receiver_Antenna.name=Low Power Receiver Antenna Low_Power_Transmitter_Antenna.name=Low Power Transmitter Antenna -Low_Voltage_Cable.name=Low Voltage Cable Low_Voltage_Relay.name=Low Voltage Relay Low_Voltage_Switch.name=Low Voltage Switch Lowpass_filter.name=Lowpass filter @@ -173,13 +181,13 @@ Magenta_Brush.name=Magenta Brush Medium_Fuel_Burner.name=Medium Fuel Burner Medium_Power_Receiver_Antenna.name=Medium Power Receiver Antenna Medium_Power_Transmitter_Antenna.name=Medium Power Transmitter Antenna -Medium_Voltage_Cable.name=Medium Voltage Cable Medium_Voltage_Relay.name=Medium Voltage Relay Medium_Voltage_Switch.name=Medium Voltage Switch Mercury.name=Mercury Mining_Pipe.name=Mining Pipe Modbus_RTU.name=Modbus RTU Modern_Data_Logger.name=Modern Data Logger +Molten_Copper_Bucket.name=Molten Copper Bucket Monster_Filter.name=Monster Filter MultiMeter.name=Multimeter NAND_Chip.name=NAND Chip @@ -198,6 +206,7 @@ Overheating_Protection.name=Overheating Protection Overvoltage_Protection.name=Overvoltage Protection PAL_Chip.name=PAL Chip PID_Regulator.name=PID Regulator +Peppered_Molten_Copper_Bucket.name=Peppered Molten Copper Bucket Pink_Brush.name=Pink Brush Player_Filter.name=Player Filter Portable_Battery.name=Portable Battery @@ -211,9 +220,11 @@ Power_Inductor.name=Power Inductor Power_Resistor.name=Power Resistor Power_capacitor.name=Power capacitor Power_inductor.name=Power inductor +Pure_Copper_Ingot.name=Pure Copper Ingot Purple_Brush.name=Purple Brush Red_Brush.name=Red Brush Redstone-to-Voltage_Converter.name=Redstone-to-Voltage Converter +Resistive_Dust.name=Resistive Dust Rheostat.name=Rheostat Robust_Lamp_Socket.name=Robust Lamp Socket Rubber.name=Rubber @@ -221,6 +232,7 @@ Sample_and_hold.name=Sample and hold Scanner.name=Scanner Schmitt_Trigger_Chip.name=Schmitt Trigger Chip Sconce_Lamp_Socket.name=Sconce Lamp Socket +Seperated_Molten_Copper_Bucket.name=Seperated Molten Copper Bucket Signal_20H_inductor.name=Signal 20H inductor Signal_Antenna.name=Signal Antenna Signal_Button.name=Signal Button @@ -236,6 +248,7 @@ Silicon_Dust.name=Silicon Dust Silicon_Ingot.name=Silicon Ingot Silicon_Plate.name=Silicon Plate Silver_Brush.name=Silver Brush +Silver_Ingot.name=Silver Ingot Simple_Lamp_Socket.name=Simple Lamp Socket Single-use_Battery.name=Single-use Battery Small_200V_Copper_Heating_Corp.name=Small 200V Copper Heating Corp @@ -271,8 +284,8 @@ Tungsten_Cable.name=Tungsten Cable Tungsten_Dust.name=Tungsten Dust Tungsten_Ingot.name=Tungsten Ingot Tungsten_Ore.name=Tungsten Ore +Turbo_Electrical_Drill.name=Turbo Electrical Drill Tutorial_Sign.name=Tutorial Sign -Very_High_Voltage_Cable.name=Very High Voltage Cable Very_High_Voltage_Relay.name=Very High Voltage Relay Very_High_Voltage_Switch.name=Very High Voltage Switch Voltage-to-Redstone_Converter.name=Voltage-to-Redstone Converter @@ -310,6 +323,10 @@ item.E-Coal Boots.name=E-Coal Boots item.E-Coal Chestplate.name=E-Coal Chestplate item.E-Coal Helmet.name=E-Coal Helmet item.E-Coal Leggings.name=E-Coal Leggings +item.E-Diamond Boots.name=E-Diamond Boots +item.E-Diamond Chestplate.name=E-Diamond Chestplate +item.E-Diamond Helmet.name=E-Diamond Helmet +item.E-Diamond Leggings.name=E-Diamond Leggings itemGroup.Eln=Electrical Age mod.meta.desc=Electricity in your base! tile.eln.ElnProbe.name=Eln Computer Probe @@ -365,11 +382,11 @@ Useful_to_prevent_over-voltage\nof_Batteries=Useful to prevent over-voltage\nof # ./src/main/java/mods/eln/item/SolarTrackerDescriptor.java Solar_panel_upgrade=Solar panel upgrade -# ./src/main/java/mods/eln/item/electricalitem/BatteryItem.java +# ./src/main/java/mods/eln/item/electricalitem/BatteryItem.kt -# ./src/main/java/mods/eln/item/electricalitem/ElectricalLampItem.java +# ./src/main/java/mods/eln/item/electricalitem/ElectricalLampItem.kt State\:=State: -Stored_Energy\:_%1$J_(%2$%)=Stored Energy: %1$J (%2$%) +Stored_Energy\:_%1\$J_(%2$%)=Stored Energy: %1\$J (%2$%) # ./src/main/java/mods/eln/item/regulator/RegulatorSlot.java @@ -719,14 +736,14 @@ Supplies_any_device\nplugged_in_with_energy.=Supplies any device\nplugged in wit Specify_the_device_to_supply_through_this_socket.=Specify the device to supply through this socket. # ./src/main/java/mods/eln/sixnode/resistor/ResistorContainer.java -(Sets_resistance)=(Sets resistance) -Coal_dust_slot=Coal dust slot +(Each_dust_adds_more_resistance)=(Each dust adds more resistance) +Resistive_Dust_slot=Resistive Dust slot # ./src/main/java/mods/eln/sixnode/resistor/ResistorElement.java # ./src/main/java/mods/eln/sixnode/thermalcable/ThermalCableDescriptor.java High_parallel_resistance\n_\=>_Low_power_dissipation.=High parallel resistance\n => Low power dissipation. -Low_serial_resistance\n_\=>_High_conductivity.=Low serial resistance\n => High conductivity. +Low_serialized_resistance\n_\=>_High_conductivity.=Low serialized resistance\n => High conductivity. Parallel_resistance\:_%1$K_W=Parallel resistance: %1$K/W Serial_resistance\:_%1$K_W=Serial resistance: %1$K/W @@ -763,7 +780,6 @@ Fuel_level=Fuel level Nominal_power\:_%1$_W=Nominal power: %1$ W Nominal_voltage\:_%1$_V=Nominal voltage: %1$ V Produces_electricity_using_gasoline.=Produces electricity using gasoline. -State=State # ./src/main/java/mods/eln/transparentnode/FuelHeatFurnace.kt Actual\:_%1$=Actual: %1$ @@ -1007,14 +1023,14 @@ Capacity\:_%1$F=Capacity: %1$F Channel=Channel Charge=Charge Charge_power=Charge power -Charge_power\:_%1$W=Charge power: %1$W +Charge_power\:_%1\$W=Charge power: %1\$W Closed=Closed Connected=Connected Cooling_power\:_%1$W=Cooling power: %1$W Copper_cable_slot=Copper cable slot Current=Current Dielectric_slot=Dielectric slot -Discharge_power\:_%1$W=Discharge power: %1$W +Discharge_power\:_%1\$W=Discharge power: %1\$W Electrical_cable_slot=Electrical cable slot Energy=Energy Entity_filter_slot=Entity filter slot @@ -1067,7 +1083,8 @@ Resistance\:_%1$\u2126=Resistance: %1$\u2126 Smallest=Smallest Specify_the_channel=Specify the channel Specify_the_supply_channel=Specify the supply channel -Stored_energy\:_%1$J_(%2$%)=Stored energy: %1$J (%2$%) +State=State +Stored_energy\:_%1\$J_(%2$%)=Stored energy: %1\$J (%2$%) Temperature=Temperature Temperature\:_%1$°C=Temperature: %1$°C Temperature_gauge=Temperature gauge diff --git a/src/main/resources/assets/eln/model/BatteryBig/BatteryExperimental.png b/src/main/resources/assets/eln/model/BatteryBig/BatteryExperimental.png new file mode 100644 index 000000000..fdab26ada Binary files /dev/null and b/src/main/resources/assets/eln/model/BatteryBig/BatteryExperimental.png differ diff --git a/src/main/resources/assets/eln/sounds.json b/src/main/resources/assets/eln/sounds.json index 530ef61c5..7cf788b6d 100644 --- a/src/main/resources/assets/eln/sounds.json +++ b/src/main/resources/assets/eln/sounds.json @@ -206,6 +206,15 @@ } ] }, + "TurretKill": { + "category": "block", + "sounds": [ + { + "name": "TurretKill", + "stream": false + } + ] + }, "FuelGenerator": { "category": "block", "sounds": [ diff --git a/src/main/resources/assets/eln/sounds/TurretKill.ogg b/src/main/resources/assets/eln/sounds/TurretKill.ogg new file mode 100644 index 000000000..5e7026534 Binary files /dev/null and b/src/main/resources/assets/eln/sounds/TurretKill.ogg differ diff --git a/src/main/resources/assets/eln/sprites/cable.png b/src/main/resources/assets/eln/sprites/cable.png index 0853ddff0..b39ca8490 100644 Binary files a/src/main/resources/assets/eln/sprites/cable.png and b/src/main/resources/assets/eln/sprites/cable.png differ diff --git a/src/main/resources/assets/eln/sprites/cableVHVperfect.png b/src/main/resources/assets/eln/sprites/cableVHVperfect.png new file mode 100644 index 000000000..85fe5699d Binary files /dev/null and b/src/main/resources/assets/eln/sprites/cableVHVperfect.png differ diff --git a/src/main/resources/assets/eln/sprites/cableVHVquality.png b/src/main/resources/assets/eln/sprites/cableVHVquality.png new file mode 100644 index 000000000..1d7d3eca8 Binary files /dev/null and b/src/main/resources/assets/eln/sprites/cableVHVquality.png differ diff --git a/src/main/resources/assets/eln/sprites/cableVHVshoddy.png b/src/main/resources/assets/eln/sprites/cableVHVshoddy.png new file mode 100644 index 000000000..17404e955 Binary files /dev/null and b/src/main/resources/assets/eln/sprites/cableVHVshoddy.png differ diff --git a/src/main/resources/assets/eln/sprites/cableperfect.png b/src/main/resources/assets/eln/sprites/cableperfect.png new file mode 100644 index 000000000..a2894cb7c Binary files /dev/null and b/src/main/resources/assets/eln/sprites/cableperfect.png differ diff --git a/src/main/resources/assets/eln/sprites/cablequality.png b/src/main/resources/assets/eln/sprites/cablequality.png new file mode 100644 index 000000000..8e4e7438d Binary files /dev/null and b/src/main/resources/assets/eln/sprites/cablequality.png differ diff --git a/src/main/resources/assets/eln/sprites/cableshoddy.png b/src/main/resources/assets/eln/sprites/cableshoddy.png new file mode 100644 index 000000000..b99a202ee Binary files /dev/null and b/src/main/resources/assets/eln/sprites/cableshoddy.png differ diff --git a/src/main/resources/assets/eln/textures/armor/ediamond_layer_1.png b/src/main/resources/assets/eln/textures/armor/ediamond_layer_1.png new file mode 100644 index 000000000..bbfd19e56 Binary files /dev/null and b/src/main/resources/assets/eln/textures/armor/ediamond_layer_1.png differ diff --git a/src/main/resources/assets/eln/textures/armor/ediamond_layer_2.png b/src/main/resources/assets/eln/textures/armor/ediamond_layer_2.png new file mode 100644 index 000000000..9e626060c Binary files /dev/null and b/src/main/resources/assets/eln/textures/armor/ediamond_layer_2.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/800varcfurnace-ni.png b/src/main/resources/assets/eln/textures/blocks/800varcfurnace-ni.png new file mode 100644 index 000000000..8c4ef9ae4 Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/800varcfurnace-ni.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/800varcfurnace.png b/src/main/resources/assets/eln/textures/blocks/800varcfurnace.png new file mode 100644 index 000000000..8c4ef9ae4 Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/800varcfurnace.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/cryptocapacitor-ni.png b/src/main/resources/assets/eln/textures/blocks/cryptocapacitor-ni.png new file mode 100644 index 000000000..4111ec22c Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/cryptocapacitor-ni.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/cryptocapacitor.png b/src/main/resources/assets/eln/textures/blocks/cryptocapacitor.png new file mode 100644 index 000000000..fc24d1b70 Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/cryptocapacitor.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/experimentalbattery.png b/src/main/resources/assets/eln/textures/blocks/experimentalbattery.png new file mode 100644 index 000000000..ee174f1d4 Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/experimentalbattery.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/perfecthighvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/perfecthighvoltagecable.png new file mode 100644 index 000000000..0f62bdee5 Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/perfecthighvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/perfectlowvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/perfectlowvoltagecable.png new file mode 100644 index 000000000..30dc58c23 Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/perfectlowvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/perfectmediumvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/perfectmediumvoltagecable.png new file mode 100644 index 000000000..65bebd64a Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/perfectmediumvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/perfectveryhighvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/perfectveryhighvoltagecable.png new file mode 100644 index 000000000..3f935e63b Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/perfectveryhighvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/qualityhighvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/qualityhighvoltagecable.png new file mode 100644 index 000000000..5bd59d260 Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/qualityhighvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/qualitylowvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/qualitylowvoltagecable.png new file mode 100644 index 000000000..c4f843e22 Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/qualitylowvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/qualitymediumvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/qualitymediumvoltagecable.png new file mode 100644 index 000000000..a126667c4 Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/qualitymediumvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/qualityveryhighvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/qualityveryhighvoltagecable.png new file mode 100644 index 000000000..e2d10c31f Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/qualityveryhighvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/shoddyhighvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/shoddyhighvoltagecable.png new file mode 100644 index 000000000..a6d3953ec Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/shoddyhighvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/shoddylowvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/shoddylowvoltagecable.png new file mode 100644 index 000000000..a57d48221 Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/shoddylowvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/shoddymediumvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/shoddymediumvoltagecable.png new file mode 100644 index 000000000..b1dad799d Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/shoddymediumvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/shoddyveryhighvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/shoddyveryhighvoltagecable.png new file mode 100644 index 000000000..a8f446a20 Binary files /dev/null and b/src/main/resources/assets/eln/textures/blocks/shoddyveryhighvoltagecable.png differ diff --git a/src/main/resources/assets/eln/textures/blocks/highvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/standardhighvoltagecable.png similarity index 100% rename from src/main/resources/assets/eln/textures/blocks/highvoltagecable.png rename to src/main/resources/assets/eln/textures/blocks/standardhighvoltagecable.png diff --git a/src/main/resources/assets/eln/textures/blocks/lowvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/standardlowvoltagecable.png similarity index 100% rename from src/main/resources/assets/eln/textures/blocks/lowvoltagecable.png rename to src/main/resources/assets/eln/textures/blocks/standardlowvoltagecable.png diff --git a/src/main/resources/assets/eln/textures/blocks/mediumvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/standardmediumvoltagecable.png similarity index 100% rename from src/main/resources/assets/eln/textures/blocks/mediumvoltagecable.png rename to src/main/resources/assets/eln/textures/blocks/standardmediumvoltagecable.png diff --git a/src/main/resources/assets/eln/textures/blocks/veryhighvoltagecable.png b/src/main/resources/assets/eln/textures/blocks/standardveryhighvoltagecable.png similarity index 100% rename from src/main/resources/assets/eln/textures/blocks/veryhighvoltagecable.png rename to src/main/resources/assets/eln/textures/blocks/standardveryhighvoltagecable.png diff --git a/src/main/resources/assets/eln/textures/items/2xgraphiterods.png b/src/main/resources/assets/eln/textures/items/2xgraphiterods.png new file mode 100644 index 000000000..16595f0f7 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/2xgraphiterods.png differ diff --git a/src/main/resources/assets/eln/textures/items/3xgraphiterods.png b/src/main/resources/assets/eln/textures/items/3xgraphiterods.png new file mode 100644 index 000000000..c67d151e5 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/3xgraphiterods.png differ diff --git a/src/main/resources/assets/eln/textures/items/4xgraphiterods.png b/src/main/resources/assets/eln/textures/items/4xgraphiterods.png new file mode 100644 index 000000000..45764aea9 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/4xgraphiterods.png differ diff --git a/src/main/resources/assets/eln/textures/items/canisterofarcwater.png b/src/main/resources/assets/eln/textures/items/canisterofarcwater.png new file mode 100644 index 000000000..69465ad16 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/canisterofarcwater.png differ diff --git a/src/main/resources/assets/eln/textures/items/canisterofwater.png b/src/main/resources/assets/eln/textures/items/canisterofwater.png new file mode 100644 index 000000000..22b7d26c4 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/canisterofwater.png differ diff --git a/src/main/resources/assets/eln/textures/items/copper_axe_blade.png b/src/main/resources/assets/eln/textures/items/copper_axe_blade.png new file mode 100644 index 000000000..099e35b99 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/copper_axe_blade.png differ diff --git a/src/main/resources/assets/eln/textures/items/copper_drill_spikes.png b/src/main/resources/assets/eln/textures/items/copper_drill_spikes.png new file mode 100644 index 000000000..4c22473a7 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/copper_drill_spikes.png differ diff --git a/src/main/resources/assets/eln/textures/items/copperfoldedplate.png b/src/main/resources/assets/eln/textures/items/copperfoldedplate.png new file mode 100644 index 000000000..b0d749685 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/copperfoldedplate.png differ diff --git a/src/main/resources/assets/eln/textures/items/copperfoldedplateinabucket.png b/src/main/resources/assets/eln/textures/items/copperfoldedplateinabucket.png new file mode 100644 index 000000000..03a2ee7cb Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/copperfoldedplateinabucket.png differ diff --git a/src/main/resources/assets/eln/textures/items/copperslag.png b/src/main/resources/assets/eln/textures/items/copperslag.png new file mode 100644 index 000000000..861c78c22 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/copperslag.png differ diff --git a/src/main/resources/assets/eln/textures/items/copperslagbucket.png b/src/main/resources/assets/eln/textures/items/copperslagbucket.png new file mode 100644 index 000000000..8713edee8 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/copperslagbucket.png differ diff --git a/src/main/resources/assets/eln/textures/items/diamonddust.png b/src/main/resources/assets/eln/textures/items/diamonddust.png new file mode 100644 index 000000000..cc0cf79f3 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/diamonddust.png differ diff --git a/src/main/resources/assets/eln/textures/items/ediamond_boots.png b/src/main/resources/assets/eln/textures/items/ediamond_boots.png new file mode 100644 index 000000000..c438d9fe7 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/ediamond_boots.png differ diff --git a/src/main/resources/assets/eln/textures/items/ediamond_chestplate.png b/src/main/resources/assets/eln/textures/items/ediamond_chestplate.png new file mode 100644 index 000000000..44640dfd8 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/ediamond_chestplate.png differ diff --git a/src/main/resources/assets/eln/textures/items/ediamond_helmet.png b/src/main/resources/assets/eln/textures/items/ediamond_helmet.png new file mode 100644 index 000000000..a846938a8 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/ediamond_helmet.png differ diff --git a/src/main/resources/assets/eln/textures/items/ediamond_leggings.png b/src/main/resources/assets/eln/textures/items/ediamond_leggings.png new file mode 100644 index 000000000..106ea51f6 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/ediamond_leggings.png differ diff --git a/src/main/resources/assets/eln/textures/items/elitechip.png b/src/main/resources/assets/eln/textures/items/elitechip.png new file mode 100644 index 000000000..954e02317 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/elitechip.png differ diff --git a/src/main/resources/assets/eln/textures/items/emod.png b/src/main/resources/assets/eln/textures/items/emod.png new file mode 100644 index 000000000..9a50d1e3d Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/emod.png differ diff --git a/src/main/resources/assets/eln/textures/items/gloriouscopperingot.png b/src/main/resources/assets/eln/textures/items/gloriouscopperingot.png new file mode 100644 index 000000000..cfb301579 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/gloriouscopperingot.png differ diff --git a/src/main/resources/assets/eln/textures/items/gloriouscopperplate.png b/src/main/resources/assets/eln/textures/items/gloriouscopperplate.png new file mode 100644 index 000000000..439c48d4c Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/gloriouscopperplate.png differ diff --git a/src/main/resources/assets/eln/textures/items/graphiterod.png b/src/main/resources/assets/eln/textures/items/graphiterod.png new file mode 100644 index 000000000..a649f60a6 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/graphiterod.png differ diff --git a/src/main/resources/assets/eln/textures/items/inertcanister.png b/src/main/resources/assets/eln/textures/items/inertcanister.png new file mode 100644 index 000000000..1015ae227 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/inertcanister.png differ diff --git a/src/main/resources/assets/eln/textures/items/irresponsibleelectricaldrill.png b/src/main/resources/assets/eln/textures/items/irresponsibleelectricaldrill.png new file mode 100644 index 000000000..a93b1d82a Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/irresponsibleelectricaldrill.png differ diff --git a/src/main/resources/assets/eln/textures/items/lapisdust.png b/src/main/resources/assets/eln/textures/items/lapisdust.png new file mode 100644 index 000000000..c54fec6f4 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/lapisdust.png differ diff --git a/src/main/resources/assets/eln/textures/items/ledplate.png b/src/main/resources/assets/eln/textures/items/ledplate.png new file mode 100644 index 000000000..7a91a04cc Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/ledplate.png differ diff --git a/src/main/resources/assets/eln/textures/items/moltencopperbucket.png b/src/main/resources/assets/eln/textures/items/moltencopperbucket.png new file mode 100644 index 000000000..761813de4 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/moltencopperbucket.png differ diff --git a/src/main/resources/assets/eln/textures/items/pepperedmoltencopperbucket.png b/src/main/resources/assets/eln/textures/items/pepperedmoltencopperbucket.png new file mode 100644 index 000000000..8186ff87e Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/pepperedmoltencopperbucket.png differ diff --git a/src/main/resources/assets/eln/textures/items/portableelectricalaxewithblade.png b/src/main/resources/assets/eln/textures/items/portableelectricalaxewithblade.png new file mode 100644 index 000000000..0dd19cf32 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/portableelectricalaxewithblade.png differ diff --git a/src/main/resources/assets/eln/textures/items/portableelectricalminingdrillwithspikes.png b/src/main/resources/assets/eln/textures/items/portableelectricalminingdrillwithspikes.png new file mode 100644 index 000000000..a9c035baa Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/portableelectricalminingdrillwithspikes.png differ diff --git a/src/main/resources/assets/eln/textures/items/purecopperingot.png b/src/main/resources/assets/eln/textures/items/purecopperingot.png new file mode 100644 index 000000000..bb8561bc1 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/purecopperingot.png differ diff --git a/src/main/resources/assets/eln/textures/items/resistivedust.png b/src/main/resources/assets/eln/textures/items/resistivedust.png new file mode 100644 index 000000000..20fc5bc6b Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/resistivedust.png differ diff --git a/src/main/resources/assets/eln/textures/items/seperatedmoltencopperbucket.png b/src/main/resources/assets/eln/textures/items/seperatedmoltencopperbucket.png new file mode 100644 index 000000000..f075affad Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/seperatedmoltencopperbucket.png differ diff --git a/src/main/resources/assets/eln/textures/items/silveringot.png b/src/main/resources/assets/eln/textures/items/silveringot.png new file mode 100644 index 000000000..a6f1ddfd3 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/silveringot.png differ diff --git a/src/main/resources/assets/eln/textures/items/syntheticdiamond.png b/src/main/resources/assets/eln/textures/items/syntheticdiamond.png new file mode 100644 index 000000000..a5703c50f Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/syntheticdiamond.png differ diff --git a/src/main/resources/assets/eln/textures/items/t1transmissioncable.png b/src/main/resources/assets/eln/textures/items/t1transmissioncable.png new file mode 100644 index 000000000..89cdb1710 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/t1transmissioncable.png differ diff --git a/src/main/resources/assets/eln/textures/items/t2transmissioncable.png b/src/main/resources/assets/eln/textures/items/t2transmissioncable.png new file mode 100644 index 000000000..45bed2dff Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/t2transmissioncable.png differ diff --git a/src/main/resources/assets/eln/textures/items/turboelectricaldrill.png b/src/main/resources/assets/eln/textures/items/turboelectricaldrill.png new file mode 100644 index 000000000..428a6a728 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/turboelectricaldrill.png differ diff --git a/src/main/resources/assets/eln/textures/items/unreleasedium.png b/src/main/resources/assets/eln/textures/items/unreleasedium.png new file mode 100644 index 000000000..24300dba3 Binary files /dev/null and b/src/main/resources/assets/eln/textures/items/unreleasedium.png differ diff --git a/src/main/resources/assets/eln/textures/voltages/creative.png b/src/main/resources/assets/eln/textures/voltages/creative.png new file mode 100644 index 000000000..277241555 Binary files /dev/null and b/src/main/resources/assets/eln/textures/voltages/creative.png differ