A bunch of small cleanups (GregTechCEu#67)

* Slight cleanup of unused constructors
Slight fix to Assembly Line JEI page
Remove Legacy method of specifying surface rocks

* Fix typo in Electric Furnace recipe map localization

src/main/java/gregtech/api/capability/impl/AbstractFuelInfo.java

@@ -12,10 +12,6 @@ public abstract class AbstractFuelInfo implements IFuelInfo {
     private int fuelMinConsumed;
     private long fuelBurnTime;
 
-    public AbstractFuelInfo(final int fuelRemaining, final int fuelCapacity, final int fuelMinConsumed, final int fuelBurnTime) {
-        this(fuelRemaining, fuelCapacity, fuelMinConsumed, (long) fuelBurnTime);
-    }
-
     public AbstractFuelInfo(final int fuelRemaining, final int fuelCapacity, final int fuelMinConsumed, final long fuelBurnTime) {
         this.fuelRemaining = fuelRemaining;
         this.fuelCapacity = fuelCapacity;

src/main/java/gregtech/api/util/BaseCreativeTab.java

@@ -12,10 +12,6 @@ public class BaseCreativeTab extends CreativeTabs {
     private final boolean hasSearchBar;
     private final Supplier<ItemStack> iconSupplier;
 
-    public BaseCreativeTab(String tabName, Supplier<ItemStack> iconSupplier) {
-        this(tabName, iconSupplier, false);
-    }
-
     public BaseCreativeTab(String TabName, Supplier<ItemStack> iconSupplier, boolean hasSearchBar) {
         super(TabName);
         this.iconSupplier = iconSupplier;

src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java

@@ -88,14 +88,6 @@ public void initializeFromConfig(JsonObject configRoot) {
         if (configRoot.has("generation_predicate")) {
             this.generationPredicate = PredicateConfigUtils.createBlockStatePredicate(configRoot.get("generation_predicate"));
         }
-        //legacy surface rock specifier support
-        if (configRoot.has("surface_stone_material")) {
-            Material surfaceStoneMaterial = OreConfigUtils.getMaterialByName(configRoot.get("surface_stone_material").getAsString());
-            if (!surfaceStoneMaterial.hasProperty(PropertyKey.ORE)) {
-                throw new IllegalArgumentException("Material " + surfaceStoneMaterial + " doesn't have surface rock variant");
-            }
-            this.veinPopulator = new SurfaceRockPopulator(surfaceStoneMaterial);
-        }
         if (configRoot.has("vein_populator")) {
             JsonObject object = configRoot.get("vein_populator").getAsJsonObject();
             this.veinPopulator = WorldGenRegistry.INSTANCE.createVeinPopulator(object);

src/main/java/gregtech/api/worldgen/populator/SurfaceRockPopulator.java

@@ -59,7 +59,7 @@ private Set<Material> findUndergroundMaterials(Collection<IBlockState> generated
             } else {
                 ItemStack itemStack = new ItemStack(blockState.getBlock(), 1, blockState.getBlock().damageDropped(blockState));
                 UnificationEntry entry = OreDictUnifier.getUnificationEntry(itemStack);
-                resultMaterial = entry == null ? null : (Material) entry.material;
+                resultMaterial = entry == null ? null : entry.material;
             }
             if (resultMaterial != null) {
                 result.add(resultMaterial);

src/main/java/gregtech/integration/jei/multiblock/infos/AssemblyLineInfo.java

@@ -75,7 +75,7 @@ protected void generateBlockTooltips() {
 
         ITextComponent inputTooltip = new TextComponentTranslation(
                 "gregtech.multiblock.preview.only",
-                new TextComponentTranslation("gregtech.machine.item_bus.export.ulv.name"))
+                new TextComponentTranslation("gregtech.machine.item_bus.import.ulv.name"))
                 .setStyle(new Style().setColor(TextFormatting.RED));
 
         for (int i = 0; i < GTValues.UHV + 1; i++) {

src/main/resources/assets/gregtech/lang/en_us.lang

@@ -1869,7 +1869,7 @@ recipemap.ore_washer.name=Ore Washer
 recipemap.thermal_centrifuge.name=Thermal Centrifuge
 recipemap.extractor.name=Extractor
 recipemap.recycler.name=Recycler
-recipemap.electic_furnace.name=Furnace
+recipemap.electric_furnace.name=Furnace
 recipemap.scanner.name=Scanner
 recipemap.rockbreaker.name=Rock Breaker
 recipemap.byproductlist.name=Ore Byproduct List

src/main/resources/assets/gregtech/lang/ru_ru.lang

@@ -1607,7 +1607,7 @@ recipemap.ore_washer.name=Рудопромывщик
 recipemap.thermal_centrifuge.name=Термальная центрифуга
 recipemap.extractor.name=Экстрактор
 recipemap.recycler.name=Переработчик
-recipemap.electic_furnace.name=Печь
+recipemap.electric_furnace.name=Печь
 recipemap.scanner.name=Сканер
 recipemap.rockbreaker.name=Разрушитель породы
 recipemap.byproductlist.name=Список побочных продуктов руды

src/main/resources/assets/gregtech/lang/zh_cn.lang

@@ -1392,7 +1392,7 @@ recipemap.ore_washer.name=洗矿场
 recipemap.thermal_centrifuge.name=热力离心机
 recipemap.extractor.name=提取机
 recipemap.recycler.name=回收机
-recipemap.electic_furnace.name=炉
+recipemap.electric_furnace.name=炉
 recipemap.scanner.name=扫描仪
 recipemap.rockbreaker.name=碎石机
 recipemap.byproductlist.name=矿物副产列表
@@ -3405,4 +3405,156 @@ info.infinite_energy.umv=Voltage: UMV
 info.infinite_energy.uxv=Voltage: UXV
 info.infinite_energy.max=Voltage: MAX
 gregtech.universal.clear_nbt_recipe.tooltip=§cThis will destroy all contents!
-gregtech.multiblock.primitive_water_pump.description=The Primitive Water Pump is a pre-Steam Era multiblock that collects water once per second, depending on the Biome it is in. It can use a Pump, ULV, or LV Output Hatch, increasing the amount of water per tier. Follows the formula: Biome Coefficient * Hatch Multiplier.
+gregtech.multiblock.primitive_water_pump.description=The Primitive Water Pump is a pre-Steam Era multiblock that collects water once per second, depending on the Biome it is in. It can use a Pump, ULV, or LV Output Hatch, increasing the amount of water per tier. Follows the formula: Biome Coefficient * Hatch Multiplier.gregtech.machine.steam_grinder.name=Steam Grinder
+gregtech.machine.steam_grinder.tooltip=Macerates up to 8 items per craft. Takes 1.5x base duration to process, not affected by number of items. Requires §eSteam Hatches and Buses
+gregtech.multiblock.steam_grinder.description=A Multiblock Macerator at the Steam Age. Requires at least 14 Bronze Casings to form. Cannot use normal Input/Output busses, nor Fluid Hatches other than the Steam Hatch.
+gregtech.multiblock.steam.low_steam=Not enough Steam to run!
+gregtech.multiblock.steam.steam_stored=Steam: %s / %s mb
+gregtech.machine.steam_hatch.name=Steam Hatch
+gregtech.machine.steam.steam_hatch.tooltip=Accepted Fluid: §eSteam
+gregtech.machine.steam_import_bus.name=Input Bus (Steam)
+gregtech.machine.steam_export_bus.name=Output Bus (Steam)
+gregtech.machine.steam_bus.tooltip=Does not work with non-steam multiblocks
+gregtech.machine.steam_oven.name=Steam Oven
+gregtech.machine.steam_oven.tooltip=Smelts up to 8 items per craft. Takes 1.5x base duration to process, not affected by number of items. Requires §eSteam Hatches and Buses
+gregtech.multiblock.steam_oven.description=A Multi Smelter at the Steam Age. Requires at least 6 Bronze Casings to form. Cannot use normal Input/Output busses, nor Fluid Hatches other than the Steam Hatch. Steam Hatch must be on the bottom layer, no more than one.
+metaitem.credit.neutronium.name=Neutronium Credit
+metaitem.credit.neutronium.tooltip=262144 Credits
+metaitem.shape.extruder.gear_small.name=Extruder Shape (Small Gear)
+metaitem.shape.extruder.gear_small.tooltip=Extruder Shape for making Small Gears
+metaitem.shape.extruder.foil.name=Extruder Shape (Foil)
+metaitem.shape.extruder.foil.tooltip=Extruder Shape for making Foils from Non-Metals
+metaitem.shape.extruder.rod_long.name=Extruder Shape (Long Rod)
+metaitem.shape.extruder.rod_long.tooltip=Extruder Shape for making Long Rods
+metaitem.max.battery.tooltip=Fill this to win minecraft
+metaitem.voltage_coil.ulv.name=Ultra Low Voltage Coil
+metaitem.voltage_coil.ulv.tooltip=Primitive Coil
+metaitem.voltage_coil.lv.name=Low Voltage Coil
+metaitem.voltage_coil.lv.tooltip=Basic Coil
+metaitem.voltage_coil.mv.name=Medium Voltage Coil
+metaitem.voltage_coil.mv.tooltip=Good Coil
+metaitem.voltage_coil.hv.name=High Voltage Coil
+metaitem.voltage_coil.hv.tooltip=Advanced Coil
+metaitem.voltage_coil.ev.name=Extreme Voltage Coil
+metaitem.voltage_coil.ev.tooltip=Extreme Coil
+metaitem.voltage_coil.iv.name=Insane Voltage Coil
+metaitem.voltage_coil.iv.tooltip=Elite Coil
+metaitem.voltage_coil.luv.name=Ludicrous Voltage Coil
+metaitem.voltage_coil.luv.tooltip=Master Coil
+metaitem.voltage_coil.zpm.name=ZPM Voltage Coil
+metaitem.voltage_coil.zpm.tooltip=Ultimate Coil
+metaitem.voltage_coil.uv.name=Ultimate Voltage Coil
+metaitem.voltage_coil.uv.tooltip=Superconductor Coil
+metaitem.voltage_coil.uhv.name=Highly Ultimate Voltage Coil
+metaitem.voltage_coil.uhv.tooltip=Infinite Coil
+metaitem.voltage_coil.uev.name=Extremely Ultimate Voltage Coil
+metaitem.voltage_coil.uev.tooltip=Ultra Coil
+metaitem.voltage_coil.uiv.name=Insanely Ultimate Voltage Coil
+metaitem.voltage_coil.uiv.tooltip=Insane Coil
+metaitem.voltage_coil.umv.name=Mega Ultimate Voltage Coil
+metaitem.voltage_coil.umv.tooltip=UMV Coil
+metaitem.voltage_coil.uxv.name=Extended Mega Ultimate Voltage Coil
+metaitem.voltage_coil.uxv.tooltip=UXV Coil
+metaitem.voltage_coil.max.name=Maximum Voltage Coil
+metaitem.voltage_coil.max.tooltip=Maximum Coil
+cover.conveyor.distribution.enabled=Item distribution mode for item pipes/n§bInsert First
+cover.conveyor.distribution.disabled=Item distribution mode for item pipes/n§bRound Robin
+cover.conveyor.blocks_input.enabled=If enabled, items will not be inserted when cover is set to pull items from the inventory into pipe./n§aEnabled
+cover.conveyor.blocks_input.disabled=If enabled, items will not be inserted when cover is set to pull items from the inventory into pipe./n§cDisabled
+item.material.oreprefix.pipeTinyFluid=Tiny %s Fluid Pipe
+item.material.oreprefix.pipeSmallFluid=Small %s Fluid Pipe
+item.material.oreprefix.pipeNormalFluid=Normal %s Fluid Pipe
+item.material.oreprefix.pipeLargeFluid=Large %s Fluid Pipe
+item.material.oreprefix.pipeHugeFluid=Huge %s Fluid Pipe
+item.material.oreprefix.pipeTinyItem=Tiny %s Item Pipe
+item.material.oreprefix.pipeSmallItem=Small %s Item Pipe
+item.material.oreprefix.pipeNormalItem=Normal %s Item Pipe
+item.material.oreprefix.pipeLargeItem=Large %s Item Pipe
+item.material.oreprefix.pipeHugeItem=Huge %s Item Pipe
+item.material.oreprefix.pipeTinyRestrictive=Tiny Restrictive %s Item Pipe
+item.material.oreprefix.pipeSmallRestrictive=Small Restrictive %s Item Pipe
+item.material.oreprefix.pipeNormalRestrictive=Normal Restrictive %s Item Pipe
+item.material.oreprefix.pipeLargeRestrictive=Large Restrictive %s Item Pipe
+item.material.oreprefix.pipeHugeRestrictive=Huge Restrictive %s Item Pipe
+material.diesel=Diesel
+material.distilled_water=Distilled Water
+material.sodium_potassium=Sodium Potassium
+material.samarium_magnetic=Magnetic Samarium
+material.monochloramine=Monochloramine
+material.dimethylhydrazine=1,1-Dimethylhydrazine
+material.silicone_rubber=Silicone Rubber
+material.copper_sulfate_water_solution=Copper Sulfate Water Solution
+material.potin=Potin
+material.raw_gasoline=Raw Gasoline
+material.gasoline=Gasoline
+material.nitrous_oxide=Nitrous Oxide
+material.octane=Octane
+material.ethyl_tertbutyl_ether=Ethyl Tert-Butyl Ether
+material.gasoline_premium=High Octane Gasoline
+material.nitrobenzene=Nitrobenzene
+material.coal_gas=Coal Gas
+material.coal_tar=Coal Tar
+material.ethylbenzene=Ethylbenzene
+material.naphthalene=Naphthalene
+item.silicone_rubber.dustTiny=Tiny Pile of Silicone Rubber Pulp
+item.silicone_rubber.dustSmall=Small Pile of Silicone Rubber Pulp
+item.silicone_rubber.dust=Silicone Rubber Pulp
+item.silicone_rubber.nugget=Silicone Rubber Chip
+item.silicone_rubber.ingot=Silicone Rubber Bar
+item.silicone_rubber.plate=Silicone Rubber Sheet
+item.silicone_rubber.foil=Thin Silicone Rubber Sheet
+recipemap.mass_fabricator.name=Mass Fabricator
+gregtech.machine.mass_fabricator.tooltip=UUM
+gregtech.machine.mass_fabricator.lv.name=Basic Mass Fabricator
+gregtech.machine.mass_fabricator.mv.name=Advanced Mass Fabricator
+gregtech.machine.mass_fabricator.hv.name=Advanced Mass Fabricator II
+gregtech.machine.mass_fabricator.ev.name=Advanced Mass Fabricator III
+gregtech.machine.mass_fabricator.iv.name=Elite Mass Fabricator
+gregtech.machine.mass_fabricator.luv.name=Elite Mass Fabricator II
+gregtech.machine.mass_fabricator.zpm.name=Elite Mass Fabricator III
+gregtech.machine.mass_fabricator.uv.name=Elite Mass Fabricator IV
+gregtech.machine.mass_fabricator.uhv.name=High-Tech Mass Fabricator
+gregtech.machine.mass_fabricator.uev.name=High-Tech Mass Fabricator II
+gregtech.machine.mass_fabricator.uiv.name=High-Tech Mass Fabricator III
+gregtech.machine.mass_fabricator.umv.name=High-Tech Mass Fabricator IV
+gregtech.machine.mass_fabricator.uxv.name=Ultimate Mass Fabricator
+gregtech.machine.replicator.tooltip=Producing the Purest of Elements
+gregtech.machine.replicator.lv.name=Basic Replicator
+gregtech.machine.replicator.mv.name=Advanced Replicator
+gregtech.machine.replicator.hv.name=Advanced Replicator II
+gregtech.machine.replicator.ev.name=Advanced Replicator III
+gregtech.machine.replicator.iv.name=Elite Replicator
+gregtech.machine.replicator.luv.name=Elite Replicator II
+gregtech.machine.replicator.zpm.name=Elite Replicator III
+gregtech.machine.replicator.uv.name=Elite Replicator IV
+gregtech.machine.replicator.uhv.name=High-Tech Replicator
+gregtech.machine.replicator.uev.name=High-Tech Replicator II
+gregtech.machine.replicator.uiv.name=High-Tech Replicator III
+gregtech.machine.replicator.umv.name=High-Tech Replicator IV
+gregtech.machine.replicator.uxv.name=Ultimate Replicator
+gregtech.machine.scanner.tooltip=Scans Materials and other things
+gregtech.machine.scanner.lv.name=Basic Scanner
+gregtech.machine.scanner.mv.name=Advanced Scanner
+gregtech.machine.scanner.hv.name=Advanced Scanner II
+gregtech.machine.scanner.ev.name=Advanced Scanner III
+gregtech.machine.scanner.iv.name=Elite Scanner
+gregtech.machine.scanner.luv.name=Elite Scanner II
+gregtech.machine.scanner.zpm.name=Elite Scanner III
+gregtech.machine.scanner.uv.name=Elite Scanner IV
+gregtech.machine.scanner.uhv.name=High-Tech Scanner
+gregtech.machine.scanner.uev.name=High-Tech Scanner II
+gregtech.machine.scanner.uiv.name=High-Tech Scanner III
+gregtech.machine.scanner.umv.name=High-Tech Scanner IV
+gregtech.machine.scanner.uxv.name=Ultimate Scanner
+gregtech.machine.transformer.ulv.name=Ultra Low Voltage Transformer
+gregtech.universal.disabled=Sharing between Multiblocks: §4Disabled
+gregtech.universal.enabled=Sharing between Multiblocks: §aEnabled
+gregtech.item_pipe.rate_items=§9Transfer Rate: %d items/s
+gregtech.item_pipe.rate_stacks=§9Transfer Rate: %d stacks/s
+gregtech.item_pipe.priority=§9Priority: %d
+gregtech.cover.energy_detector.message_electricity_storage_normal=Monitoring Normal Electricity Storage
+gregtech.cover.energy_detector.message_electricity_storage_inverted=Monitoring Inverted Electricity Storage
+gregtech.cover.fluid_detector.message_fluid_storage_normal=Monitoring Normal Fluid Storage
+gregtech.cover.fluid_detector.message_fluid_storage_inverted=Monitoring Inverted Fluid Storage
+gregtech.cover.item_detector.message_item_storage_normal=Monitoring Normal Item Storage
+gregtech.cover.item_detector.message_item_storage_inverted=Monitoring Inverted Item Storage