Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added a reference class to the lib package for holding referenced constants throughout the mod.

Browse source 
Updated pre-existing reference constants to point to the new class.
First stab at some item classes and interfaces. Not satisfied currently but will keep refining it.
This commit is contained in:
pahimar 2012-05-03 16:05:49 -04:00
parent e5f48a0342
commit f18d562885
11 changed files with 76 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ee3_common/net/minecraft/src/ee3/core/ConfigurationManager.java
View file

@ -4,6 +4,7 @@ import java.io.File;
import java.util.HashMap;
import net.minecraft.src.mod_EE3;
import net.minecraft.src.ee3.lib.Reference;
import net.minecraft.src.forge.Configuration;
import net.minecraft.src.forge.Property;
@ -13,7 +14,7 @@ public class ConfigurationManager {
private static final String CATEGORY_KEYBIND = "keybinds";
public ConfigurationManager(String cfgFile) {
this.cfgFile = "config/ee3/" + cfgFile;
this.cfgFile = Reference.CONFIG_DIR + cfgFile;
}
public void init() {

10
ee3_common/net/minecraft/src/ee3/core/IItemChargeable.java Normal file
View file

@ -0,0 +1,10 @@
package net.minecraft.src.ee3.core;
public interface IItemChargeable {
public abstract int getMaxCharge();
public abstract void increaseCharge();
public abstract void decreaseCharge();
}

5
ee3_common/net/minecraft/src/ee3/core/IItemModal.java Normal file
View file

@ -0,0 +1,5 @@
package net.minecraft.src.ee3.core;
public interface IItemModal {
}

4
ee3_common/net/minecraft/src/ee3/core/ServerClientProxy.java
View file

@ -1,7 +1,7 @@
package net.minecraft.src.ee3.core;
import net.minecraft.src.ModLoader;
import net.minecraft.src.mod_EE3;
import net.minecraft.src.ee3.lib.Reference;
import net.minecraft.src.forge.MinecraftForge;
public enum ServerClientProxy {
@ -18,7 +18,7 @@ public enum ServerClientProxy {
try {
return (IProxy)Class.forName(className).newInstance();
} catch (Exception e) {
ModLoader.getLogger().severe("[" + mod_EE3.CHANNEL_NAME + "] A fatal error has occured initializing Equivalent Exchange");
ModLoader.getLogger().severe("[" + Reference.CHANNEL_NAME + "] A fatal error has occured initializing Equivalent Exchange");
e.printStackTrace(System.err);
throw new RuntimeException(e);
}

9
ee3_common/net/minecraft/src/ee3/core/Version.java
View file

@ -8,6 +8,7 @@ import java.net.URL;
import net.minecraft.src.ModLoader;
import net.minecraft.src.mod_EE3;
import net.minecraft.src.ee3.lib.Reference;
public class Version {
@ -41,9 +42,9 @@ public class Version {
String line = null;
while ((line = reader.readLine()) != null) {
if (line.startsWith(mod_EE3.proxy.getMinecraftVersion())) {
if (line.contains(mod_EE3.CHANNEL_NAME)) {
if (line.contains(Reference.CHANNEL_NAME)) {
if (line.endsWith(getVersion())) {
ModLoader.getLogger().info("[" + mod_EE3.CHANNEL_NAME + "] Version Check: Using the latest version");
ModLoader.getLogger().info("[" + Reference.CHANNEL_NAME + "] Version Check: Using the latest version");
currentVersion = CURRENT;
return;
}
@ -51,11 +52,11 @@ public class Version {
}
}
ModLoader.getLogger().info("[" + mod_EE3.CHANNEL_NAME + "] Version Check: Using outdated version");
ModLoader.getLogger().info("[" + Reference.CHANNEL_NAME + "] Version Check: Using outdated version");
currentVersion = OUTDATED;
} catch (Exception e) {
ModLoader.getLogger().warning("[" + mod_EE3.CHANNEL_NAME + "] Version Check: Unable to read from remote version authority");
ModLoader.getLogger().warning("[" + Reference.CHANNEL_NAME + "] Version Check: Unable to read from remote version authority");
currentVersion = CONNECTION_ERROR;
}
}

11
ee3_common/net/minecraft/src/ee3/item/ItemChargeable.java Normal file
View file

@ -0,0 +1,11 @@
package net.minecraft.src.ee3.item;
public class ItemChargeable extends ItemMod {
private int maxCharge;
public ItemChargeable(int i, int j) {
super(i);
maxCharge = j;
}
}

21
ee3_common/net/minecraft/src/ee3/item/ItemMod.java Normal file
View file

@ -0,0 +1,21 @@
package net.minecraft.src.ee3.item;
import net.minecraft.src.Item;
import net.minecraft.src.ee3.lib.Reference;
import net.minecraft.src.forge.ITextureProvider;
public class ItemMod extends Item implements ITextureProvider {
public ItemMod(int i) {
super(i);
maxStackSize = 1;
setNoRepair();
}
@Override
public String getTextureFile() {
// TODO Proper location
return Reference.SPRITE_SHEET_LOCATION + Reference.ITEM_SPRITE_SHEET;
}
}

14
ee3_common/net/minecraft/src/ee3/lib/Reference.java Normal file
View file

@ -0,0 +1,14 @@
package net.minecraft.src.ee3.lib;
public class Reference {
public static final String CHANNEL_NAME = "EE3";
public static final String CONFIG_FILE = "EE3.cfg";
public static final String CONFIG_DIR = "config/ee3/";
public static final String SPRITE_SHEET_LOCATION = "/ee/art/sprites/";
public static final String ITEM_SPRITE_SHEET = "eqexsheet.png";
public static final String GUI_SHEET_LOCATION = "/ee/art/gui/";
public static final String ARMOR_SHEET_LOCATION = "/ee/art/armor/";
public static final String SOUND_RESOURCE_LOCATION = "/ee/sound/";
}

4
ee3_common/net/minecraft/src/ee3/network/PacketHandler.java
View file

@ -7,7 +7,7 @@ import java.io.IOException;
import net.minecraft.src.NetworkManager;
import net.minecraft.src.Packet;
import net.minecraft.src.Packet1Login;
import net.minecraft.src.mod_EE3;
import net.minecraft.src.ee3.lib.Reference;
import net.minecraft.src.forge.IConnectionHandler;
import net.minecraft.src.forge.IPacketHandler;
import net.minecraft.src.forge.MessageManager;
@ -21,7 +21,7 @@ public class PacketHandler implements IPacketHandler, IConnectionHandler {
@Override
//Called when a connection is established
public void onLogin(NetworkManager network, Packet1Login login) {
MessageManager.getInstance().registerChannel(network, this, mod_EE3.CHANNEL_NAME);
MessageManager.getInstance().registerChannel(network, this, Reference.CHANNEL_NAME);
}
@Override

4
ee3_common/net/minecraft/src/ee3/network/PacketTypeHandler.java
View file

@ -5,7 +5,7 @@ import java.io.DataInputStream;
import net.minecraft.src.Packet;
import net.minecraft.src.Packet250CustomPayload;
import net.minecraft.src.mod_EE3;
import net.minecraft.src.ee3.lib.Reference;
public enum PacketTypeHandler {
@ -50,7 +50,7 @@ public enum PacketTypeHandler {
public static Packet populatePacket(EEPacket packet) {
byte[] data = packet.populate();
Packet250CustomPayload pkt = new Packet250CustomPayload();
pkt.channel = mod_EE3.CHANNEL_NAME;
pkt.channel = Reference.CHANNEL_NAME;
pkt.data = data;
pkt.length = data.length;
pkt.isChunkDataPacket = packet.isChunkDataPacket;

4
ee3_common/net/minecraft/src/mod_EE3.java
View file

@ -6,6 +6,7 @@ import net.minecraft.src.ee3.core.IProxy;
import net.minecraft.src.ee3.core.ServerClientProxy;
import net.minecraft.src.ee3.core.Version;
import net.minecraft.src.ee3.gui.GuiHandler;
import net.minecraft.src.ee3.lib.Reference;
import net.minecraft.src.ee3.lib.Sounds;
import net.minecraft.src.ee3.network.PacketHandler;
import net.minecraft.src.forge.MinecraftForge;
@ -16,8 +17,7 @@ public class mod_EE3 extends NetworkMod {
public static mod_EE3 instance;
public static IProxy proxy;
public static final String CHANNEL_NAME = "EE3";
public static ConfigurationManager config = new ConfigurationManager("EE3.cfg");
public static ConfigurationManager config = new ConfigurationManager(Reference.CONFIG_FILE);
public mod_EE3() {
instance = this;