From 7b630f576f2f2ede913a2df5787f4d5ec8501f09 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 20 Jul 2018 17:23:21 +0300 Subject: [PATCH] Polishing powered items --- .../techreborn/config/ConfigTechReborn.java | 8 +-- src/main/java/techreborn/init/ModItems.java | 18 ++--- .../items/battery/ItemEnergyCrystal.java | 4 +- .../items/battery/ItemLapotronCrystal.java | 4 +- .../items/battery/ItemLapotronicOrb.java | 4 +- .../items/tools/ItemAdvancedChainsaw.java | 1 + .../items/tools/ItemAdvancedDrill.java | 1 + .../items/tools/ItemAdvancedJackhammer.java | 1 + .../items/tools/ItemDiamondChainsaw.java | 1 + .../items/tools/ItemDiamondDrill.java | 1 + .../items/tools/ItemDiamondJackhammer.java | 1 + .../items/tools/ItemSteelChainsaw.java | 2 +- .../items/tools/ItemSteelDrill.java | 2 +- .../assets/techreborn/lang/en_us.lang | 72 +++++++++---------- 14 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index ae7b18b28..a7bef4f69 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -39,8 +39,8 @@ public class ConfigTechReborn { @ConfigRegistry(config = "items", category = "power", key = "nanoSaberCharge", comment = "Energy Capacity for Nano Saber (FE)") public static int nanoSaberCharge = 640_000; - @ConfigRegistry(config = "items", category = "power", key = "ironDrillCharge", comment = "Energy Capacity for Iron Drill (FE)") - public static int IronDrillCharge = 40_000; + @ConfigRegistry(config = "items", category = "power", key = "steelDrillCharge", comment = "Energy Capacity for Steel Drill (FE)") + public static int SteelDrillCharge = 40_000; @ConfigRegistry(config = "items", category = "power", key = "diamondDrillCharge", comment = "Energy Capacity for Diamond Drill (FE)") public static int DiamondDrillCharge = 400_000; @@ -48,8 +48,8 @@ public class ConfigTechReborn { @ConfigRegistry(config = "items", category = "power", key = "advancedDrillCharge", comment = "Energy Capacity for Advanced Drill (FE)") public static int AdvancedDrillCharge = 4_000_000; - @ConfigRegistry(config = "items", category = "power", key = "ironChainsawCharge", comment = "Energy Capacity for Iron Chainsaw (FE)") - public static int IronChainsawCharge = 40_000; + @ConfigRegistry(config = "items", category = "power", key = "steelChainsawCharge", comment = "Energy Capacity for Steel Chainsaw (FE)") + public static int SteelChainsawCharge = 40_000; @ConfigRegistry(config = "items", category = "power", key = "diamondChainsawCharge", comment = "Energy Capacity for Diamond Chainsaw (FE)") public static int DiamondChainsawCharge = 400_000; diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 84ab2552a..10c4f043f 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -206,25 +206,25 @@ public class ModItems { registerItem(ELECTRIC_TREE_TAP, "electricTreetap"); STEEL_DRILL = new ItemSteelDrill(); - registerItem(STEEL_DRILL, "irondrill"); + registerItem(STEEL_DRILL, "steelDrill"); DIAMOND_DRILL = new ItemDiamondDrill(); - registerItem(DIAMOND_DRILL, "diamonddrill"); + registerItem(DIAMOND_DRILL, "diamondDrill"); ADVANCED_DRILL = new ItemAdvancedDrill(); - registerItem(ADVANCED_DRILL, "advanceddrill"); + registerItem(ADVANCED_DRILL, "advancedDrill"); STEEL_CHAINSAW = new ItemSteelChainsaw(); - registerItem(STEEL_CHAINSAW, "ironchainsaw"); + registerItem(STEEL_CHAINSAW, "steelChainsaw"); DIAMOND_CHAINSAW = new ItemDiamondChainsaw(); - registerItem(DIAMOND_CHAINSAW, "diamondchainsaw"); + registerItem(DIAMOND_CHAINSAW, "diamondChainsaw"); ADVANCED_CHAINSAW = new ItemAdvancedChainsaw(); - registerItem(ADVANCED_CHAINSAW, "advancedchainsaw"); + registerItem(ADVANCED_CHAINSAW, "advancedChainsaw"); STEEL_JACKHAMMER = new ItemSteelJackhammer(); - registerItem(STEEL_JACKHAMMER, "steeljackhammer"); + registerItem(STEEL_JACKHAMMER, "steelJackhammer"); DIAMOND_JACKHAMMER = new ItemDiamondJackhammer(); - registerItem(DIAMOND_JACKHAMMER, "diamondjackhammer"); + registerItem(DIAMOND_JACKHAMMER, "diamondJackhammer"); ADVANCED_JACKHAMMER = new ItemAdvancedJackhammer(); - registerItem(ADVANCED_JACKHAMMER, "ironjackhammer"); + registerItem(ADVANCED_JACKHAMMER, "advancedJackhammer"); if (ConfigTechReborn.enableGemArmorAndTools) { BRONZE_SWORD = new ItemTRSword(Reference.BRONZE, "ingotBronze"); diff --git a/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java b/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java index 165a4db0c..210a2dafa 100644 --- a/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java @@ -34,9 +34,9 @@ import techreborn.init.ModItems; public class ItemEnergyCrystal extends ItemBattery { - // 4M FE storage with 10k charge rate + // 4M FE storage with 1k charge rate public ItemEnergyCrystal() { - super("energyCrystal", ConfigTechReborn.EnergyCrystalMaxCharge, 10_000); + super("energyCrystal", ConfigTechReborn.EnergyCrystalMaxCharge, 1_000); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java index 0fe92f3e5..d46a6b34a 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java @@ -34,9 +34,9 @@ import techreborn.init.ModItems; public class ItemLapotronCrystal extends ItemBattery { - // 40M FE capacity with 40k FE\t charge rate + // 40M FE capacity with 10k FE\t charge rate public ItemLapotronCrystal() { - super("lapotronCrystal", ConfigTechReborn.LapotronCrystalMaxCharge, 40_000); + super("lapotronCrystal", ConfigTechReborn.LapotronCrystalMaxCharge, 10_000); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java index 1e462cde6..748bb6b16 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java @@ -34,9 +34,9 @@ import techreborn.init.ModItems; public class ItemLapotronicOrb extends ItemBattery { - // 400M capacity with 40k FE\t charge rate + // 400M capacity with 100k FE\t charge rate public ItemLapotronicOrb() { - super("lapotronicorb", ConfigTechReborn.LapotronicOrbMaxCharge, 40_000); + super("lapotronicorb", ConfigTechReborn.LapotronicOrbMaxCharge, 100_000); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java index 4dafd0146..cd4858b5d 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java @@ -42,6 +42,7 @@ import techreborn.init.ModItems; public class ItemAdvancedChainsaw extends ItemChainsaw { + // 4M FE max charge with 1k charge rate public ItemAdvancedChainsaw() { super(ToolMaterial.DIAMOND, "techreborn.advancedChainsaw", ConfigTechReborn.AdvancedChainsawCharge, 1.0F); diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 790d66119..9d44576b4 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -49,6 +49,7 @@ import javax.annotation.Nullable; public class ItemAdvancedDrill extends ItemDrill { + // 4M FE max charge with 1k charge rate public ItemAdvancedDrill() { super(ToolMaterial.DIAMOND, "techreborn.advancedDrill", ConfigTechReborn.AdvancedDrillCharge, 2.0F, 10F); this.cost = 250; diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java index 14e1c28d5..81ac57ead 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java @@ -34,6 +34,7 @@ import techreborn.init.ModItems; public class ItemAdvancedJackhammer extends ItemJackhammer { + // 4M FE max charge with 1k charge rate public ItemAdvancedJackhammer() { super(ToolMaterial.IRON, "techreborn.advancedJackhammer", ConfigTechReborn.AdvancedJackhammerCharge); this.cost = 250; diff --git a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java index e9fc0ef03..1181774ab 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java @@ -36,6 +36,7 @@ import techreborn.init.ModItems; public class ItemDiamondChainsaw extends ItemChainsaw { + // 400k max charge with 1k charge rate public ItemDiamondChainsaw() { super(ToolMaterial.DIAMOND, "techreborn.diamondChainsaw", ConfigTechReborn.DiamondChainsawCharge, 1.0F); this.cost = 250; diff --git a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java index dffcd74e7..164bbb44d 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java @@ -36,6 +36,7 @@ import techreborn.init.ModItems; public class ItemDiamondDrill extends ItemDrill { + // 400k max charge with 1k charge rate public ItemDiamondDrill() { super(ToolMaterial.DIAMOND, "techreborn.diamondDrill", ConfigTechReborn.DiamondDrillCharge, 0.5F, 15F); this.cost = 250; diff --git a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java index 10857cf5e..5a5b70550 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java @@ -34,6 +34,7 @@ import techreborn.init.ModItems; public class ItemDiamondJackhammer extends ItemJackhammer { + // 400k max charge with 1k charge rate public ItemDiamondJackhammer() { super(ToolMaterial.DIAMOND, "techreborn.diamondJackhammer", ConfigTechReborn.DiamondJackhammerCharge); this.cost = 100; diff --git a/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java index 4155acc3a..fca46f7b1 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java @@ -37,7 +37,7 @@ import techreborn.init.ModItems; public class ItemSteelChainsaw extends ItemChainsaw { public ItemSteelChainsaw() { - super(ToolMaterial.IRON, "techreborn.ironChainsaw", ConfigTechReborn.IronChainsawCharge, 0.5F); + super(ToolMaterial.IRON, "techreborn.steelChainsaw", ConfigTechReborn.SteelChainsawCharge, 0.5F); this.cost = 50; } diff --git a/src/main/java/techreborn/items/tools/ItemSteelDrill.java b/src/main/java/techreborn/items/tools/ItemSteelDrill.java index f73201195..226e78432 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelDrill.java +++ b/src/main/java/techreborn/items/tools/ItemSteelDrill.java @@ -37,7 +37,7 @@ import techreborn.init.ModItems; public class ItemSteelDrill extends ItemDrill { public ItemSteelDrill() { - super(ToolMaterial.IRON, "techreborn.ironDrill", ConfigTechReborn.IronDrillCharge, 0.5F, 10F); + super(ToolMaterial.IRON, "techreborn.steelDrill", ConfigTechReborn.SteelDrillCharge, 0.5F, 10F); this.cost = 50; } diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index 202e08211..46c771d8d 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -64,7 +64,6 @@ tile.techreborn:solar_panel.hybrid.name=Hybrid Solar Panel tile.techreborn:solar_panel.advanced.name=Advanced Solar Panel tile.techreborn:solar_panel.ultimate.name=Ultimate Solar Panel tile.techreborn:solar_panel.quantum.name=Quantum Solar Panel - tile.techreborn:creative_solar_panel.name=Creative Panel tile.techreborn:water_mill.name=Water Mill tile.techreborn:wind_mill.name=Wind Mill @@ -91,11 +90,9 @@ tile.techreborn:rubber_plank_slab.name=Rubber Plank Slab tile.techreborn:rubber_plank_stair.name=Rubber Plank Stair tile.techreborn:rubber_leaves.name=Rubber Leaves tile.techreborn:rubber_sapling.name=Rubber Sapling - tile.techreborn:refined_iron_fence.name=Iron Fence tile.techreborn:lamp_incandescent.name=Incandescent Lamp tile.techreborn:lamp_led.name=LED Lamp - tile.techreborn:alarm.name=Alarm #Ores @@ -299,19 +296,6 @@ item.techreborn.dust.andesite.name=Andesite Dust item.techreborn.dust.diorite.name=Diorite Dust item.techreborn.dust.granite.name=Granite Dust -item.techreborn.wrench.name=Wrench -tile.techreborn:cable.copper.name=Copper Cable -tile.techreborn:cable.tin.name=Tin Cable -tile.techreborn:cable.gold.name=Gold Cable -tile.techreborn:cable.hv.name=HV Cable -tile.techreborn:cable.glassfiber.name=Glass Fiber Cable -tile.techreborn:cable.insulatedcopper.name=Insulated Copper Cable -tile.techreborn:cable.insulatedgold.name=Insulated Gold Cable -tile.techreborn:cable.insulatedhv.name=Insulated HV Cable -item.techreborn.scrapbox.name=Scrap Box -item.techreborn.part.carbon_mesh.name=Carbon Mesh -item.techreborn.part.carbon_fiber.name=Carbon Fiber - #Small Dusts item.techreborn.dustsmall.almandine.name=Small Pile of Almandine Dust item.techreborn.dustsmall.aluminum.name=Small Pile of Aluminium Dust @@ -379,21 +363,6 @@ item.techreborn.dustsmall.andesite.name=Small Pile of Andesite Dust item.techreborn.dustsmall.diorite.name=Small Pile of Diorite Dust item.techreborn.dustsmall.granite.name=Small Pile of Granite Dust -item.techreborn.cell.name=Empty Cell -item.techreborn.cell.fluid.name=$fluid$ Cell -item.techreborn.rebattery.name=Battery -item.techreborn.lithiumBattery.name=Lithium Battery -item.techreborn.energyCrystal.name=Energy Crystal -item.techreborn.lapotronCrystal.name=Lapotron Crystal -item.techreborn.treetap.name=Treetap -item.techreborn.nanosaber.name=Nanosaber -item.techreborn.upgrade.overclock.name=Overclocker Upgrade -item.techreborn.upgrade.transformer.name=Transformer Upgrade -item.techreborn.upgrade.energy_storage.name=Energy Storage Upgrade -item.techreborn.upgrade.ejection.name=Ejector Upgrade -item.techreborn.upgrade.injection.name=Importer Upgrade -item.techreborn.electric_treetap.name=Electric Treetap - #Gems item.techreborn.gem.ruby.name=Ruby item.techreborn.gem.sapphire.name=Sapphire @@ -496,10 +465,6 @@ item.techreborn.plate.magnalium.name=Magnalium Plate item.techreborn.plate.iridium_alloy.name=Iridium Alloy Plate #Parts -item.techreborn.part.energy_flow_circuit.name=Energy Flow Circuit -item.techreborn.part.data_control_circuit.name=Data Control Circuit -item.techreborn.part.data_orb.name=Data Orb -item.techreborn.part.data_storage_circuit.name=Data Storage Circuit item.techreborn.part.diamond_grinding_head.name=Diamond Grinding Head item.techreborn.part.diamond_saw_blade.name=Diamond Saw Blade item.techreborn.part.tungsten_grinding_head.name=Tungsten Grinding Head @@ -529,21 +494,25 @@ item.techreborn.part.rubber.name=Rubber item.techreborn.part.scrap.name=Scrap item.techreborn.part.electronic_circuit.name=Electronic Circuit item.techreborn.part.advanced_circuit.name=Advanced Electronic Circuit +item.techreborn.part.energy_flow_circuit.name=Energy Flow Circuit +item.techreborn.part.data_control_circuit.name=Data Control Circuit +item.techreborn.part.data_orb.name=Data Orb +item.techreborn.part.data_storage_circuit.name=Data Storage Circuit item.techreborn.part.coolant_simple.name=10k Coolant Cell item.techreborn.part.coolant_triple.name=30k Coolant Cell item.techreborn.part.coolant_six.name=60k Coolant Cell - -item.techreborn.frequencyTransmitter.name=Frequency Transmitter +item.techreborn.part.carbon_mesh.name=Carbon Mesh +item.techreborn.part.carbon_fiber.name=Carbon Fiber #Tools item.techreborn.rockcutter.name=Rockcutter item.techreborn.lithiumbatpack.name=Lithium Batpack item.techreborn.lapotronpack.name=Lapotronic Orbpack item.techreborn.omniTool.name=Omni-Tool -item.techreborn.ironDrill.name=Steel Drill +item.techreborn.steelDrill.name=Steel Drill item.techreborn.diamondDrill.name=Diamond Drill item.techreborn.advancedDrill.name=Advanced Drill -item.techreborn.ironChainsaw.name=Steel Chainsaw +item.techreborn.steelChainsaw.name=Steel Chainsaw item.techreborn.diamondChainsaw.name=Diamond Chainsaw item.techreborn.advancedChainsaw.name=Advanced Chainsaw item.techreborn.lapotronicorb.name=Lapotronic Energy Orb @@ -551,6 +520,9 @@ item.techreborn.cloakingdevice.name=Cloaking Device item.techreborn.steelJackhammer.name=Steel Jackhammer item.techreborn.diamondJackhammer.name=Diamond Jackhammer item.techreborn.advancedJackhammer.name=Advanced Jackhammer +item.techreborn.treetap.name=Treetap +item.techreborn.electric_treetap.name=Electric Treetap +item.techreborn.nanosaber.name=Nanosaber item.bronzeSword.name=Bronze Sword item.bronzePickaxe.name=Bronze Pickaxe @@ -632,6 +604,28 @@ fluid.fluidwolframium=Wolframium item.techreborn.uuMatter.name=UU-Matter item.techreborn.manual.name=Tech Manual item.techreborn.debug.name=Debug Tool +item.techreborn.frequencyTransmitter.name=Frequency Transmitter +item.techreborn.upgrade.overclock.name=Overclocker Upgrade +item.techreborn.upgrade.transformer.name=Transformer Upgrade +item.techreborn.upgrade.energy_storage.name=Energy Storage Upgrade +item.techreborn.upgrade.ejection.name=Ejector Upgrade +item.techreborn.upgrade.injection.name=Importer Upgrade +item.techreborn.cell.name=Empty Cell +item.techreborn.cell.fluid.name=$fluid$ Cell +item.techreborn.rebattery.name=Battery +item.techreborn.lithiumBattery.name=Lithium Battery +item.techreborn.energyCrystal.name=Energy Crystal +item.techreborn.lapotronCrystal.name=Lapotron Crystal +item.techreborn.wrench.name=Wrench +tile.techreborn:cable.copper.name=Copper Cable +tile.techreborn:cable.tin.name=Tin Cable +tile.techreborn:cable.gold.name=Gold Cable +tile.techreborn:cable.hv.name=HV Cable +tile.techreborn:cable.glassfiber.name=Glass Fiber Cable +tile.techreborn:cable.insulatedcopper.name=Insulated Copper Cable +tile.techreborn:cable.insulatedgold.name=Insulated Gold Cable +tile.techreborn:cable.insulatedhv.name=Insulated HV Cable +item.techreborn.scrapbox.name=Scrap Box #Message techreborn.message.missingmultiblock=Incomplete Multiblock