Moved to API path

3216alec · Mar 31, 2012 · 8772e70 · 8772e70
1 parent dadca5e
commit 8772e70
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 16 deletions.
diff --git a/src/de/davboecki/multimodworld/plugin/MultiModWorld.java b/src/de/davboecki/multimodworld/plugin/MultiModWorld.java
@@ -5,7 +5,7 @@
 import net.minecraft.server.Entity;
 import net.minecraft.server.Packet;
 import de.davboecki.multimodworld.plugin.settings.Settings;
-import de.davboecki.multimodworld.server.plugin.IModWorldHandlePlugin;
+import de.davboecki.multimodworld.api.plugin.IModWorldHandlePlugin;
 
 public class MultiModWorld implements IModWorldHandlePlugin{
 

diff --git a/src/de/davboecki/multimodworld/plugin/PrivatChest.java b/src/de/davboecki/multimodworld/plugin/PrivatChest.java
@@ -42,14 +42,14 @@
 import de.davboecki.multimodworld.plugin.reteleport.ReTeleportThread;
 import de.davboecki.multimodworld.plugin.reteleport.TeleportHandler;
 import de.davboecki.multimodworld.plugin.yaml.MyYamlConstructor;
-import de.davboecki.multimodworld.server.ForgeLoginHooks;
-import de.davboecki.multimodworld.server.ModChecker;
-import de.davboecki.multimodworld.server.plugin.IModWorldHandlePlugin;
 import de.davboecki.multimodworld.plugin.settings.ExchangeWorldSetting;
 import de.davboecki.multimodworld.plugin.settings.Settings;
 import de.davboecki.multimodworld.plugin.settings.WorldSetting;
 import de.davboecki.multimodworld.plugin.inventory.ModItemSaver;
 
+import de.davboecki.multimodworld.api.ForgeLoginHooks;
+import de.davboecki.multimodworld.api.ModChecker;
+import de.davboecki.multimodworld.api.plugin.IModWorldHandlePlugin;
 
 public class PrivatChest extends JavaPlugin {
 
@@ -141,16 +141,13 @@ public void onEnable() {
 
 	        log.info("[PrivatChest] Plugin v"+this.getDescription().getVersion()+" has been enabled!");
 	        if(MultiModWorld != null) {
-	        	String ModVersion = de.davboecki.multimodworld.server.ModChecker.getVersion();
-	        	boolean modcorrect = de.davboecki.multimodworld.server.ModChecker.checkNetModded();
+	        	String ModVersion = de.davboecki.multimodworld.api.ModChecker.getVersion();
 	        	String MultiModWorldVersion = "v1.1.2";
 	        	boolean correctversion = ModVersion.equalsIgnoreCase(MultiModWorldVersion);
-	        	if(!correctversion || !modcorrect) {
+	        	if(!correctversion) {
 	        		this.getServer().getPluginManager().disablePlugin(this);
 	        		if(!correctversion)
 	        			log.severe("[MultiModWorld] Mod "+ModVersion+" has been found. But "+MultiModWorldVersion+" is required.");
-	        		if(!modcorrect)
-	        			log.severe("[MultiModWorld] Mod "+ModVersion+" has been found. Server mod not correctly installed.");
 	        	} else {
 	        		log.info("[MultiModWorld] Mod "+ModVersion+" has been enabled.");
 	        	}

diff --git a/src/de/davboecki/multimodworld/plugin/RoomControler.java b/src/de/davboecki/multimodworld/plugin/RoomControler.java
@@ -15,7 +15,7 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-import de.davboecki.multimodworld.server.ForgeLoginHooks;
+import de.davboecki.multimodworld.api.ForgeLoginHooks;
 
 
 public class RoomControler {

diff --git a/src/de/davboecki/multimodworld/plugin/listener/PacketListener.java b/src/de/davboecki/multimodworld/plugin/listener/PacketListener.java
@@ -10,7 +10,7 @@
 import net.minecraft.server.Packet230ModLoader;
 import net.minecraft.server.Packet5EntityEquipment;
 import de.davboecki.multimodworld.plugin.PrivatChest;
-import de.davboecki.multimodworld.server.ForgeLoginHooks;
+import de.davboecki.multimodworld.api.ForgeLoginHooks;
 
 public class PacketListener{
 

diff --git a/src/de/davboecki/multimodworld/plugin/listener/PlayerModPacketListener.java b/src/de/davboecki/multimodworld/plugin/listener/PlayerModPacketListener.java
@@ -13,9 +13,9 @@
 
 import de.davboecki.multimodworld.plugin.PrivatChest;
 import de.davboecki.multimodworld.plugin.reteleport.ReTeleportThread;
-import de.davboecki.multimodworld.server.ForgeLoginHooks;
-import de.davboecki.multimodworld.server.modhandleevent.ModsMissingHandleEvent;
-import de.davboecki.multimodworld.server.modhandleevent.ModsOKHandleEvent;
+import de.davboecki.multimodworld.api.ForgeLoginHooks;
+import de.davboecki.multimodworld.api.modhandleevent.ModsMissingHandleEvent;
+import de.davboecki.multimodworld.api.modhandleevent.ModsOKHandleEvent;
 
 
 public class PlayerModPacketListener implements Listener{

diff --git a/src/de/davboecki/multimodworld/plugin/listener/PrivatChestPlayerListener.java b/src/de/davboecki/multimodworld/plugin/listener/PrivatChestPlayerListener.java
@@ -33,7 +33,7 @@
 import de.davboecki.multimodworld.plugin.reteleport.ReTeleportThread;
 import de.davboecki.multimodworld.plugin.reteleport.TeleportHandler;
 import de.davboecki.multimodworld.plugin.settings.Settings;
-import de.davboecki.multimodworld.server.ForgeLoginHooks;
+import de.davboecki.multimodworld.api.ForgeLoginHooks;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/src/de/davboecki/multimodworld/plugin/reteleport/TeleportHandler.java b/src/de/davboecki/multimodworld/plugin/reteleport/TeleportHandler.java
@@ -35,7 +35,7 @@
 import de.davboecki.multimodworld.plugin.commandhandler.CallableObjects;
 import de.davboecki.multimodworld.plugin.commandhandler.ConfirmListener;
 import de.davboecki.multimodworld.plugin.settings.Settings;
-import de.davboecki.multimodworld.server.ForgeLoginHooks;
+import de.davboecki.multimodworld.api.ForgeLoginHooks;
 
 public class TeleportHandler {