diff --git a/patches/minecraft/net/minecraftforge/fml/relauncher/Side.java.patch b/patches/minecraft/net/minecraftforge/fml/relauncher/Side.java.patch deleted file mode 100644 index 5c4dc688c..000000000 --- a/patches/minecraft/net/minecraftforge/fml/relauncher/Side.java.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- ../src-base/minecraft/net/minecraftforge/fml/relauncher/Side.java -+++ ../src-work/minecraft/net/minecraftforge/fml/relauncher/Side.java -@@ -1,15 +1,41 @@ -+/* -+ * Forge Mod Loader -+ * Copyright (c) 2012-2013 cpw. -+ * All rights reserved. This program and the accompanying materials -+ * are made available under the terms of the GNU Lesser Public License v2.1 -+ * which accompanies this distribution, and is available at -+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html -+ * -+ * Contributors: -+ * cpw - implementation -+ */ -+ - package net.minecraftforge.fml.relauncher; - --public enum Side --{ -+public enum Side { -+ -+ /** -+ * The client side. Specifically, an environment where rendering capability exists. -+ * Usually in the game client. -+ */ - CLIENT, -+ /** -+ * The server side. Specifically, an environment where NO rendering capability exists. -+ * Usually on the dedicated server. -+ */ - SERVER; - -+ /** -+ * @return If this is the server environment -+ */ - public boolean isServer() - { -- return !this.isClient(); -+ return !isClient(); - } - -+ /** -+ * @return if this is the Client environment -+ */ - public boolean isClient() - { - return this == CLIENT; diff --git a/patches/minecraft/net/minecraftforge/fml/relauncher/SideOnly.java.patch b/patches/minecraft/net/minecraftforge/fml/relauncher/SideOnly.java.patch deleted file mode 100644 index 8e9339011..000000000 --- a/patches/minecraft/net/minecraftforge/fml/relauncher/SideOnly.java.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- ../src-base/minecraft/net/minecraftforge/fml/relauncher/SideOnly.java -+++ ../src-work/minecraft/net/minecraftforge/fml/relauncher/SideOnly.java -@@ -1,3 +1,15 @@ -+/* -+ * Forge Mod Loader -+ * Copyright (c) 2012-2013 cpw. -+ * All rights reserved. This program and the accompanying materials -+ * are made available under the terms of the GNU Lesser Public License v2.1 -+ * which accompanies this distribution, and is available at -+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html -+ * -+ * Contributors: -+ * cpw - implementation -+ */ -+ - package net.minecraftforge.fml.relauncher; - - import java.lang.annotation.ElementType; -@@ -5,9 +17,25 @@ - import java.lang.annotation.RetentionPolicy; - import java.lang.annotation.Target; - -+import net.minecraftforge.fml.common.SidedProxy; -+ -+ -+/** -+ * Marks the associated element as being only available on a certain {@link Side}. This is -+ * generally meant for internal Forge and FML use only and should only be used on mod classes -+ * when other more common mechanisms, such as using a {@link SidedProxy} fail to work. -+ * -+ * Note, this will only apply to the direct element marked. This code: -+ * @SideOnly public MyField field = new MyField(); will not work, as the initializer -+ * is a separate piece of code to the actual field declaration, and will not be able to find -+ * it's field on the wrong side. -+ * -+ * @author cpw -+ * -+ */ - @Retention(RetentionPolicy.RUNTIME) --@Target( {ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR}) -+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR}) - public @interface SideOnly - { -- Side value(); -+ public Side value(); - }