From 8a4aafb042c6965a04c6a14c49a9d9fe9c0c6e99 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 30 Jan 2018 23:32:45 +0000 Subject: [PATCH] Add some missing configs + small cleanup --- src/main/java/techreborn/Core.java | 2 - .../techreborn/config/ConfigTechReborn.java | 33 ++++++++++-- src/main/java/techreborn/init/ModParts.java | 54 ------------------- 3 files changed, 29 insertions(+), 60 deletions(-) delete mode 100644 src/main/java/techreborn/init/ModParts.java diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 06ad0bab7..1a68edbc2 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -122,8 +122,6 @@ public class Core { public void init(FMLInitializationEvent event) throws IllegalAccessException, InstantiationException { // Registers Chest Loot // ModLoot.init(); - // Multiparts - ModParts.init(); // Sounds ModSounds.init(); // Compat diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 8e6d3b685..bd002b8f5 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -39,25 +39,50 @@ public class ConfigTechReborn { @ConfigRegistry(config = "misc", category = "general", key = "enableGemTools", comment = "Enable Gem armor and tools") public static boolean enableGemArmorAndTools = true; - //TODO give an annotation - //Tools + @ConfigRegistry(config = "items", category = "power", key = "ironDrillCharge", comment = "Energy Capacity for Iron Drill") public static int IronDrillCharge = 10000; + + @ConfigRegistry(config = "items", category = "power", key = "diamondDrillCharge", comment = "Energy Capacity for Diamond Drill") public static int DiamondDrillCharge = 100000; + + @ConfigRegistry(config = "items", category = "power", key = "advancedDrillCharge", comment = "Energy Capacity for Advanced Drill") public static int AdvancedDrillCharge = 1000000; + + @ConfigRegistry(config = "items", category = "power", key = "ironChainsawCharge", comment = "Energy Capacity for Iron Chainsaw") public static int IronChainsawCharge = 10000; + + @ConfigRegistry(config = "items", category = "power", key = "diamondChainsawCharge", comment = "Energy Capacity for Diamond Chainsaw") public static int DiamondChainsawCharge = 100000; + + @ConfigRegistry(config = "items", category = "power", key = "advancedChainsawCharge", comment = "Energy Capacity for Advanced Chainsaw") public static int AdvancedChainsawCharge = 1000000; + + @ConfigRegistry(config = "items", category = "power", key = "steelJackhammerCharge", comment = "Energy Capacity for Steel Jackhammer") public static int SteelJackhammerCharge = 10000; + + @ConfigRegistry(config = "items", category = "power", key = "diamondJackhammerCharge", comment = "Energy Capacity for Diamond Jackhammer") public static int DiamondJackhammerCharge = 100000; + + @ConfigRegistry(config = "items", category = "power", key = "advancedJackhammerCharge", comment = "Energy Capacity for Advanced Jachammer") public static int AdvancedJackhammerCharge = 1000000; + + @ConfigRegistry(config = "items", category = "power", key = "omniToolCharge", comment = "Energy Capacity for Omni Tool") public static int OmniToolCharge = 20000; + + @ConfigRegistry(config = "items", category = "power", key = "rockCutterCharge", comment = "Energy Capacity for Rock Cutter") public static int RockCutterCharge = 10000; + @ConfigRegistry(config = "items", category = "power", key = "lapotronPackCharge", comment = "Energy Capacity for Lapotron Pack") public static int LapotronPackCharge = 100000000; + + @ConfigRegistry(config = "items", category = "power", key = "LithiumBatpackCharge", comment = "Energy Capacity for Lithium Batpack") public static int LithiumBatpackCharge = 4000000; + + @ConfigRegistry(config = "items", category = "power", key = "lapotronicOrbMaxCharge", comment = "Energy Capacity for Lapotronic Orb") public static int LapotronicOrbMaxCharge = 100000000; + + @ConfigRegistry(config = "items", category = "power", key = "CloakingDeviceCharge", comment = "Energy Capacity for Clocking Device") public static int CloakingDeviceCharge = 10000000; - public static int CentrifugeCharge = 1000000; - public static int ThermalGeneratorCharge = 1000000; + } diff --git a/src/main/java/techreborn/init/ModParts.java b/src/main/java/techreborn/init/ModParts.java deleted file mode 100644 index 222210cdd..000000000 --- a/src/main/java/techreborn/init/ModParts.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2017 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.init; - -import net.minecraft.item.ItemStack; - -import java.util.HashMap; - -public class ModParts { - - public static HashMap CABLE = new HashMap<>(); - - public static void init() { // TODO 1.8 - // if (Loader.isModLoaded("IC2")) { - // for (int i = 0; i < 11; i++) { - // CablePart part = new CablePart(); - // part.setType(i); - // ModPartRegistry.registerPart(part); - // } - // } - // ModPartRegistry.addProvider("techreborn.partSystem.fmp.FMPFactory", - // "ForgeMultipart"); - // ModPartRegistry.addProvider("techreborn.partSystem.QLib.QModPartFactory", - // "qmunitylib"); - // ModPartRegistry.addAllPartsToSystems(); - // for (IPartProvider provider : ModPartRegistry.providers) { - // if (provider.modID().equals("ForgeMultipart")) { - // ModPartRegistry.masterProvider = provider; - // } - // } - } -}