From 673b8a358eed4220dd82fcc4712f98aa5d84848d Mon Sep 17 00:00:00 2001 From: pahimar Date: Wed, 15 Aug 2012 14:11:15 -0400 Subject: [PATCH] Cleaning up for MC 1.3.* work --- ee3_server/ee3/server/EEProxy.java | 105 ------------------- ee3_server/net/minecraft/src/EnumRarity.java | 26 ----- 2 files changed, 131 deletions(-) delete mode 100644 ee3_server/ee3/server/EEProxy.java delete mode 100644 ee3_server/net/minecraft/src/EnumRarity.java diff --git a/ee3_server/ee3/server/EEProxy.java b/ee3_server/ee3/server/EEProxy.java deleted file mode 100644 index 712058af..00000000 --- a/ee3_server/ee3/server/EEProxy.java +++ /dev/null @@ -1,105 +0,0 @@ -package ee3.server; - -import java.io.File; -import java.lang.reflect.Field; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.ReflectionHelper; - -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.EnumRarity; -import net.minecraft.src.ModLoader; -import net.minecraft.src.NetworkManager; -import net.minecraft.src.World; -import ee3.container.ContainerPortableCrafting; -import ee3.core.interfaces.IProxy; -import ee3.lib.GuiIds; - -/** - * TODO Class Description - * @author pahimar - * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) - * - */ -public class EEProxy implements IProxy { - - public EEProxy() { } - - @Override - public void registerRenderInformation() { - // TODO Auto-generated method stub - - } - - @Override - public void registerTileEntities() { - // TODO Auto-generated method stub - - } - - @Override - public File getMinecraftDir() { - return new File("."); - } - - @Override - public boolean isRemote() { - return false; - } - - @Override - public World getCurrentWorld() { - return null; - } - - @Override - public String getMinecraftVersion() { - return ModLoader.getMinecraftServerInstance().getVersion(); - } - - public void handleControl(NetworkManager network, int key) { } - public void handlePedestalPacket(int x, int y, int z, int itemId, boolean activated) { } - public void handleTEPacket(int x, int y, int z, byte direction, String player) { } - - @Override - public void registerSoundHandler() { } - - @Override - // TODO Server side: Handle GUI call - public Object handleGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - if (ID == GuiIds.PORTABLE_CRAFTING) { - return new ContainerPortableCrafting(player.inventory, world, x, y, z); - } - - return null; - } - - @Override - public void playSound(String soundName, float x, float y, float z, float volume, float pitch) { } - - @Override - public void addCustomEnumRarityTypes() { } - - @Override - public EnumRarity getCustomEnumRarityType(String custom) { - return null; - } - - @Override - public void registerKeyBindings() { } - - @Override - public void keyBindingEvent(Object event) { } - - @Override - public boolean isPortableCraftingGUIOpen() { - return false; - } - - @Override - public void preloadTextures() { } - - @Override - public void initTextureFX() { } - -} diff --git a/ee3_server/net/minecraft/src/EnumRarity.java b/ee3_server/net/minecraft/src/EnumRarity.java deleted file mode 100644 index ed8cb840..00000000 --- a/ee3_server/net/minecraft/src/EnumRarity.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.minecraft.src; - -/** - * EnumRarity - * Stubbed in server side to allow for EE item code to be common and not client/server specific - * @author pahimar - * - */ - -public enum EnumRarity -{ - common(15, "Common"), - uncommon(14, "Uncommon"), - rare(11, "Rare"), - epic(13, "Epic"); - - /** The color given to the name of items with that rarity. */ - public final int nameColor; - public final String field_40532_f; - - private EnumRarity(int par3, String par4Str) - { - this.nameColor = par3; - this.field_40532_f = par4Str; - } -} \ No newline at end of file