Skip to content
This repository has been archived by the owner on Jul 21, 2024. It is now read-only.

Commit

Permalink
Fixed remapper typo (#313)
Browse files Browse the repository at this point in the history
  • Loading branch information
kwright02 authored Dec 11, 2020
1 parent c645e79 commit 5b243f8
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 5 deletions.
50 changes: 46 additions & 4 deletions patches/net/minecraftforge/fml/relauncher/SideOnly.java.patch
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
--- ../src-base/minecraft/net/minecraftforge/fml/relauncher/SideOnly.java
+++ ../src-work/minecraft/net/minecraftforge/fml/relauncher/SideOnly.java
@@ -17,6 +17,405 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

@@ -1,3 +1,421 @@
+/*
+ * Minecraft Forge
+ * Copyright (c) 2016-2018.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
+ * Minecraft Forge
+ * Copyright (c) 2016-2018.
Expand Down Expand Up @@ -406,3 +422,29 @@
package net.minecraftforge.fml.relauncher;

import java.lang.annotation.ElementType;
@@ -5,8 +423,24 @@
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 <em>only</em> apply to the direct element marked. This code:
+ * <code> @SideOnly public MyField field = new MyField();</code> will <strong>not</strong> 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();
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public static void initialize(ClassNode classNode) {
}
if ((insnNode.owner + ";" + insnNode.name).equals("javax/script/ScriptEngineManager;<init>") && insnNode.desc.equals("()V")) {
insnNode.desc = "(Ljava/lang/ClassLoader;)V";
methodNode.instructions.insertBefore(insnNode, new MethodInsnNode(Opcodes.INVOKESTATIC, "java/lang/ClassLoader", "getSytemClassLoader", "()Ljava/lang/ClassLoader;", false));
methodNode.instructions.insertBefore(insnNode, new MethodInsnNode(Opcodes.INVOKESTATIC, "java/lang/ClassLoader", "getSystemClassLoader", "()Ljava/lang/ClassLoader;", false));
methodNode.maxStack++;
}
}
Expand Down

0 comments on commit 5b243f8

Please sign in to comment.