This commit is contained in:
fewizz committed 2016-04-10 13:45:07 +03:00
1 parent 3aef354b3a
commit c2dee6e1c1
55 files changed
+287 -287

No files matched your search

+22 -22
View File
@@ -27,29 +27,29 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@Mod(
modid = ModInformation.modid,
name = ModInformation.name,
version = ModInformation.version,
guiFactory = ModInformation.guiFactory,
dependencies = ModInformation.depend
modid = ModInformation.MODID,
name = ModInformation.NAME,
version = ModInformation.VERSION,
guiFactory = ModInformation.GUI_FACTORY,
dependencies = ModInformation.DEPEND
)
public class ElectroMagicTools {
@SidedProxy(
clientSide = ModInformation.clientProxy,
serverSide = ModInformation.commonProxy
clientSide = ModInformation.CLIENT_PROXY,
serverSide = ModInformation.COMMON_PROXY
)
public static CommonProxy proxy;
public static CreativeTabs tabEMT = new EMTCreativeTab(ModInformation.modid + ".creativeTab");
public static Logger logger = LogManager.getLogger(ModInformation.name);
public static SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(ModInformation.channel);
public static final CreativeTabs TAB = new EMTCreativeTab(ModInformation.MODID + ".creativeTab");
public static final Logger LOGGER = LogManager.getLogger(ModInformation.NAME);
public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(ModInformation.CHANNEL);
@Instance(ModInformation.modid)
@Instance(ModInformation.MODID)
public static ElectroMagicTools instance;
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
logger.info("Starting planning the world domination");
LOGGER.info("Starting planning the world domination");
EMTConfigHandler.init(event.getSuggestedConfigurationFile());
FMLCommonHandler.instance().bus().register(new EMTEventHandler());
FMLCommonHandler.instance().bus().register(new EMTClientEventHandler());
@@ -57,32 +57,32 @@ public class ElectroMagicTools {
EMTEssentiasOutputs.addPrimalOutputs();
EMTEssentiasOutputs.addOutputs();
registerPackets();
logger.info("Planning complete");
LOGGER.info("Planning complete");
}
@EventHandler
public void load(FMLInitializationEvent event) {
logger.info("Gathering allies");
logger.info("Loading the proxies");
LOGGER.info("Gathering allies");
LOGGER.info("Loading the proxies");
proxy.load();
logger.info("Making mobs drop additional items");
LOGGER.info("Making mobs drop additional items");
MinecraftForge.EVENT_BUS.register(new EMTEventHandler());
MinecraftForge.EVENT_BUS.register(new EMTClientEventHandler());
logger.info("Adding dungeon loot");
LOGGER.info("Adding dungeon loot");
EMTDungeonChestGenerator.generateLoot();
logger.info("Registering entities");
LOGGER.info("Registering entities");
EMTEntities.registerEMTEntities();
logger.info("Registering the GUI Handler");
LOGGER.info("Registering the GUI Handler");
NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy);
logger.info("Allies gathered.");
LOGGER.info("Allies gathered.");
}
@EventHandler
public void postInit(FMLPostInitializationEvent event) {
logger.info("Starting the world takeover");
LOGGER.info("Starting the world takeover");
Registry.registerLate();
EMTResearches.register();
logger.info("World takeover complete. Enjoy!");
LOGGER.info("World takeover complete. Enjoy!");
}
@EventHandler
+9 -9
View File
@@ -1,13 +1,13 @@
package emt;
public class ModInformation {
public static final String name = "Electro-Magic Tools";
public static final String modid = "EMT";
public static final String version = "1.2.6";
public static final String texturePath = "emt";
public static final String guiFactory = "emt.client.gui.config.EMTGuiFactory";
public static final String clientProxy = "emt.proxy.ClientProxy";
public static final String commonProxy = "emt.proxy.CommonProxy";
public static final String channel = "EMT";
public static final String depend = "required-after:Thaumcraft ; required-after:IC2";
public static final String NAME = "Electro-Magic Tools";
public static final String MODID = "EMT";
public static final String VERSION = "1.2.6";
public static final String TEXTURE_PATH = "emt";
public static final String GUI_FACTORY = "emt.client.gui.config.EMTGuiFactory";
public static final String CLIENT_PROXY = "emt.proxy.ClientProxy";
public static final String COMMON_PROXY = "emt.proxy.CommonProxy";
public static final String CHANNEL = "EMT";
public static final String DEPEND = "required-after:Thaumcraft ; required-after:IC2";
}
+3 -3
View File
@@ -11,11 +11,11 @@ public abstract class BlockBase extends Block {
public BlockBase(String unlocName, Material material, String textureName, SoundType soundType, float hardness) {
super(material);
name = unlocName;
setBlockName(ModInformation.modid + ".block." + unlocName);
setBlockName(ModInformation.MODID + ".block." + unlocName);
if (textureName != null) {
setBlockTextureName(ModInformation.texturePath + ":" + textureName);
setBlockTextureName(ModInformation.TEXTURE_PATH + ":" + textureName);
}
setCreativeTab(ElectroMagicTools.tabEMT);
setCreativeTab(ElectroMagicTools.TAB);
setStepSound(soundType);
setHardness(hardness);
}
@@ -25,8 +25,8 @@ public abstract class BlockBaseContainer extends BlockContainer {
public BlockBaseContainer(String unlocName, Material material, SoundType soundType, float hardness) {
super(material);
setBlockName(ModInformation.modid + "." + unlocName);
setCreativeTab(ElectroMagicTools.tabEMT);
setBlockName(ModInformation.MODID + "." + unlocName);
setCreativeTab(ElectroMagicTools.TAB);
setStepSound(soundType);
setHardness(hardness);
}
@@ -51,7 +51,7 @@ public class BlockElectricCloud extends BlockBase {
@Override
public void registerBlockIcons(IIconRegister ir) {
icon = ir.registerIcon(ModInformation.texturePath + ":empty");
icon = ir.registerIcon(ModInformation.TEXTURE_PATH + ":empty");
}
@Override
@@ -28,25 +28,25 @@ public class BlockEssentiaGenerators extends BlockBaseContainer {
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister ri) {
this.blockIcon = ri.registerIcon(ModInformation.texturePath + ":machines/top");
this.blockIcon = ri.registerIcon(ModInformation.TEXTURE_PATH + ":machines/top");
for (int i = 0; i <= 5; i++) {
this.top[i] = ri.registerIcon(ModInformation.texturePath + ":essentiagenerator/top");
this.top[i] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/top");
}
for (int i = 0; i <= 5; i++) {
this.bottom[i] = ri.registerIcon(ModInformation.texturePath + ":essentiagenerator/top");
this.bottom[i] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/top");
}
for (int i = 0; i <= 5; i++) {
this.side[i] = ri.registerIcon(ModInformation.texturePath + ":essentiagenerator/side");
this.side[i] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/side");
}
this.frontOff[0] = ri.registerIcon(ModInformation.texturePath + ":essentiagenerator/potentiafront");
this.frontOff[1] = ri.registerIcon(ModInformation.texturePath + ":essentiagenerator/ignisfront");
this.frontOff[2] = ri.registerIcon(ModInformation.texturePath + ":essentiagenerator/auramfront");
this.frontOff[3] = ri.registerIcon(ModInformation.texturePath + ":essentiagenerator/arborfront");
this.frontOff[4] = ri.registerIcon(ModInformation.texturePath + ":essentiagenerator/aerfront");
this.frontOff[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/potentiafront");
this.frontOff[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/ignisfront");
this.frontOff[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/auramfront");
this.frontOff[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/arborfront");
this.frontOff[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":essentiagenerator/aerfront");
}
@SideOnly(Side.CLIENT)
+11 -11
View File
@@ -33,22 +33,22 @@ public class BlockMachines extends BlockBaseContainer {
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister ir) {
this.blockIcon = ir.registerIcon(ModInformation.texturePath + ":machines/top");
this.blockIcon = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/top");
this.top[0] = ir.registerIcon(ModInformation.texturePath + ":machines/top");
this.top[1] = ir.registerIcon(ModInformation.texturePath + ":machines/etherealmaceratortop");
this.top[0] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/top");
this.top[1] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/etherealmaceratortop");
this.bottom[0] = ir.registerIcon(ModInformation.texturePath + ":machines/side");
this.bottom[1] = ir.registerIcon(ModInformation.texturePath + ":machines/etherealmacerator");
this.bottom[0] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/side");
this.bottom[1] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/etherealmacerator");
this.side[0] = ir.registerIcon(ModInformation.texturePath + ":machines/side");
this.side[1] = ir.registerIcon(ModInformation.texturePath + ":machines/etherealmacerator");
this.side[0] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/side");
this.side[1] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/etherealmacerator");
this.frontOff[0] = ir.registerIcon(ModInformation.texturePath + ":machines/wandcharger");
this.frontOff[1] = ir.registerIcon(ModInformation.texturePath + ":machines/etherealmaceratorfront");
this.frontOff[0] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/wandcharger");
this.frontOff[1] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/etherealmaceratorfront");
this.frontOn[0] = ir.registerIcon(ModInformation.texturePath + ":machines/wandcharger");
this.frontOn[1] = ir.registerIcon(ModInformation.texturePath + ":machines/etherealmaceratorfrontactive");
this.frontOn[0] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/wandcharger");
this.frontOn[1] = ir.registerIcon(ModInformation.TEXTURE_PATH + ":machines/etherealmaceratorfrontactive");
}
@SideOnly(Side.CLIENT)
@@ -25,8 +25,8 @@ public class BlockPortableNode extends BlockAiry {
public IIcon texture;
public BlockPortableNode(String name) {
this.setCreativeTab(ElectroMagicTools.tabEMT);
setBlockName(ModInformation.modid + "." + name);
this.setCreativeTab(ElectroMagicTools.TAB);
setBlockName(ModInformation.MODID + "." + name);
setBlockUnbreakable();
}
@@ -65,7 +65,7 @@ public class BlockPortableNode extends BlockAiry {
@SideOnly(Side.CLIENT)
@Override
public void registerBlockIcons(IIconRegister ri) {
texture = ri.registerIcon(ModInformation.texturePath + ":portablenode");
texture = ri.registerIcon(ModInformation.TEXTURE_PATH + ":portablenode");
}
@SideOnly(Side.CLIENT)
+3 -3
View File
@@ -19,8 +19,8 @@ public class BlockShield extends Block {
public BlockShield(String name) {
super(Material.rock);
setBlockName(ModInformation.modid + "." + name);
this.setCreativeTab(ElectroMagicTools.tabEMT);
setBlockName(ModInformation.MODID + "." + name);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setHardness(1F);
this.setResistance(10000000000000000000000000000000000000F);
}
@@ -39,7 +39,7 @@ public class BlockShield extends Block {
@SideOnly(Side.CLIENT)
@Override
public void registerBlockIcons(IIconRegister iconRegister) {
this.blockIcon = iconRegister.registerIcon(ModInformation.texturePath + ":shield");
this.blockIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":shield");
}
@Override
+64 -64
View File
@@ -39,73 +39,73 @@ public class BlockSolars extends BlockBaseContainer {
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister ri) {
this.top[0] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[1] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[2] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.top[3] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[4] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[5] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.top[6] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[7] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[8] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.top[9] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[10] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[11] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.top[12] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[13] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[14] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.top[15] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop");
this.top[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop");
this.top[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop");
this.top[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop");
this.top[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop");
this.top[5] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop");
this.top[6] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop");
this.top[7] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop");
this.top[8] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop");
this.top[9] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop");
this.top[10] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop");
this.top[11] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop");
this.top[12] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop");
this.top[13] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop");
this.top[14] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop");
this.top[15] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop");
this.bottom[0] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[1] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[2] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[3] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[4] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[5] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[6] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[7] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[8] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[9] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[10] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[11] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[12] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[13] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[14] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[15] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[5] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[6] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[7] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[8] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[9] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[10] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[11] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[12] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[13] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[14] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[15] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.frontOff[0] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.frontOff[1] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.frontOff[2] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.frontOff[3] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside");
this.frontOff[4] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside");
this.frontOff[5] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside");
this.frontOff[6] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside");
this.frontOff[7] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside");
this.frontOff[8] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside");
this.frontOff[9] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside");
this.frontOff[10] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside");
this.frontOff[11] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside");
this.frontOff[12] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside");
this.frontOff[13] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside");
this.frontOff[14] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside");
this.frontOff[15] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside");
this.frontOff[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side");
this.frontOff[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side");
this.frontOff[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side");
this.frontOff[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside");
this.frontOff[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside");
this.frontOff[5] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside");
this.frontOff[6] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside");
this.frontOff[7] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside");
this.frontOff[8] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside");
this.frontOff[9] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside");
this.frontOff[10] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside");
this.frontOff[11] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside");
this.frontOff[12] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside");
this.frontOff[13] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside");
this.frontOff[14] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside");
this.frontOff[15] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside");
this.side[0] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[1] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[2] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside");
this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside");
this.side[5] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside");
this.side[6] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside");
this.side[7] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside");
this.side[8] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside");
this.side[9] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside");
this.side[10] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside");
this.side[11] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside");
this.side[12] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside");
this.side[13] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside");
this.side[14] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside");
this.side[15] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside");
this.side[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side");
this.side[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side");
this.side[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/side");
this.side[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside");
this.side[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside");
this.side[5] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/water/waterside");
this.side[6] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside");
this.side[7] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside");
this.side[8] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/dark/darkside");
this.side[9] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside");
this.side[10] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside");
this.side[11] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/order/orderside");
this.side[12] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside");
this.side[13] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside");
this.side[14] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/fire/fireside");
this.side[15] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside");
}
@SideOnly(Side.CLIENT)
+20 -20
View File
@@ -28,29 +28,29 @@ public class BlockSolars2 extends BlockBaseContainer {
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister ri) {
this.top[0] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[1] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[2] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[3] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[4] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.top[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop");
this.top[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop");
this.top[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/solartop");
this.top[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/doublesolartop");
this.top[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/triplesolartop");
this.bottom[0] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[1] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[2] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[3] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[4] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.bottom[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/bottom");
this.frontOff[0] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside");
this.frontOff[1] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside");
this.frontOff[2] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside");
this.frontOff[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside");
this.frontOff[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside");
this.frontOff[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside");
this.frontOff[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside");
this.frontOff[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside");
this.frontOff[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside");
this.frontOff[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside");
this.side[0] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside");
this.side[1] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside");
this.side[2] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside");
this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside");
this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside");
this.side[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside");
this.side[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/air/airside");
this.side[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside");
this.side[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside");
this.side[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":solars/earth/earthside");
}
@SideOnly(Side.CLIENT)
@@ -19,7 +19,7 @@ public class GuiEtherealMacerator extends GuiContainer {
ySize = 165;
}
public static final ResourceLocation texture = new ResourceLocation(ModInformation.texturePath, "textures/guis/etherealmacerator.png");
public static final ResourceLocation texture = new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/guis/etherealmacerator.png");
@Override
public void drawGuiContainerBackgroundLayer(float f, int j, int i) {
@@ -19,7 +19,7 @@ public class GuiIndustrialWandRecharger extends GuiContainer {
ySize = 165;
}
public static final ResourceLocation texture = new ResourceLocation(ModInformation.texturePath, "textures/guis/wandcharger.png");
public static final ResourceLocation texture = new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/guis/wandcharger.png");
@Override
public void drawGuiContainerBackgroundLayer(float f, int j, int i) {
@@ -17,7 +17,7 @@ import java.util.Locale;
public class EMTGuiConfig extends GuiConfig {
public EMTGuiConfig(GuiScreen parentScreen) {
super(parentScreen, getConfigElements(parentScreen), ModInformation.modid, false, false, StatCollector.translateToLocal("gui." + ModInformation.modid + ".config.title"));
super(parentScreen, getConfigElements(parentScreen), ModInformation.MODID, false, false, StatCollector.translateToLocal("gui." + ModInformation.MODID + ".config.title"));
}
@SuppressWarnings("rawtypes")
@@ -12,7 +12,7 @@ import emt.entity.EntityLaser;
public class RenderLaser extends Render {
private static final ResourceLocation laserTexture = new ResourceLocation(ModInformation.texturePath, "textures/models/lasermodel.png");
private static final ResourceLocation laserTexture = new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/models/lasermodel.png");
@Override
public void doRender(Entity entityLaser, double x, double y, double z, float par8, float par9) {
@@ -18,7 +18,7 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
public class RenderShield extends Render {
private static final ResourceLocation shieldTexture = new ResourceLocation(ModInformation.texturePath, "textures/models/shield.png");
private static final ResourceLocation shieldTexture = new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/models/shield.png");
static int glCallList;
static {
+26 -26
View File
@@ -93,84 +93,84 @@ public class EMTItems {
OreDictionary.registerOre("plateThaumium", new ItemStack(itemEMTItems, 1, 5));
OreDictionary.registerOre("slimeball", new ItemStack(itemEMTItems, 1, 8));
emtBauble = new ItemIC2Baubles().setUnlocalizedName(ModInformation.modid + ".bauble");
emtBauble = new ItemIC2Baubles().setUnlocalizedName(ModInformation.MODID + ".bauble");
GameRegistry.registerItem(emtBauble, "EMTBaubles");
onering = new ItemOneRing();
GameRegistry.registerItem(onering, "BaseBaubles");
quantumArmor = new ItemInfusedQuantumChestplate(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(ModInformation.modid + ".quantum");
quantumArmor = new ItemInfusedQuantumChestplate(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(ModInformation.MODID + ".quantum");
electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.electric");
electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.MODID + ".goggles.electric");
GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing");
nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.nano");
nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.MODID + ".goggles.nano");
GameRegistry.registerItem(nanoThaumicHelmet, "NanosuitGogglesRevealing");
quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.quantum");
quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.MODID + ".goggles.quantum");
GameRegistry.registerItem(quantumThaumicHelmet, "QuantumGogglesRevealing");
solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.solar");
solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.MODID + ".goggles.solar");
GameRegistry.registerItem(solarHelmetRevealing, "SolarHelmetRevealing");
electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.electric");
electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.MODID + ".boots.traveller.electric");
GameRegistry.registerItem(electricBootsTraveller, "ElectricBootsTraveller");
nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.nano");
nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.MODID + ".boots.traveller.nano");
GameRegistry.registerItem(nanoBootsTraveller, "NanoBootsTraveller");
quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.quantum");
quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.MODID + ".boots.traveller.quantum");
GameRegistry.registerItem(quantumBootsTraveller, "QuantumBootsTraveller");
electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.modid + ".scribingtools.electric");
electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.MODID + ".scribingtools.electric");
GameRegistry.registerItem(electricScribingTools, "ElectricScribingTools");
featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.feather");
featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.MODID + ".wing.feather");
GameRegistry.registerItem(featherWing, "FeatherWing");
thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.thaumium");
thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.MODID + ".wing.thaumium");
GameRegistry.registerItem(thaumiumWing, "ThaumiumWing");
nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.nano");
nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.MODID + ".wing.nano");
GameRegistry.registerItem(nanoWing, "NanosuitWing");
quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.quantum");
quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.MODID + ".wing.quantum");
GameRegistry.registerItem(quantumWing, "QuantumWing");
thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer");
thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.MODID + ".hammer");
GameRegistry.registerItem(thorHammer, "Mjolnir");
taintedThorHammer = new ItemThorHammerBroken().setUnlocalizedName(ModInformation.modid + ".hammer.broken");
taintedThorHammer = new ItemThorHammerBroken().setUnlocalizedName(ModInformation.MODID + ".hammer.broken");
GameRegistry.registerItem(taintedThorHammer, "TaintedMjolnir");
electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer.electric");
electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.MODID + ".hammer.electric");
GameRegistry.registerItem(electricThorHammer, "SuperchargedMjolnir");
thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.modid + ".drill.thaumium");
thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.MODID + ".drill.thaumium");
GameRegistry.registerItem(thaumiumDrill, "ThaumiumDrill");
diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond");
diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.MODID + ".chainsaw.diamond");
GameRegistry.registerItem(diamondChainsaw, "DiamondChainsaw");
thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.thaumium");
thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.MODID + ".chainsaw.thaumium");
GameRegistry.registerItem(thaumiumChainsaw, "ThaumiumChainsaw");
ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.modid + ".omnitool.iron");
ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.MODID + ".omnitool.iron");
GameRegistry.registerItem(ironOmnitool, "Omnitool");
diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.modid + ".omnitool.diamond");
diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.MODID + ".omnitool.diamond");
GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool");
thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.modid + ".omnitool.thaumium");
thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.MODID + ".omnitool.thaumium");
GameRegistry.registerItem(thaumiumOmnitool, "ThaumiumOmnitool");
streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.stream");
streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.MODID + ".chainsaw.stream");
GameRegistry.registerItem(streamChainsaw, "ChainsawStream");
rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.modid + ".drill.rockbreaker");
rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.MODID + ".drill.rockbreaker");
GameRegistry.registerItem(rockbreakerDrill, "DrillRockbreaker");
electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.modid + ".hoeofgrowth.electric");
electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.MODID + ".hoeofgrowth.electric");
GameRegistry.registerItem(electricHoeGrowth, "ElectricHoeGrowth");
explosionFocus = new ItemExplosionFocus();
+2 -2
View File
@@ -362,7 +362,7 @@ public class EMTRecipes {
IRecipeInput input = it.next();
if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7))) {
it.remove();
ElectroMagicTools.logger.info("Removing conflicting amber macerating recipe(s)");
ElectroMagicTools.LOGGER.info("Removing conflicting amber macerating recipe(s)");
}
}
@@ -370,7 +370,7 @@ public class EMTRecipes {
IRecipeInput input = it.next();
if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0))) {
it.remove();
ElectroMagicTools.logger.info("Removing Conflicting cinnabar macerating recipe(s)");
ElectroMagicTools.LOGGER.info("Removing Conflicting cinnabar macerating recipe(s)");
}
}
}
+3 -3
View File
@@ -20,13 +20,13 @@ public class EMTResearches {
}
public static void addResearchTab() {
ResourceLocation background = new ResourceLocation(ModInformation.texturePath, "textures/misc/background.png");
ResearchCategories.registerCategory("EMT", new ResourceLocation(ModInformation.texturePath, "textures/misc/emt.png"), background);
ResourceLocation background = new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/misc/background.png");
ResearchCategories.registerCategory("EMT", new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/misc/emt.png"), background);
}
public static void addResearch() {
/** Research that can't be disabled **/
new EMTResearchItem("Electric Magic Tools", 0, 0, 0, new ResourceLocation(ModInformation.texturePath, "textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""));
new EMTResearchItem("Electric Magic Tools", 0, 0, 0, new ResourceLocation(ModInformation.TEXTURE_PATH, "textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""));
new EMTResearchItem("Diamond Chainsaw", 5, -6, 0, new ItemStack(EMTItems.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.diamondChainsaw));
new EMTResearchItem("Thaumium Plate", 6, -6, 0, new ItemStack(EMTItems.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thaumiumPlate));
new EMTResearchItem("Macerating Native Ore Clusters", 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""));
+5 -5
View File
@@ -11,15 +11,15 @@ public class ItemBase extends Item {
public ItemBase(String unlocName, String textureName) {
super();
setUnlocalizedName(ModInformation.modid + unlocName);
setTextureName(ModInformation.texturePath + ":" + textureName);
setCreativeTab(ElectroMagicTools.tabEMT);
setUnlocalizedName(ModInformation.MODID + unlocName);
setTextureName(ModInformation.TEXTURE_PATH + ":" + textureName);
setCreativeTab(ElectroMagicTools.TAB);
}
public ItemBase(String unlocName) {
super();
setUnlocalizedName(ModInformation.modid + ".item." + unlocName);
setCreativeTab(ElectroMagicTools.tabEMT);
setUnlocalizedName(ModInformation.MODID + ".item." + unlocName);
setCreativeTab(ElectroMagicTools.TAB);
}
public String getItemStackDisplayName(ItemStack stack) {
@@ -18,7 +18,7 @@ public class ItemElectricScribingTools extends ItemInkwell implements IElectricI
public static int maxCharge = 400;
public ItemElectricScribingTools() {
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxDamage(400);
this.setMaxStackSize(1);
}
+2 -2
View File
@@ -55,8 +55,8 @@ public class ItemIC2Baubles extends ItemBase implements IBauble {
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister ri) {
this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":armoreumaker");
this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":inventoryeumaker");
this.icon[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":armoreumaker");
this.icon[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":inventoryeumaker");
}
@SideOnly(Side.CLIENT)
+18 -18
View File
@@ -34,7 +34,7 @@ public class ItemMaterials extends Item {
public IIcon[] icon = new IIcon[25];
public ItemMaterials() {
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxDamage(0);
this.setMaxStackSize(64);
setHasSubtypes(true);
@@ -96,27 +96,27 @@ public class ItemMaterials extends Item {
name = "nothing";
break;
}
return "item." + ModInformation.modid + "." + name;
return "item." + ModInformation.MODID + "." + name;
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister ri) {
this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":materials/clusteruranium");
this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":materials/crushedamber");
this.icon[2] = ri.registerIcon(ModInformation.texturePath + ":materials/purifiedamber");
this.icon[3] = ri.registerIcon(ModInformation.texturePath + ":materials/crushedcinnabar");
this.icon[4] = ri.registerIcon(ModInformation.texturePath + ":materials/purifiedcinnabar");
this.icon[5] = ri.registerIcon(ModInformation.texturePath + ":materials/thaumiumplate");
this.icon[6] = ri.registerIcon(ModInformation.texturePath + ":materials/lightningsummoner");
this.icon[7] = ri.registerIcon(ModInformation.texturePath + ":materials/feathermesh");
this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":materials/glue");
this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":materials/ducttape");
this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":materials/rubberball");
this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":materials/cardboard");
this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":materials/cardboardsheet");
this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":materials/taintedfeather");
this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":materials/thaumiumWing");
this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":materials/uumatterdrop");
this.icon[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/clusteruranium");
this.icon[1] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/crushedamber");
this.icon[2] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/purifiedamber");
this.icon[3] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/crushedcinnabar");
this.icon[4] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/purifiedcinnabar");
this.icon[5] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/thaumiumplate");
this.icon[6] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/lightningsummoner");
this.icon[7] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/feathermesh");
this.icon[8] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/glue");
this.icon[9] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/ducttape");
this.icon[10] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/rubberball");
this.icon[11] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/cardboard");
this.icon[12] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/cardboardsheet");
this.icon[13] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/taintedfeather");
this.icon[14] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/thaumiumWing");
this.icon[15] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":materials/uumatterdrop");
}
@SideOnly(Side.CLIENT)
+2 -2
View File
@@ -46,12 +46,12 @@ public class ItemOneRing extends ItemBase implements IBauble {
name = "nothing";
break;
}
return "item." + ModInformation.modid + ".bauble." + name;
return "item." + ModInformation.MODID + ".bauble." + name;
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister ri) {
this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":onering");
this.icon[0] = ri.registerIcon(ModInformation.TEXTURE_PATH + ":onering");
}
@SideOnly(Side.CLIENT)
@@ -45,7 +45,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt
super(ArmorMaterial.DIAMOND, par3, par4);
this.setMaxDamage(27);
this.setMaxStackSize(1);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
MinecraftForge.EVENT_BUS.register(this);
}
@@ -65,7 +65,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/boots_electric");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/boots_electric");
}
@Override
@@ -160,7 +160,7 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return ModInformation.texturePath + ":textures/models/electricboots.png";
return ModInformation.TEXTURE_PATH + ":textures/models/electricboots.png";
}
@Override
@@ -23,11 +23,11 @@ public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/boots_nano");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/boots_nano");
}
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return ModInformation.texturePath + ":textures/models/nanobootstravel.png";
return ModInformation.TEXTURE_PATH + ":textures/models/nanobootstravel.png";
}
}
@@ -23,11 +23,11 @@ public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/boots_quantum");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/boots_quantum");
}
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return ModInformation.texturePath + ":textures/models/quantumbootstravel.png";
return ModInformation.TEXTURE_PATH + ":textures/models/quantumbootstravel.png";
}
}
@@ -87,23 +87,23 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
public ItemInfusedQuantumChestplate(InternalName internalName, int armorType) {
super(internalName, InternalName.quantum, armorType, 2000000, 12000.0D, 4);
MinecraftForge.EVENT_BUS.register(this);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
rnd = new Random();
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
iconNONE = iconRegister.registerIcon(ModInformation.texturePath + ":armor/armor_quantum_chest");
iconJETPACK = iconRegister.registerIcon(ModInformation.texturePath + ":armor/armor_quantum_chest_jetpack");
iconTHAUMIUM = iconRegister.registerIcon(ModInformation.texturePath + ":armor/armor_quantum_chest_wing_t");
iconNANO = iconRegister.registerIcon(ModInformation.texturePath + ":armor/armor_quantum_chest_wing_n");
iconQUANTUM = iconRegister.registerIcon(ModInformation.texturePath + ":armor/armor_quantum_chest_wing_q");
iconNONE = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/armor_quantum_chest");
iconJETPACK = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/armor_quantum_chest_jetpack");
iconTHAUMIUM = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/armor_quantum_chest_wing_t");
iconNANO = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/armor_quantum_chest_wing_n");
iconQUANTUM = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/armor_quantum_chest_wing_q");
}
@Override
public String getUnlocalizedName(ItemStack itemstack) {
return "item." + ModInformation.modid + ".chestplates.infusedQuantum";
return "item." + ModInformation.MODID + ".chestplates.infusedQuantum";
}
public String getItemStackDisplayName(ItemStack stack)
@@ -393,15 +393,15 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
switch (wing) {
case JETPACK:
return ModInformation.texturePath + ":textures/models/quantum_jetpack.png";
return ModInformation.TEXTURE_PATH + ":textures/models/quantum_jetpack.png";
case THAUMIUM:
return ModInformation.texturePath + ":textures/models/quantum_wings_t.png";
return ModInformation.TEXTURE_PATH + ":textures/models/quantum_wings_t.png";
case NANO:
return ModInformation.texturePath + ":textures/models/quantum_wings_n.png";
return ModInformation.TEXTURE_PATH + ":textures/models/quantum_wings_n.png";
case QUANTUM:
return ModInformation.texturePath + ":textures/models/quantum_wings_q.png";
return ModInformation.TEXTURE_PATH + ":textures/models/quantum_wings_q.png";
default:
return ModInformation.texturePath + ":textures/models/quantum.png";
return ModInformation.TEXTURE_PATH + ":textures/models/quantum.png";
}
}
@@ -37,18 +37,18 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi
public ItemElectricGoggles(ArmorMaterial material, int par3, int par4) {
super(material, par3, par4);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_electric");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/goggles_electric");
}
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return ModInformation.texturePath + ":textures/models/electricgoggles.png";
return ModInformation.TEXTURE_PATH + ":textures/models/electricgoggles.png";
}
@Override
@@ -19,7 +19,7 @@ public class ItemNanoGoggles extends ItemElectricGoggles {
public ItemNanoGoggles(ArmorMaterial material, int par3, int par4) {
super(material, par3, par4);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxDamage(27);
this.setMaxStackSize(1);
visDiscount = 6;
@@ -32,12 +32,12 @@ public class ItemNanoGoggles extends ItemElectricGoggles {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_nano");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/goggles_nano");
}
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return ModInformation.texturePath + ":textures/models/thaumicnanohelmet.png";
return ModInformation.TEXTURE_PATH + ":textures/models/thaumicnanohelmet.png";
}
@Override
@@ -27,7 +27,7 @@ public class ItemQuantumGoggles extends ItemNanoGoggles {
public ItemQuantumGoggles(ArmorMaterial material, int par3, int par4) {
super(material, par3, par4);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxDamage(27);
this.setMaxStackSize(1);
maxCharge = 10000000;
@@ -44,12 +44,12 @@ public class ItemQuantumGoggles extends ItemNanoGoggles {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_quantum");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/goggles_quantum");
}
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return ModInformation.texturePath + ":textures/models/thaumicquantumhelmet.png";
return ModInformation.TEXTURE_PATH + ":textures/models/thaumicquantumhelmet.png";
}
@Override
@@ -40,7 +40,7 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles {
super(material, par3, par4);
this.setMaxDamage(27);
this.setMaxStackSize(1);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.maxCharge = 1000000;
this.genDay = 256;
this.genNight = 128;
@@ -58,12 +58,12 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/goggles_solar");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/goggles_solar");
}
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layerType) {
return ModInformation.texturePath + ":textures/models/solarrevealinghelmet.png";
return ModInformation.TEXTURE_PATH + ":textures/models/solarrevealinghelmet.png";
}
@SuppressWarnings("unchecked")
@@ -31,7 +31,7 @@ public class ItemFeatherWing extends ItemArmor {
super(material, par3, par4);
this.setMaxStackSize(1);
this.setMaxDamage(120);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.isDamageable();
rnd = new Random();
}
@@ -39,13 +39,13 @@ public class ItemFeatherWing extends ItemArmor {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_feather");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/wing_feather");
}
@Override
@SideOnly(Side.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return ModInformation.texturePath + ":textures/models/featherwing.png";
return ModInformation.TEXTURE_PATH + ":textures/models/featherwing.png";
}
@Override
@@ -34,14 +34,14 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri
super(material, par3, par4);
this.setMaxStackSize(1);
this.setMaxDamage(27);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
visDiscount = 5;
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_nano");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/wing_nano");
}
@SideOnly(Side.CLIENT)
@@ -60,7 +60,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri
@Override
@SideOnly(Side.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return ModInformation.texturePath + ":textures/models/nanowing.png";
return ModInformation.TEXTURE_PATH + ":textures/models/nanowing.png";
}
@Override
@@ -19,7 +19,7 @@ public class ItemQuantumWing extends ItemNanoWing {
super(material, par3, par4);
this.setMaxStackSize(1);
this.setMaxDamage(27);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
visDiscount = 6;
transferLimit = 10000;
energyPerDamage = 1000;
@@ -28,13 +28,13 @@ public class ItemQuantumWing extends ItemNanoWing {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_quantum");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/wing_quantum");
}
@Override
@SideOnly(Side.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return ModInformation.texturePath + ":textures/models/quantumwing.png";
return ModInformation.TEXTURE_PATH + ":textures/models/quantumwing.png";
}
@Override
@@ -27,7 +27,7 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD
super(material, par3, par4);
this.setMaxStackSize(1);
this.setMaxDamage(250);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.isDamageable();
visDiscount = 4;
}
@@ -40,13 +40,13 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":armor/wing_thaumium");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":armor/wing_thaumium");
}
@Override
@SideOnly(Side.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return ModInformation.texturePath + ":textures/models/thaumiumwing.png";
return ModInformation.TEXTURE_PATH + ":textures/models/thaumiumwing.png";
}
@Override
@@ -25,7 +25,7 @@ public class ItemBlockElectricCloud extends ItemBlock{
@Override
public void registerIcons(IIconRegister ir) {
icon = ir.registerIcon(ModInformation.texturePath + ":" + "electric_cloud");
icon = ir.registerIcon(ModInformation.TEXTURE_PATH + ":" + "electric_cloud");
}
@Override
@@ -28,8 +28,8 @@ public abstract class ItemBaseFocus extends ItemFocusBasic {
public ItemBaseFocus(String unlocName) {
super();
setUnlocalizedName(ModInformation.modid + ".focus." + unlocName);
setCreativeTab(ElectroMagicTools.tabEMT);
setUnlocalizedName(ModInformation.MODID + ".focus." + unlocName);
setCreativeTab(ElectroMagicTools.TAB);
setMaxDamage(1);
setNoRepair();
setMaxStackSize(1);
@@ -38,7 +38,7 @@ public abstract class ItemBaseFocus extends ItemFocusBasic {
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister ir) {
this.icon = ir.registerIcon(ModInformation.texturePath + ":" + "focus_" + textureName);
this.icon = ir.registerIcon(ModInformation.TEXTURE_PATH + ":" + "focus_" + textureName);
}
boolean hasDepth() {
@@ -20,7 +20,7 @@ public class ItemEnergyBallFocus extends ItemBaseFocus {
@Override
public int getFocusColor(ItemStack stack) {
return 0xFFFF00;
return 0x0000FF;
}
@Override
@@ -33,14 +33,14 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem {
public ItemElectricHoeGrowth() {
super(ToolMaterial.EMERALD);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxStackSize(1);
this.growthCost = 10000;
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
this.icon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/hoe_growth");
this.icon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/hoe_growth");
}
@SideOnly(Side.CLIENT)
@@ -32,7 +32,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem {
public ItemElectricThorHammer() {
super(ToolMaterial.EMERALD);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxDamage(27);
this.setMaxStackSize(1);
}
@@ -40,7 +40,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":hammer/electricthorhammer");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":hammer/electricthorhammer");
}
@SuppressWarnings({"rawtypes", "unchecked"})
@@ -26,14 +26,14 @@ public class ItemThorHammer extends ItemSword implements IRepairable {
public ItemThorHammer() {
super(ToolMaterial.EMERALD);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxDamage(2000);
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":hammer/thorhammer");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":hammer/thorhammer");
}
@Override
@@ -25,14 +25,14 @@ public class ItemThorHammerBroken extends ItemSword implements IRepairable {
public ItemThorHammerBroken() {
super(ToolMaterial.EMERALD);
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxDamage(1000);
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":hammer/taintedthorhammer");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":hammer/taintedthorhammer");
}
@Override
@@ -49,7 +49,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
public ItemDiamondChainsaw() {
super(ToolMaterial.EMERALD);
this.efficiencyOnProperMaterial = 16F;
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxDamage(27);
this.setMaxStackSize(1);
}
@@ -57,7 +57,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/chainsaw_diamond");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/chainsaw_diamond");
}
@Override
@@ -35,7 +35,7 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw {
this.efficiencyOnProperMaterial = 25F;
alternateServer = false;
alternateClient = false;
setCreativeTab(ElectroMagicTools.tabEMT);
setCreativeTab(ElectroMagicTools.TAB);
this.maxStackSize = 1;
this.setMaxDamage(27);
maxCharge = 900000;
@@ -47,7 +47,7 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/chainsaw_stream");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/chainsaw_stream");
}
@Override
@@ -21,7 +21,7 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw {
public ItemThaumiumChainsaw() {
this.efficiencyOnProperMaterial = 21F;
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxDamage(27);
this.setMaxStackSize(1);
maxCharge = 60000;
@@ -32,7 +32,7 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/chainsaw_thaumium");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/chainsaw_thaumium");
}
@Override
@@ -44,7 +44,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
public ItemRockbreakerDrill() {
side = 0;
setCreativeTab(ElectroMagicTools.tabEMT);
setCreativeTab(ElectroMagicTools.TAB);
this.efficiencyOnProperMaterial = 25F;
this.setMaxStackSize(1);
if (EMTConfigHandler.toolsInBore == false) {
@@ -61,7 +61,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/drill_rockbreaker");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/drill_rockbreaker");
}
private boolean isEffectiveAgainst(Block block) {
@@ -31,7 +31,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem {
public ItemThaumiumDrill() {
super(ToolMaterial.EMERALD);
this.efficiencyOnProperMaterial = 20F;
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxStackSize(1);
if (EMTConfigHandler.toolsInBore == false) {
this.setMaxDamage(27);
@@ -43,7 +43,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/drill_thaumium");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/drill_thaumium");
}
@SideOnly(Side.CLIENT)
@@ -19,7 +19,7 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron {
public ItemOmnitoolDiamond() {
super();
this.efficiencyOnProperMaterial = 16F;
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxStackSize(1);
if (!EMTConfigHandler.toolsInBore) {
this.setMaxDamage(27);
@@ -34,7 +34,7 @@ public class ItemOmnitoolDiamond extends ItemOmnitoolIron {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/omnitool_diamond");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/omnitool_diamond");
}
@Override
@@ -33,7 +33,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
public ItemOmnitoolIron() {
super(ToolMaterial.EMERALD);
this.efficiencyOnProperMaterial = 13F;
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxStackSize(1);
if (!EMTConfigHandler.toolsInBore) {
this.setMaxDamage(27);
@@ -46,7 +46,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/omnitool_iron");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/omnitool_iron");
}
@SideOnly(Side.CLIENT)
@@ -19,7 +19,7 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond {
public ItemOmnitoolThaumium() {
super();
this.efficiencyOnProperMaterial = 21F;
this.setCreativeTab(ElectroMagicTools.tabEMT);
this.setCreativeTab(ElectroMagicTools.TAB);
this.setMaxStackSize(1);
if (!EMTConfigHandler.toolsInBore) {
this.setMaxDamage(27);
@@ -34,7 +34,7 @@ public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond {
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/omnitool_thaumium");
this.itemIcon = iconRegister.registerIcon(ModInformation.TEXTURE_PATH + ":tools/omnitool_thaumium");
}
@Override
+2 -2
View File
@@ -38,9 +38,9 @@ public class EMTEventHandler {
@SubscribeEvent
public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
if (event.modID.equals(ModInformation.modid)) {
if (event.modID.equals(ModInformation.MODID)) {
EMTConfigHandler.syncConfig();
ElectroMagicTools.logger.info("Refreshing configuration file.");
ElectroMagicTools.LOGGER.info("Refreshing configuration file.");
}
}
}