fix age-old misspelling
This commit is contained in:
parent
87fd176872
commit
4f6f4827b8
9 changed files with 16 additions and 18 deletions
|
@ -3,7 +3,7 @@ package net.machinemuse.api.electricity
|
||||||
import cofh.api.energy.IEnergyContainerItem
|
import cofh.api.energy.IEnergyContainerItem
|
||||||
import ic2.api.item.ElectricItem
|
import ic2.api.item.ElectricItem
|
||||||
import ic2.api.item.IElectricItem
|
import ic2.api.item.IElectricItem
|
||||||
import net.machinemuse.powersuits.common.ModCompatability
|
import net.machinemuse.powersuits.common.ModCompatibility
|
||||||
import net.minecraft.item.ItemStack
|
import net.minecraft.item.ItemStack
|
||||||
|
|
||||||
object ElectricAdapter {
|
object ElectricAdapter {
|
||||||
|
@ -12,9 +12,9 @@ object ElectricAdapter {
|
||||||
val i = stack.getItem
|
val i = stack.getItem
|
||||||
if (i.isInstanceOf[MuseElectricItem]) {
|
if (i.isInstanceOf[MuseElectricItem]) {
|
||||||
new MuseElectricAdapter(stack)
|
new MuseElectricAdapter(stack)
|
||||||
} else if (ModCompatability.isCoFHCoreLoaded && i.isInstanceOf[IEnergyContainerItem]) {
|
} else if (ModCompatibility.isCoFHCoreLoaded && i.isInstanceOf[IEnergyContainerItem]) {
|
||||||
new TEElectricAdapter(stack)
|
new TEElectricAdapter(stack)
|
||||||
} else if (ModCompatability.isIndustrialCraftLoaded && i.isInstanceOf[IElectricItem]) {
|
} else if (ModCompatibility.isIndustrialCraftLoaded && i.isInstanceOf[IElectricItem]) {
|
||||||
new IC2ElectricAdapter(stack)
|
new IC2ElectricAdapter(stack)
|
||||||
} else {
|
} else {
|
||||||
null
|
null
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package net.machinemuse.api.electricity
|
package net.machinemuse.api.electricity
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack
|
import net.minecraft.item.ItemStack
|
||||||
import net.machinemuse.powersuits.common.ModCompatability
|
import net.machinemuse.powersuits.common.ModCompatibility
|
||||||
import net.machinemuse.api.ModuleManager
|
import net.machinemuse.api.ModuleManager
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -14,17 +14,17 @@ object ElectricConversions {
|
||||||
|
|
||||||
def getTier(stack: ItemStack): Int = ModuleManager.computeModularProperty(stack, IC2_TIER).toInt
|
def getTier(stack: ItemStack): Int = ModuleManager.computeModularProperty(stack, IC2_TIER).toInt
|
||||||
|
|
||||||
def museEnergyToEU(museEnergy: Double): Double = museEnergy / ModCompatability.getIC2Ratio
|
def museEnergyToEU(museEnergy: Double): Double = museEnergy / ModCompatibility.getIC2Ratio
|
||||||
|
|
||||||
def museEnergyFromEU(eu: Double): Double = eu * ModCompatability.getIC2Ratio
|
def museEnergyFromEU(eu: Double): Double = eu * ModCompatibility.getIC2Ratio
|
||||||
|
|
||||||
// TE
|
// TE
|
||||||
def museEnergyToRF(museEnergy: Double): Int = Math.ceil(museEnergy / ModCompatability.getRFRatio).toInt
|
def museEnergyToRF(museEnergy: Double): Int = Math.ceil(museEnergy / ModCompatibility.getRFRatio).toInt
|
||||||
|
|
||||||
def museEnergyFromRF(rf: Int): Double = rf * ModCompatability.getRFRatio
|
def museEnergyFromRF(rf: Int): Double = rf * ModCompatibility.getRFRatio
|
||||||
|
|
||||||
// BC
|
// BC
|
||||||
def museEnergyToMJ(museEnergy: Double): Double = museEnergy / ModCompatability.getBCRatio
|
def museEnergyToMJ(museEnergy: Double): Double = museEnergy / ModCompatibility.getBCRatio
|
||||||
|
|
||||||
def museEnergyFromMJ(mj: Double): Double = mj * ModCompatability.getBCRatio
|
def museEnergyFromMJ(mj: Double): Double = mj * ModCompatibility.getBCRatio
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ import net.minecraftforge.common.config.Configuration;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
public class ModCompatability {
|
public class ModCompatibility {
|
||||||
|
|
||||||
public static boolean isGregTechLoaded() {
|
public static boolean isGregTechLoaded() {
|
||||||
return Loader.isModLoaded("gregtech_addon");
|
return Loader.isModLoaded("gregtech_addon");
|
|
@ -63,7 +63,7 @@ object ModularPowersuits {
|
||||||
|
|
||||||
@Mod.EventHandler def postInit(event: FMLPostInitializationEvent) {
|
@Mod.EventHandler def postInit(event: FMLPostInitializationEvent) {
|
||||||
proxy.postInit()
|
proxy.postInit()
|
||||||
ModCompatability.registerModSpecificModules()
|
ModCompatibility.registerModSpecificModules()
|
||||||
Config.getConfig.save
|
Config.getConfig.save
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.{Side, SideOnly}
|
||||||
import net.machinemuse.api.{IModularItem, ArmorTraits, ModuleManager}
|
import net.machinemuse.api.{IModularItem, ArmorTraits, ModuleManager}
|
||||||
import net.machinemuse.numina.geometry.Colour
|
import net.machinemuse.numina.geometry.Colour
|
||||||
import net.machinemuse.powersuits.client.render.item.ArmorModel
|
import net.machinemuse.powersuits.client.render.item.ArmorModel
|
||||||
import net.machinemuse.powersuits.common.{ModCompatability, Config}
|
import net.machinemuse.powersuits.common.{ModCompatibility, Config}
|
||||||
import net.machinemuse.powersuits.powermodule.armor.HazmatModule
|
import net.machinemuse.powersuits.powermodule.armor.HazmatModule
|
||||||
import net.machinemuse.powersuits.powermodule.misc.{InvisibilityModule, TintModule, TransparentArmorModule}
|
import net.machinemuse.powersuits.powermodule.misc.{InvisibilityModule, TintModule, TransparentArmorModule}
|
||||||
import net.machinemuse.utils._
|
import net.machinemuse.utils._
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package net.machinemuse.powersuits.powermodule.armor;
|
package net.machinemuse.powersuits.powermodule.armor;
|
||||||
|
|
||||||
import net.machinemuse.api.IModularItem;
|
import net.machinemuse.api.IModularItem;
|
||||||
import net.machinemuse.powersuits.common.ModCompatability;
|
|
||||||
import net.machinemuse.powersuits.powermodule.PowerModuleBase;
|
import net.machinemuse.powersuits.powermodule.PowerModuleBase;
|
||||||
import net.machinemuse.utils.MuseCommonStrings;
|
import net.machinemuse.utils.MuseCommonStrings;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package net.machinemuse.powersuits.powermodule.tool;
|
package net.machinemuse.powersuits.powermodule.tool;
|
||||||
|
|
||||||
import net.machinemuse.api.IModularItem;
|
import net.machinemuse.api.IModularItem;
|
||||||
import net.machinemuse.powersuits.common.ModCompatability;
|
|
||||||
import net.machinemuse.powersuits.powermodule.PowerModuleBase;
|
import net.machinemuse.powersuits.powermodule.PowerModuleBase;
|
||||||
import net.machinemuse.utils.MuseCommonStrings;
|
import net.machinemuse.utils.MuseCommonStrings;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package net.machinemuse.powersuits.powermodule.tool;
|
package net.machinemuse.powersuits.powermodule.tool;
|
||||||
|
|
||||||
import net.machinemuse.api.IModularItem;
|
import net.machinemuse.api.IModularItem;
|
||||||
import net.machinemuse.powersuits.common.ModCompatability;
|
import net.machinemuse.powersuits.common.ModCompatibility;
|
||||||
import net.machinemuse.powersuits.item.ItemComponent;
|
import net.machinemuse.powersuits.item.ItemComponent;
|
||||||
import net.machinemuse.powersuits.powermodule.PowerModuleBase;
|
import net.machinemuse.powersuits.powermodule.PowerModuleBase;
|
||||||
import net.machinemuse.utils.MuseCommonStrings;
|
import net.machinemuse.utils.MuseCommonStrings;
|
||||||
|
@ -22,7 +22,7 @@ public class MFFSFieldTeleporterModule extends PowerModuleBase {
|
||||||
public MFFSFieldTeleporterModule(List<IModularItem> validItems) throws IllegalAccessException, NoSuchFieldException, ClassNotFoundException {
|
public MFFSFieldTeleporterModule(List<IModularItem> validItems) throws IllegalAccessException, NoSuchFieldException, ClassNotFoundException {
|
||||||
super(validItems);
|
super(validItems);
|
||||||
addBaseProperty(FIELD_TELEPORTER_ENERGY_CONSUMPTION, 20000, "J");
|
addBaseProperty(FIELD_TELEPORTER_ENERGY_CONSUMPTION, 20000, "J");
|
||||||
ItemStack stack = ModCompatability.getMFFSItem("MFFSitemForcePowerCrystal", 1);
|
ItemStack stack = ModCompatibility.getMFFSItem("MFFSitemForcePowerCrystal", 1);
|
||||||
if (stack == null) {
|
if (stack == null) {
|
||||||
throw new IllegalAccessException("Failed to get MFFS forcefield teleporter");
|
throw new IllegalAccessException("Failed to get MFFS forcefield teleporter");
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,7 +53,7 @@ public class MultimeterModule extends PowerModuleBase implements IRightClickModu
|
||||||
@Override
|
@Override
|
||||||
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World worldObj, int x, int y, int z, int side, float hitX, float hitY,
|
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World worldObj, int x, int y, int z, int side, float hitX, float hitY,
|
||||||
float hitZ) {
|
float hitZ) {
|
||||||
/* if (ModCompatability.isBasicComponentsLoaded()) {
|
/* if (ModCompatibility.isBasicComponentsLoaded()) {
|
||||||
if (!worldObj.isRemote) {
|
if (!worldObj.isRemote) {
|
||||||
TileEntity tileEntity = worldObj.getBlockTileEntity(x, y, z);
|
TileEntity tileEntity = worldObj.getBlockTileEntity(x, y, z);
|
||||||
if (tileEntity instanceof IConductor) {
|
if (tileEntity instanceof IConductor) {
|
||||||
|
|
Loading…
Reference in a new issue