maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More cleanup after refactoring

Browse source
This commit is contained in:
drcrazy 2018-09-17 16:42:17 +03:00
parent bdf53c9094
commit 0c54a4538e
11 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/techreborn/config/ConfigTechReborn.java
View file

@ -33,38 +33,38 @@ public class ConfigTechReborn {
@ConfigRegistry(config = "recipes", category = "railcraft", key = "disableRailcraftNugget", comment = "When true TechReborn will remove Railcraft's Iron Nugget to steel nugget recipe.")
public static boolean disableRailcraftSteelNuggetRecipe = false;
@ConfigRegistry(config = "misc", category = "general", key = "enableGemTools", comment = "Enable Gem armor and tools")
@ConfigRegistry(config = "items", category = "general", key = "enableGemTools", comment = "Enable Gem armor and tools")
public static boolean enableGemArmorAndTools = true;
@ConfigRegistry(config = "items", category = "power", key = "nanoSaberCharge", comment = "Energy Capacity for Nano Saber (FE)")
public static int nanoSaberCharge = 4_000_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;
@ConfigRegistry(config = "items", category = "power", key = "basicDrillCharge", comment = "Energy Capacity for Basic Drill (FE)")
public static int BasicDrillCharge = 40_000;
@ConfigRegistry(config = "items", category = "power", key = "advancedDrillCharge", comment = "Energy Capacity for Advanced Drill (FE)")
public static int AdvancedDrillCharge = 4_000_000;
public static int AdvancedDrillCharge = 400_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 = "industrialDrillCharge", comment = "Energy Capacity for Industrial Drill (FE)")
public static int IndustrialDrillCharge = 4_000_000;
@ConfigRegistry(config = "items", category = "power", key = "diamondChainsawCharge", comment = "Energy Capacity for Diamond Chainsaw (FE)")
public static int DiamondChainsawCharge = 400_000;
@ConfigRegistry(config = "items", category = "power", key = "basicChainsawCharge", comment = "Energy Capacity for Basic Chainsaw (FE)")
public static int BasicChainsawCharge = 40_000;
@ConfigRegistry(config = "items", category = "power", key = "advancedChainsawCharge", comment = "Energy Capacity for Advanced Chainsaw (FE)")
public static int AdvancedChainsawCharge = 4_000_000;
public static int AdvancedChainsawCharge = 400_000;
@ConfigRegistry(config = "items", category = "power", key = "steelJackhammerCharge", comment = "Energy Capacity for Steel Jackhammer (FE)")
public static int SteelJackhammerCharge = 40_000;
@ConfigRegistry(config = "items", category = "power", key = "industrialChainsawCharge", comment = "Energy Capacity for Industrial Chainsaw (FE)")
public static int IndustrialChainsawCharge = 4_000_000;
@ConfigRegistry(config = "items", category = "power", key = "diamondJackhammerCharge", comment = "Energy Capacity for Diamond Jackhammer (FE)")
public static int DiamondJackhammerCharge = 400_000;
@ConfigRegistry(config = "items", category = "power", key = "basicJackhammerCharge", comment = "Energy Capacity for Basic Jackhammer (FE)")
public static int BasicJackhammerCharge = 40_000;
@ConfigRegistry(config = "items", category = "power", key = "advancedJackhammerCharge", comment = "Energy Capacity for Advanced Jachammer (FE)")
public static int AdvancedJackhammerCharge = 4_000_000;
@ConfigRegistry(config = "items", category = "power", key = "advancedJackhammerCharge", comment = "Energy Capacity for Advanced Jackhammer (FE)")
public static int AdvancedJackhammerCharge = 400_000;
@ConfigRegistry(config = "items", category = "power", key = "industrialJackhammerCharge", comment = "Energy Capacity for Industrial Jachammer (FE)")
public static int IndustrialJackhammerCharge = 4_000_000;
@ConfigRegistry(config = "items", category = "power", key = "omniToolCharge", comment = "Energy Capacity for Omni Tool (FE)")
public static int OmniToolCharge = 4_000_000;
@ -87,9 +87,12 @@ public class ConfigTechReborn {
@ConfigRegistry(config = "items", category = "power", key = "lapotronicOrbMaxCharge", comment = "Energy Capacity for Lapotronic Orb (FE)")
public static int LapotronicOrbMaxCharge = 400_000_000;
@ConfigRegistry(config = "items", category = "power", key = "CloakingDeviceCharge", comment = "Energy Capacity for Clocking Device (FE)")
@ConfigRegistry(config = "items", category = "power", key = "cloakingDeviceCharge", comment = "Energy Capacity for Clocking Device (FE)")
public static int CloakingDeviceCharge = 40_000_000;
@ConfigRegistry(config = "items", category = "power", key = "clockingDeviceEnergyUsage", comment = "Cloacking device energy usesage (FE)")
public static int CloackingDeviceUsage = 10;
@ConfigRegistry(config = "generators", category = "solarPanelBasic", key = "basicDayRate", comment = "Generation rate during day for Basic Solar Panel (Value in EU)")
public static int basicGenerationRateD = 1;

4
src/main/java/techreborn/items/armor/ItemCloakingDevice.java
View file

@ -54,10 +54,8 @@ import javax.annotation.Nullable;
@RebornRegister(modID = TechReborn.MOD_ID)
public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo {
@ConfigRegistry(config = "items", category = "cloacking_device", key = "ClockingDeviceEnergyUsage", comment = "Cloacking device energy usesage (Value in FE)")
public static int usage = 10;
public static int maxCharge = ConfigTechReborn.CloakingDeviceCharge;
public static int usage = ConfigTechReborn.CloackingDeviceUsage;
public static int transferLimit = 10_000;
public static boolean isActive;

2
src/main/java/techreborn/items/tool/advanced/ItemAdvancedChainsaw.java
View file

@ -39,7 +39,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
// 400k max charge with 1k charge rate
public ItemAdvancedChainsaw() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.DiamondChainsawCharge, 1.0F);
super(ToolMaterial.DIAMOND, ConfigTechReborn.AdvancedChainsawCharge, 1.0F);
this.cost = 250;
this.transferLimit = 1000;
}

2
src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java
View file

@ -39,7 +39,7 @@ public class ItemAdvancedDrill extends ItemDrill {
// 400k max charge with 1k charge rate
public ItemAdvancedDrill() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.DiamondDrillCharge, 0.5F, 15F);
super(ToolMaterial.DIAMOND, ConfigTechReborn.AdvancedDrillCharge, 0.5F, 15F);
this.cost = 250;
this.transferLimit = 1000;
}

2
src/main/java/techreborn/items/tool/advanced/ItemAdvancedJackhammer.java
View file

@ -37,7 +37,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
// 400k max charge with 1k charge rate
public ItemAdvancedJackhammer() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.DiamondJackhammerCharge);
super(ToolMaterial.DIAMOND, ConfigTechReborn.AdvancedJackhammerCharge);
this.cost = 100;
this.efficiency = 16F;
this.transferLimit = 1000;

2
src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java
View file

@ -38,7 +38,7 @@ import techreborn.items.tool.ItemChainsaw;
public class ItemBasicChainsaw extends ItemChainsaw {
public ItemBasicChainsaw() {
super(ToolMaterial.IRON, ConfigTechReborn.SteelChainsawCharge, 0.5F);
super(ToolMaterial.IRON, ConfigTechReborn.BasicChainsawCharge, 0.5F);
this.cost = 50;
}

2
src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java
View file

@ -38,7 +38,7 @@ import techreborn.items.tool.ItemDrill;
public class ItemBasicDrill extends ItemDrill {
public ItemBasicDrill() {
super(ToolMaterial.IRON, ConfigTechReborn.SteelDrillCharge, 0.5F, 10F);
super(ToolMaterial.IRON, ConfigTechReborn.BasicDrillCharge, 0.5F, 10F);
this.cost = 50;
}

2
src/main/java/techreborn/items/tool/basic/ItemBasicJackhammer.java
View file

@ -36,7 +36,7 @@ import techreborn.items.tool.ItemJackhammer;
public class ItemBasicJackhammer extends ItemJackhammer {
public ItemBasicJackhammer() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.SteelJackhammerCharge);
super(ToolMaterial.DIAMOND, ConfigTechReborn.BasicJackhammerCharge);
this.cost = 50;
this.efficiency = 12F;
}

2
src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
View file

@ -45,7 +45,7 @@ public class ItemIndustrialChainsaw extends ItemChainsaw {
// 4M FE max charge with 1k charge rate
public ItemIndustrialChainsaw() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.AdvancedChainsawCharge, 1.0F);
super(ToolMaterial.DIAMOND, ConfigTechReborn.IndustrialChainsawCharge, 1.0F);
this.cost = 250;
this.transferLimit = 1000;
}

2
src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
View file

@ -52,7 +52,7 @@ public class ItemIndustrialDrill extends ItemDrill {
// 4M FE max charge with 1k charge rate
public ItemIndustrialDrill() {
super(ToolMaterial.DIAMOND, ConfigTechReborn.AdvancedDrillCharge, 2.0F, 10F);
super(ToolMaterial.DIAMOND, ConfigTechReborn.IndustrialDrillCharge, 2.0F, 10F);
this.cost = 250;
this.transferLimit = 1000;
}

2
src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java
View file

@ -37,7 +37,7 @@ public class ItemIndustrialJackhammer extends ItemJackhammer {
// 4M FE max charge with 1k charge rate
public ItemIndustrialJackhammer() {
super(ToolMaterial.IRON, ConfigTechReborn.AdvancedJackhammerCharge);
super(ToolMaterial.IRON, ConfigTechReborn.IndustrialJackhammerCharge);
this.cost = 250;
this.efficiency = 60F;
this.transferLimit = 1000;