diff --git a/libraries/launcher/CMakeLists.txt b/libraries/launcher/CMakeLists.txt
index 9c0e128b8..b1ee42fda 100644
--- a/libraries/launcher/CMakeLists.txt
+++ b/libraries/launcher/CMakeLists.txt
@@ -7,13 +7,6 @@ set(CMAKE_JAVA_JAR_ENTRY_POINT org.multimc.EntryPoint)
set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
set(SRC
- # OSX things
- org/simplericity/macify/eawt/Application.java
- org/simplericity/macify/eawt/ApplicationAdapter.java
- org/simplericity/macify/eawt/ApplicationEvent.java
- org/simplericity/macify/eawt/ApplicationListener.java
- org/simplericity/macify/eawt/DefaultApplication.java
-
# legacy applet wrapper thing.
# The launcher has to be there for silly FML/Forge relauncher.
net/minecraft/Launcher.java
diff --git a/libraries/launcher/org/multimc/EntryPoint.java b/libraries/launcher/org/multimc/EntryPoint.java
index e4d335b76..f7e1aed81 100644
--- a/libraries/launcher/org/multimc/EntryPoint.java
+++ b/libraries/launcher/org/multimc/EntryPoint.java
@@ -15,11 +15,7 @@ package org.multimc;/*
*/
import org.multimc.onesix.OneSixLauncher;
-import org.simplericity.macify.eawt.Application;
-import org.simplericity.macify.eawt.DefaultApplication;
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
import java.io.*;
import java.nio.charset.Charset;
@@ -34,21 +30,6 @@ public class EntryPoint
public static void main(String[] args)
{
- // Set the OSX application icon first, if we are on OSX.
- Application application = new DefaultApplication();
- if(application.isMac())
- {
- try
- {
- BufferedImage image = ImageIO.read(new File("icon.png"));
- application.setApplicationIconImage(image);
- }
- catch (IOException e)
- {
- e.printStackTrace();
- }
- }
-
EntryPoint listener = new EntryPoint();
int retCode = listener.listen();
if (retCode != 0)
diff --git a/libraries/launcher/org/simplericity/macify/eawt/Application.java b/libraries/launcher/org/simplericity/macify/eawt/Application.java
deleted file mode 100644
index 153bb9ee2..000000000
--- a/libraries/launcher/org/simplericity/macify/eawt/Application.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.simplericity.macify.eawt;
-
-/*
- * Copyright 2007 Eirik Bjorsnos.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-
-/**
- * The Macify Library API interface provides integration with the OS X platform for Java Applications.
- * The API includes a facade to the
- *
- * Apple Java Extensions API
- * .
- * Additionally, it provides access to several useful methods in the Cocoa NSApplication API.
- *
- * The default implementation of this interface is {@link org.simplericity.macify.eawt.DefaultApplication}.
- */
-public interface Application {
-
- static int REQUEST_USER_ATTENTION_TYPE_CRITICAL = 1 ;
- static int REQUEST_USER_ATTENTION_TYPE_INFORMATIONAL = 2 ;
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- void addAboutMenuItem();
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- void addApplicationListener(ApplicationListener applicationListener);
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- void addPreferencesMenuItem();
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- boolean getEnabledAboutMenu();
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- boolean getEnabledPreferencesMenu();
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- boolean isAboutMenuItemPresent();
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- boolean isPreferencesMenuItemPresent();
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- void removeAboutMenuItem();
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- void removeApplicationListener(ApplicationListener applicationListener);
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- void removePreferencesMenuItem();
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- void setEnabledAboutMenu(boolean enabled);
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- void setEnabledPreferencesMenu(boolean enabled);
-
- /**
- * See
- *
- * Apple's API
- * .
- */
- Point getMouseLocationOnScreen();
-
- /**
- * See
- *
- * Apple's NSApplication Class Reference
- * .
- * @param type on of {@link #REQUEST_USER_ATTENTION_TYPE_CRITICAL} or {@link #REQUEST_USER_ATTENTION_TYPE_INFORMATIONAL}.
- */
- int requestUserAttention(int type);
-
- /**
- * See
- *
- * Apple's NSApplication Class Reference
- *
- */
- void cancelUserAttentionRequest(int request);
-
- /**
- * Update the application's icon image
- * @param image
- */
- void setApplicationIconImage(BufferedImage image);
-
- /**
- * Get the application's icon image.
- */
- BufferedImage getApplicationIconImage();
-
- /**
- * Determines whether the application is running on a Mac AND the Apple Extensions API classes are available.
- * @return
- */
- boolean isMac();
-
-
-}
diff --git a/libraries/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java
deleted file mode 100644
index e9c3db7d5..000000000
--- a/libraries/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.simplericity.macify.eawt;
-
-/*
- * Copyright 2007 Eirik Bjorsnos.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public class ApplicationAdapter implements ApplicationListener {
-
- public void handleQuit(ApplicationEvent event) {
-
- }
-
- public void handleAbout(ApplicationEvent event) {
-
- }
-
- public void handleOpenApplication(ApplicationEvent event) {
-
- }
-
- public void handleOpenFile(ApplicationEvent event) {
-
- }
-
- public void handlePreferences(ApplicationEvent event) {
-
- }
-
- public void handlePrintFile(ApplicationEvent event) {
-
- }
-
- public void handleReOpenApplication(ApplicationEvent event) {
-
- }
-}
diff --git a/libraries/launcher/org/simplericity/macify/eawt/ApplicationEvent.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationEvent.java
deleted file mode 100644
index 784203556..000000000
--- a/libraries/launcher/org/simplericity/macify/eawt/ApplicationEvent.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.simplericity.macify.eawt;
-
-/*
- * Copyright 2007 Eirik Bjorsnos.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public interface ApplicationEvent {
- String getFilename();
- boolean isHandled();
- void setHandled(boolean handled);
- Object getSource();
- String toString();
-}
diff --git a/libraries/launcher/org/simplericity/macify/eawt/ApplicationListener.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationListener.java
deleted file mode 100644
index a291bee49..000000000
--- a/libraries/launcher/org/simplericity/macify/eawt/ApplicationListener.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.simplericity.macify.eawt;
-
-/*
- * Copyright 2007 Eirik Bjorsnos.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public interface ApplicationListener {
- void handleAbout(ApplicationEvent event);
- void handleOpenApplication(ApplicationEvent event);
- void handleOpenFile(ApplicationEvent event);
- void handlePreferences(ApplicationEvent event);
- void handlePrintFile(ApplicationEvent event);
- void handleQuit(ApplicationEvent event);
- void handleReOpenApplication(ApplicationEvent event);
-}
diff --git a/libraries/launcher/org/simplericity/macify/eawt/DefaultApplication.java b/libraries/launcher/org/simplericity/macify/eawt/DefaultApplication.java
deleted file mode 100644
index 5752a3505..000000000
--- a/libraries/launcher/org/simplericity/macify/eawt/DefaultApplication.java
+++ /dev/null
@@ -1,418 +0,0 @@
-package org.simplericity.macify.eawt;
-
-/*
- * Copyright 2007 Eirik Bjorsnos.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.MalformedURLException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * Implements Application by calling the Mac OS X API through reflection.
- * If this class is used on a non-OS X platform the operations will have no effect or they will simulate
- * what the Apple API would do for those who manipulate state. ({@link #setEnabledAboutMenu(boolean)} etc.)
- */
-@SuppressWarnings("unchecked")
-public class DefaultApplication implements Application {
-
- private Object application;
- private Class applicationListenerClass;
-
- Map listenerMap = Collections.synchronizedMap(new HashMap