Anvilcraft/ModularPowersuits
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added auto-gen config files for modules and module number values

Browse source
This commit is contained in:
MachineMuse 2013-02-01 16:24:46 -07:00
parent 1638927bd4
commit 262e1f5cce
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/minecraft/net/machinemuse/api/ModuleManager.java
View file

@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.machinemuse.powersuits.common.Config;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -22,8 +23,12 @@ public class ModuleManager {
}
public static void addModule(IPowerModule module) {
moduleMap.put(module.getName(), module);
moduleList.add(module);
boolean isModuleEnabled = Config.getConfig().get("Modules", module.getName(), true)
.getBoolean(true);
if (isModuleEnabled) {
moduleMap.put(module.getName(), module);
moduleList.add(module);
}
}
public static double computeModularProperty(ItemStack stack, String propertyName) {

15
src/minecraft/net/machinemuse/powersuits/powermodule/PowerModule.java
View file

@ -12,6 +12,7 @@ import net.machinemuse.api.IPowerModule;
import net.machinemuse.api.IPropertyModifier;
import net.machinemuse.api.MuseItemUtils;
import net.machinemuse.general.gui.MuseIcon;
import net.machinemuse.powersuits.common.Config;
import net.machinemuse.powersuits.item.IModularItem;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -68,12 +69,16 @@ public class PowerModule implements IPowerModule {
}
public PowerModule addTradeoffProperty(String tradeoffName, String propertyName, double multiplier) {
return addPropertyModifier(propertyName, new PropertyModifierLinearAdditive(tradeoffName, multiplier));
double propFromConfig = Config.getConfig().get("Properties", getName() + "." + propertyName + "." + tradeoffName + ".multiplier", multiplier)
.getDouble(multiplier);
return addPropertyModifier(propertyName, new PropertyModifierLinearAdditive(tradeoffName, propFromConfig));
}
public PowerModule addTradeoffProperty(String tradeoffName, String propertyName, double multiplier, String unit) {
double propFromConfig = Config.getConfig().get("Properties", getName() + "." + propertyName + "." + tradeoffName + ".multiplier", multiplier)
.getDouble(multiplier);
units.put(propertyName, unit);
return addPropertyModifier(propertyName, new PropertyModifierLinearAdditive(tradeoffName, multiplier));
return addPropertyModifier(propertyName, new PropertyModifierLinearAdditive(tradeoffName, propFromConfig));
}
public static String getUnit(String propertyName) {
@ -85,12 +90,14 @@ public class PowerModule implements IPowerModule {
}
public PowerModule addBaseProperty(String propertyName, double baseVal) {
return addPropertyModifier(propertyName, new PropertyModifierFlatAdditive(baseVal));
double propFromConfig = Config.getConfig().get("Properties", getName() + "." + propertyName + ".base", baseVal).getDouble(baseVal);
return addPropertyModifier(propertyName, new PropertyModifierFlatAdditive(propFromConfig));
}
public PowerModule addBaseProperty(String propertyName, double baseVal, String unit) {
double propFromConfig = Config.getConfig().get("Properties", getName() + "." + propertyName + ".base", baseVal).getDouble(baseVal);
units.put(propertyName, unit);
return addPropertyModifier(propertyName, new PropertyModifierFlatAdditive(baseVal));
return addPropertyModifier(propertyName, new PropertyModifierFlatAdditive(propFromConfig));
}
public PowerModule addPropertyModifier(String propertyName, IPropertyModifier modifier) {