diff --git a/build.gradle b/build.gradle index 45d4374..22ca15f 100644 --- a/build.gradle +++ b/build.gradle @@ -28,9 +28,9 @@ jar { 'Implementation-Version': version, 'Implementation-Vendor': 'yushijinhun', 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - 'Automatic-Module-Name': 'org.to2mbn.authlibinjector', - 'Premain-Class': 'org.to2mbn.authlibinjector.javaagent.AuthlibInjectorPremain', - 'Agent-Class': 'org.to2mbn.authlibinjector.javaagent.AuthlibInjectorPremain', + 'Automatic-Module-Name': 'moe.yushi.authlibinjector', + 'Premain-Class': 'moe.yushi.authlibinjector.javaagent.AuthlibInjectorPremain', + 'Agent-Class': 'moe.yushi.authlibinjector.javaagent.AuthlibInjectorPremain', 'Can-Retransform-Classes': true, 'Can-Redefine-Classes': true, 'Git-Commit': gitInfo.gitHashFull, @@ -58,8 +58,8 @@ shadowJar { exclude 'fi/iki/elonen/util/**' exclude 'META-INF/nanohttpd/mimetypes.properties' - relocate 'org.objectweb.asm', 'org.to2mbn.authlibinjector.internal.org.objectweb.asm' - relocate 'fi.iki.elonen', 'org.to2mbn.authlibinjector.internal.fi.iki.elonen' + relocate 'org.objectweb.asm', 'moe.yushi.authlibinjector.internal.org.objectweb.asm' + relocate 'fi.iki.elonen', 'moe.yushi.authlibinjector.internal.fi.iki.elonen' } defaultTasks 'clean', 'shadowJar' diff --git a/src/main/java/org/to2mbn/authlibinjector/AuthlibInjector.java b/src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java similarity index 79% rename from src/main/java/org/to2mbn/authlibinjector/AuthlibInjector.java rename to src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java index 25b67bc..6338eb1 100644 --- a/src/main/java/org/to2mbn/authlibinjector/AuthlibInjector.java +++ b/src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java @@ -1,14 +1,14 @@ -package org.to2mbn.authlibinjector; +package moe.yushi.authlibinjector; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Optional.empty; import static java.util.Optional.of; -import static org.to2mbn.authlibinjector.util.IOUtils.asString; -import static org.to2mbn.authlibinjector.util.IOUtils.getURL; -import static org.to2mbn.authlibinjector.util.IOUtils.removeNewLines; -import static org.to2mbn.authlibinjector.util.LoggingUtils.debug; -import static org.to2mbn.authlibinjector.util.LoggingUtils.info; -import static org.to2mbn.authlibinjector.util.LoggingUtils.isDebugOn; +import static moe.yushi.authlibinjector.util.IOUtils.asString; +import static moe.yushi.authlibinjector.util.IOUtils.getURL; +import static moe.yushi.authlibinjector.util.IOUtils.removeNewLines; +import static moe.yushi.authlibinjector.util.LoggingUtils.debug; +import static moe.yushi.authlibinjector.util.LoggingUtils.info; +import static moe.yushi.authlibinjector.util.LoggingUtils.isDebugOn; import java.io.IOException; import java.io.UncheckedIOException; import java.lang.instrument.ClassFileTransformer; @@ -16,18 +16,18 @@ import java.util.Base64; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; -import org.to2mbn.authlibinjector.httpd.DeprecatedApiHandle; -import org.to2mbn.authlibinjector.transform.ClassTransformer; -import org.to2mbn.authlibinjector.transform.SkinWhitelistTransformUnit; -import org.to2mbn.authlibinjector.transform.YggdrasilApiTransformUnit; -import org.to2mbn.authlibinjector.transform.YggdrasilKeyTransformUnit; +import moe.yushi.authlibinjector.httpd.DeprecatedApiHandle; +import moe.yushi.authlibinjector.transform.ClassTransformer; +import moe.yushi.authlibinjector.transform.SkinWhitelistTransformUnit; +import moe.yushi.authlibinjector.transform.YggdrasilApiTransformUnit; +import moe.yushi.authlibinjector.transform.YggdrasilKeyTransformUnit; public final class AuthlibInjector { public static final String[] nonTransformablePackages = new String[] { "java.", "javax.", "com.sun.", "com.oracle.", "jdk.", "sun.", "org.apache.", "com.google.", "oracle.", "com.oracle.", "com.paulscode.", "io.netty.", "org.lwjgl.", "net.java.", "org.w3c.", "javassist.", "org.xml.", "org.jcp.", "paulscode.", - "com.ibm.", "joptsimple.", "org.to2mbn.authlibinjector.", "org.graalvm.", "org.GNOME.", "it.unimi.dsi.fastutil.", + "com.ibm.", "joptsimple.", "moe.yushi.authlibinjector.", "org.graalvm.", "org.GNOME.", "it.unimi.dsi.fastutil.", "oshi." }; private AuthlibInjector() {} diff --git a/src/main/java/org/to2mbn/authlibinjector/YggdrasilConfiguration.java b/src/main/java/moe/yushi/authlibinjector/YggdrasilConfiguration.java similarity index 85% rename from src/main/java/org/to2mbn/authlibinjector/YggdrasilConfiguration.java rename to src/main/java/moe/yushi/authlibinjector/YggdrasilConfiguration.java index 0e9c663..2c34b07 100644 --- a/src/main/java/org/to2mbn/authlibinjector/YggdrasilConfiguration.java +++ b/src/main/java/moe/yushi/authlibinjector/YggdrasilConfiguration.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector; +package moe.yushi.authlibinjector; import static java.text.MessageFormat.format; import static java.util.Collections.emptyList; @@ -8,18 +8,18 @@ import static java.util.Collections.unmodifiableMap; import static java.util.Objects.requireNonNull; import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.toList; -import static org.to2mbn.authlibinjector.util.JsonUtils.asArray; -import static org.to2mbn.authlibinjector.util.JsonUtils.asObject; -import static org.to2mbn.authlibinjector.util.JsonUtils.parseJson; +import static moe.yushi.authlibinjector.util.JsonUtils.asArray; +import static moe.yushi.authlibinjector.util.JsonUtils.asObject; +import static moe.yushi.authlibinjector.util.JsonUtils.parseJson; import java.io.UncheckedIOException; import java.security.PublicKey; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.TreeMap; -import org.to2mbn.authlibinjector.internal.org.json.simple.JSONObject; -import org.to2mbn.authlibinjector.util.JsonUtils; -import org.to2mbn.authlibinjector.util.KeyUtils; +import moe.yushi.authlibinjector.internal.org.json.simple.JSONObject; +import moe.yushi.authlibinjector.util.JsonUtils; +import moe.yushi.authlibinjector.util.KeyUtils; public class YggdrasilConfiguration { diff --git a/src/main/java/org/to2mbn/authlibinjector/httpd/DeprecatedApiHandle.java b/src/main/java/moe/yushi/authlibinjector/httpd/DeprecatedApiHandle.java similarity index 80% rename from src/main/java/org/to2mbn/authlibinjector/httpd/DeprecatedApiHandle.java rename to src/main/java/moe/yushi/authlibinjector/httpd/DeprecatedApiHandle.java index 04706d9..c05b07c 100644 --- a/src/main/java/org/to2mbn/authlibinjector/httpd/DeprecatedApiHandle.java +++ b/src/main/java/moe/yushi/authlibinjector/httpd/DeprecatedApiHandle.java @@ -1,10 +1,10 @@ -package org.to2mbn.authlibinjector.httpd; +package moe.yushi.authlibinjector.httpd; -import static org.to2mbn.authlibinjector.util.LoggingUtils.info; +import static moe.yushi.authlibinjector.util.LoggingUtils.info; import java.io.IOException; -import org.to2mbn.authlibinjector.YggdrasilConfiguration; -import org.to2mbn.authlibinjector.transform.DeprecatedApiTransformUnit; -import org.to2mbn.authlibinjector.transform.TransformUnit; +import moe.yushi.authlibinjector.YggdrasilConfiguration; +import moe.yushi.authlibinjector.transform.DeprecatedApiTransformUnit; +import moe.yushi.authlibinjector.transform.TransformUnit; public class DeprecatedApiHandle { diff --git a/src/main/java/org/to2mbn/authlibinjector/httpd/DeprecatedApiHttpd.java b/src/main/java/moe/yushi/authlibinjector/httpd/DeprecatedApiHttpd.java similarity index 82% rename from src/main/java/org/to2mbn/authlibinjector/httpd/DeprecatedApiHttpd.java rename to src/main/java/moe/yushi/authlibinjector/httpd/DeprecatedApiHttpd.java index 6c67878..a575102 100644 --- a/src/main/java/org/to2mbn/authlibinjector/httpd/DeprecatedApiHttpd.java +++ b/src/main/java/moe/yushi/authlibinjector/httpd/DeprecatedApiHttpd.java @@ -1,20 +1,20 @@ -package org.to2mbn.authlibinjector.httpd; +package moe.yushi.authlibinjector.httpd; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Collections.singleton; import static java.util.Optional.empty; import static java.util.Optional.of; import static java.util.Optional.ofNullable; -import static org.to2mbn.authlibinjector.util.IOUtils.asString; -import static org.to2mbn.authlibinjector.util.IOUtils.getURL; -import static org.to2mbn.authlibinjector.util.IOUtils.newUncheckedIOException; -import static org.to2mbn.authlibinjector.util.IOUtils.postURL; -import static org.to2mbn.authlibinjector.util.JsonUtils.asArray; -import static org.to2mbn.authlibinjector.util.JsonUtils.asObject; -import static org.to2mbn.authlibinjector.util.JsonUtils.asString; -import static org.to2mbn.authlibinjector.util.JsonUtils.parseJson; -import static org.to2mbn.authlibinjector.util.LoggingUtils.debug; -import static org.to2mbn.authlibinjector.util.LoggingUtils.info; +import static moe.yushi.authlibinjector.util.IOUtils.asString; +import static moe.yushi.authlibinjector.util.IOUtils.getURL; +import static moe.yushi.authlibinjector.util.IOUtils.newUncheckedIOException; +import static moe.yushi.authlibinjector.util.IOUtils.postURL; +import static moe.yushi.authlibinjector.util.JsonUtils.asArray; +import static moe.yushi.authlibinjector.util.JsonUtils.asObject; +import static moe.yushi.authlibinjector.util.JsonUtils.asString; +import static moe.yushi.authlibinjector.util.JsonUtils.parseJson; +import static moe.yushi.authlibinjector.util.LoggingUtils.debug; +import static moe.yushi.authlibinjector.util.LoggingUtils.info; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.UncheckedIOException; @@ -22,12 +22,12 @@ import java.util.Base64; import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.to2mbn.authlibinjector.YggdrasilConfiguration; -import org.to2mbn.authlibinjector.internal.org.json.simple.JSONArray; -import org.to2mbn.authlibinjector.internal.org.json.simple.JSONObject; -import org.to2mbn.authlibinjector.util.JsonUtils; import fi.iki.elonen.NanoHTTPD; import fi.iki.elonen.NanoHTTPD.Response.Status; +import moe.yushi.authlibinjector.YggdrasilConfiguration; +import moe.yushi.authlibinjector.internal.org.json.simple.JSONArray; +import moe.yushi.authlibinjector.internal.org.json.simple.JSONObject; +import moe.yushi.authlibinjector.util.JsonUtils; public class DeprecatedApiHttpd extends NanoHTTPD { diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONArray.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONArray.java similarity index 97% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONArray.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONArray.java index b0efd77..bb464ef 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONArray.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONArray.java @@ -2,7 +2,7 @@ * $Id: JSONArray.java,v 1.1 2006/04/15 14:10:48 platform Exp $ * Created on 2006-4-10 */ -package org.to2mbn.authlibinjector.internal.org.json.simple; +package moe.yushi.authlibinjector.internal.org.json.simple; import java.io.IOException; import java.io.StringWriter; @@ -41,7 +41,7 @@ public class JSONArray extends ArrayList implements JSONAware, JSONStrea * Encode a list into JSON text and write it to out. * If this list is also a JSONStreamAware or a JSONAware, JSONStreamAware and JSONAware specific behaviours will be ignored at this top level. * - * @see org.to2mbn.authlibinjector.internal.org.json.simple.JSONValue#writeJSONString(Object, Writer) + * @see moe.yushi.authlibinjector.internal.org.json.simple.JSONValue#writeJSONString(Object, Writer) * * @param collection * @param out @@ -82,7 +82,7 @@ public class JSONArray extends ArrayList implements JSONAware, JSONStrea * Convert a list to JSON text. The result is a JSON array. * If this list is also a JSONAware, JSONAware specific behaviours will be omitted at this top level. * - * @see org.to2mbn.authlibinjector.internal.org.json.simple.JSONValue#toJSONString(Object) + * @see moe.yushi.authlibinjector.internal.org.json.simple.JSONValue#toJSONString(Object) * * @param collection * @return JSON text, or "null" if list is null. diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONAware.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONAware.java similarity index 79% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONAware.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONAware.java index f3e58b6..c24d458 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONAware.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONAware.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.internal.org.json.simple; +package moe.yushi.authlibinjector.internal.org.json.simple; /** * Beans that support customized output of JSON text shall implement this interface. diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONObject.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONObject.java similarity index 91% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONObject.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONObject.java index 5fe8e7c..4941209 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONObject.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONObject.java @@ -2,7 +2,7 @@ * $Id: JSONObject.java,v 1.1 2006/04/15 14:10:48 platform Exp $ * Created on 2006-4-10 */ -package org.to2mbn.authlibinjector.internal.org.json.simple; +package moe.yushi.authlibinjector.internal.org.json.simple; import java.io.IOException; import java.io.StringWriter; @@ -38,7 +38,7 @@ public class JSONObject extends HashMap implements JSONAware, JS * Encode a map into JSON text and write it to out. * If this map is also a JSONAware or JSONStreamAware, JSONAware or JSONStreamAware specific behaviours will be ignored at this top level. * - * @see org.to2mbn.authlibinjector.internal.org.json.simple.JSONValue#writeJSONString(Object, Writer) + * @see moe.yushi.authlibinjector.internal.org.json.simple.JSONValue#writeJSONString(Object, Writer) * * @param map * @param out @@ -77,7 +77,7 @@ public class JSONObject extends HashMap implements JSONAware, JS * Convert a map to JSON text. The result is a JSON object. * If this map is also a JSONAware, JSONAware specific behaviours will be omitted at this top level. * - * @see org.to2mbn.authlibinjector.internal.org.json.simple.JSONValue#toJSONString(Object) + * @see moe.yushi.authlibinjector.internal.org.json.simple.JSONValue#toJSONString(Object) * * @param map * @return JSON text, or "null" if map is null. diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONStreamAware.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONStreamAware.java similarity index 84% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONStreamAware.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONStreamAware.java index 527d653..9f28382 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONStreamAware.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONStreamAware.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.internal.org.json.simple; +package moe.yushi.authlibinjector.internal.org.json.simple; import java.io.IOException; import java.io.Writer; diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONValue.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONValue.java similarity index 89% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONValue.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONValue.java index 4b03be5..f1f1c25 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/JSONValue.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/JSONValue.java @@ -2,7 +2,7 @@ * $Id: JSONValue.java,v 1.1 2006/04/15 14:37:04 platform Exp $ * Created on 2006-4-15 */ -package org.to2mbn.authlibinjector.internal.org.json.simple; +package moe.yushi.authlibinjector.internal.org.json.simple; import java.io.IOException; import java.io.Reader; @@ -11,8 +11,8 @@ import java.io.Writer; import java.util.Collection; // import java.util.List; import java.util.Map; -import org.to2mbn.authlibinjector.internal.org.json.simple.parser.JSONParser; -import org.to2mbn.authlibinjector.internal.org.json.simple.parser.ParseException; +import moe.yushi.authlibinjector.internal.org.json.simple.parser.JSONParser; +import moe.yushi.authlibinjector.internal.org.json.simple.parser.ParseException; /** * @author FangYidong @@ -21,7 +21,7 @@ public class JSONValue { /** * Parse JSON text into java object from the input source. * - * @see org.to2mbn.authlibinjector.internal.org.json.simple.parser.JSONParser + * @see moe.yushi.authlibinjector.internal.org.json.simple.parser.JSONParser * * @param in * @return Instance of the following: @@ -51,8 +51,8 @@ public class JSONValue { * DO NOT call this method from writeJSONString(Writer) of a class that implements both JSONStreamAware and (Map or List) with * "this" as the first parameter, use JSONObject.writeJSONString(Map, Writer) or JSONArray.writeJSONString(List, Writer) instead. * - * @see org.to2mbn.authlibinjector.internal.org.json.simple.JSONObject#writeJSONString(Map, Writer) - * @see org.to2mbn.authlibinjector.internal.org.json.simple.JSONArray#writeJSONString(List, Writer) + * @see moe.yushi.authlibinjector.internal.org.json.simple.JSONObject#writeJSONString(Map, Writer) + * @see moe.yushi.authlibinjector.internal.org.json.simple.JSONArray#writeJSONString(List, Writer) * * @param value * @param writer @@ -174,8 +174,8 @@ public class JSONValue { * DO NOT call this method from toJSONString() of a class that implements both JSONAware and Map or List with * "this" as the parameter, use JSONObject.toJSONString(Map) or JSONArray.toJSONString(List) instead. * - * @see org.to2mbn.authlibinjector.internal.org.json.simple.JSONObject#toJSONString(Map) - * @see org.to2mbn.authlibinjector.internal.org.json.simple.JSONArray#toJSONString(List) + * @see moe.yushi.authlibinjector.internal.org.json.simple.JSONObject#toJSONString(Map) + * @see moe.yushi.authlibinjector.internal.org.json.simple.JSONArray#toJSONString(List) * * @param value * @return JSON text, or "null" if value is null or it's an NaN or an INF number. diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/package-info.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/package-info.java similarity index 70% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/package-info.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/package-info.java index a77fb29..6ad7b4e 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/package-info.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/package-info.java @@ -3,4 +3,4 @@ *

* See license in META-INF/licenses/json-simple.txt */ -package org.to2mbn.authlibinjector.internal.org.json.simple; +package moe.yushi.authlibinjector.internal.org.json.simple; diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/ContainerFactory.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/ContainerFactory.java similarity index 74% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/ContainerFactory.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/ContainerFactory.java index b6edb58..d2f7cf0 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/ContainerFactory.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/ContainerFactory.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.internal.org.json.simple.parser; +package moe.yushi.authlibinjector.internal.org.json.simple.parser; import java.util.List; import java.util.Map; @@ -6,7 +6,7 @@ import java.util.Map; /** * Container factory for creating containers for JSON object and JSON array. * - * @see org.to2mbn.authlibinjector.internal.org.json.simple.parser.JSONParser#parse(java.io.Reader, ContainerFactory) + * @see moe.yushi.authlibinjector.internal.org.json.simple.parser.JSONParser#parse(java.io.Reader, ContainerFactory) * * @author FangYidong */ diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/ContentHandler.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/ContentHandler.java similarity index 93% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/ContentHandler.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/ContentHandler.java index 44e9f45..f0c080c 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/ContentHandler.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/ContentHandler.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.internal.org.json.simple.parser; +package moe.yushi.authlibinjector.internal.org.json.simple.parser; import java.io.IOException; @@ -6,7 +6,7 @@ import java.io.IOException; * A simplified and stoppable SAX-like content handler for stream processing of JSON text. * * @see org.xml.sax.ContentHandler - * @see org.to2mbn.authlibinjector.internal.org.json.simple.parser.JSONParser#parse(java.io.Reader, ContentHandler, boolean) + * @see moe.yushi.authlibinjector.internal.org.json.simple.parser.JSONParser#parse(java.io.Reader, ContentHandler, boolean) * * @author FangYidong */ diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/JSONParser.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/JSONParser.java similarity index 98% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/JSONParser.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/JSONParser.java index 680d73f..0e64a5d 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/JSONParser.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/JSONParser.java @@ -2,7 +2,7 @@ * $Id: JSONParser.java,v 1.1 2006/04/15 14:10:48 platform Exp $ * Created on 2006-4-15 */ -package org.to2mbn.authlibinjector.internal.org.json.simple.parser; +package moe.yushi.authlibinjector.internal.org.json.simple.parser; import java.io.IOException; import java.io.Reader; @@ -10,8 +10,8 @@ import java.io.StringReader; import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.to2mbn.authlibinjector.internal.org.json.simple.JSONArray; -import org.to2mbn.authlibinjector.internal.org.json.simple.JSONObject; +import moe.yushi.authlibinjector.internal.org.json.simple.JSONArray; +import moe.yushi.authlibinjector.internal.org.json.simple.JSONObject; /** * Parser for JSON text. Please note that JSONParser is NOT thread-safe. diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/ParseException.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/ParseException.java similarity index 90% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/ParseException.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/ParseException.java index 4011c42..30f671d 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/ParseException.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/ParseException.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.internal.org.json.simple.parser; +package moe.yushi.authlibinjector.internal.org.json.simple.parser; /** * ParseException explains why and where the error occurs in source JSON text. @@ -40,7 +40,7 @@ public class ParseException extends Exception { } /** - * @see org.to2mbn.authlibinjector.internal.org.json.simple.parser.JSONParser#getPosition() + * @see moe.yushi.authlibinjector.internal.org.json.simple.parser.JSONParser#getPosition() * * @return The character position (starting with 0) of the input where the error occurs. */ @@ -53,7 +53,7 @@ public class ParseException extends Exception { } /** - * @see org.to2mbn.authlibinjector.internal.org.json.simple.parser.Yytoken + * @see moe.yushi.authlibinjector.internal.org.json.simple.parser.Yytoken * * @return One of the following base on the value of errorType: * ERROR_UNEXPECTED_CHAR java.lang.Character diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/Yylex.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/Yylex.java similarity index 99% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/Yylex.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/Yylex.java index 6de93e9..1c82000 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/Yylex.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/Yylex.java @@ -1,6 +1,6 @@ /* The following code was generated by JFlex 1.4.2 */ -package org.to2mbn.authlibinjector.internal.org.json.simple.parser; +package moe.yushi.authlibinjector.internal.org.json.simple.parser; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/Yytoken.java b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/Yytoken.java similarity index 95% rename from src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/Yytoken.java rename to src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/Yytoken.java index ee45146..ef88a8c 100644 --- a/src/main/java/org/to2mbn/authlibinjector/internal/org/json/simple/parser/Yytoken.java +++ b/src/main/java/moe/yushi/authlibinjector/internal/org/json/simple/parser/Yytoken.java @@ -2,7 +2,7 @@ * $Id: Yytoken.java,v 1.1 2006/04/15 14:10:48 platform Exp $ * Created on 2006-4-15 */ -package org.to2mbn.authlibinjector.internal.org.json.simple.parser; +package moe.yushi.authlibinjector.internal.org.json.simple.parser; /** * @author FangYidong diff --git a/src/main/java/org/to2mbn/authlibinjector/javaagent/AuthlibInjectorPremain.java b/src/main/java/moe/yushi/authlibinjector/javaagent/AuthlibInjectorPremain.java similarity index 88% rename from src/main/java/org/to2mbn/authlibinjector/javaagent/AuthlibInjectorPremain.java rename to src/main/java/moe/yushi/authlibinjector/javaagent/AuthlibInjectorPremain.java index fea56f6..ee0b30b 100644 --- a/src/main/java/org/to2mbn/authlibinjector/javaagent/AuthlibInjectorPremain.java +++ b/src/main/java/moe/yushi/authlibinjector/javaagent/AuthlibInjectorPremain.java @@ -1,9 +1,9 @@ -package org.to2mbn.authlibinjector.javaagent; +package moe.yushi.authlibinjector.javaagent; -import static org.to2mbn.authlibinjector.AuthlibInjector.bootstrap; -import static org.to2mbn.authlibinjector.AuthlibInjector.nonTransformablePackages; -import static org.to2mbn.authlibinjector.util.LoggingUtils.debug; -import static org.to2mbn.authlibinjector.util.LoggingUtils.info; +import static moe.yushi.authlibinjector.AuthlibInjector.bootstrap; +import static moe.yushi.authlibinjector.AuthlibInjector.nonTransformablePackages; +import static moe.yushi.authlibinjector.util.LoggingUtils.debug; +import static moe.yushi.authlibinjector.util.LoggingUtils.info; import java.lang.instrument.Instrumentation; import java.util.Arrays; diff --git a/src/main/java/org/to2mbn/authlibinjector/transform/ClassTransformer.java b/src/main/java/moe/yushi/authlibinjector/transform/ClassTransformer.java similarity index 94% rename from src/main/java/org/to2mbn/authlibinjector/transform/ClassTransformer.java rename to src/main/java/moe/yushi/authlibinjector/transform/ClassTransformer.java index 9e4de46..771cf1a 100644 --- a/src/main/java/org/to2mbn/authlibinjector/transform/ClassTransformer.java +++ b/src/main/java/moe/yushi/authlibinjector/transform/ClassTransformer.java @@ -1,7 +1,7 @@ -package org.to2mbn.authlibinjector.transform; +package moe.yushi.authlibinjector.transform; -import static org.to2mbn.authlibinjector.util.LoggingUtils.debug; -import static org.to2mbn.authlibinjector.util.LoggingUtils.info; +import static moe.yushi.authlibinjector.util.LoggingUtils.debug; +import static moe.yushi.authlibinjector.util.LoggingUtils.info; import java.io.IOException; import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.IllegalClassFormatException; diff --git a/src/main/java/org/to2mbn/authlibinjector/transform/DeprecatedApiTransformUnit.java b/src/main/java/moe/yushi/authlibinjector/transform/DeprecatedApiTransformUnit.java similarity index 94% rename from src/main/java/org/to2mbn/authlibinjector/transform/DeprecatedApiTransformUnit.java rename to src/main/java/moe/yushi/authlibinjector/transform/DeprecatedApiTransformUnit.java index a5c34d3..808fb64 100644 --- a/src/main/java/org/to2mbn/authlibinjector/transform/DeprecatedApiTransformUnit.java +++ b/src/main/java/moe/yushi/authlibinjector/transform/DeprecatedApiTransformUnit.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.transform; +package moe.yushi.authlibinjector.transform; import static java.util.Optional.empty; import static java.util.Optional.of; diff --git a/src/main/java/org/to2mbn/authlibinjector/transform/LdcTransformUnit.java b/src/main/java/moe/yushi/authlibinjector/transform/LdcTransformUnit.java similarity index 92% rename from src/main/java/org/to2mbn/authlibinjector/transform/LdcTransformUnit.java rename to src/main/java/moe/yushi/authlibinjector/transform/LdcTransformUnit.java index 0332003..8164b24 100644 --- a/src/main/java/org/to2mbn/authlibinjector/transform/LdcTransformUnit.java +++ b/src/main/java/moe/yushi/authlibinjector/transform/LdcTransformUnit.java @@ -1,7 +1,7 @@ -package org.to2mbn.authlibinjector.transform; +package moe.yushi.authlibinjector.transform; +import static moe.yushi.authlibinjector.util.LoggingUtils.info; import static org.objectweb.asm.Opcodes.ASM6; -import static org.to2mbn.authlibinjector.util.LoggingUtils.info; import java.util.Optional; import java.util.function.Function; import org.objectweb.asm.ClassVisitor; diff --git a/src/main/java/org/to2mbn/authlibinjector/transform/RegexTransformUnit.java b/src/main/java/moe/yushi/authlibinjector/transform/RegexTransformUnit.java similarity index 84% rename from src/main/java/org/to2mbn/authlibinjector/transform/RegexTransformUnit.java rename to src/main/java/moe/yushi/authlibinjector/transform/RegexTransformUnit.java index b391faa..038d74a 100644 --- a/src/main/java/org/to2mbn/authlibinjector/transform/RegexTransformUnit.java +++ b/src/main/java/moe/yushi/authlibinjector/transform/RegexTransformUnit.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.transform; +package moe.yushi.authlibinjector.transform; import java.util.Optional; import java.util.regex.Pattern; diff --git a/src/main/java/org/to2mbn/authlibinjector/transform/SkinWhitelistTransformUnit.java b/src/main/java/moe/yushi/authlibinjector/transform/SkinWhitelistTransformUnit.java similarity index 98% rename from src/main/java/org/to2mbn/authlibinjector/transform/SkinWhitelistTransformUnit.java rename to src/main/java/moe/yushi/authlibinjector/transform/SkinWhitelistTransformUnit.java index 99de075..e94ce7c 100644 --- a/src/main/java/org/to2mbn/authlibinjector/transform/SkinWhitelistTransformUnit.java +++ b/src/main/java/moe/yushi/authlibinjector/transform/SkinWhitelistTransformUnit.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.transform; +package moe.yushi.authlibinjector.transform; import static org.objectweb.asm.Opcodes.AASTORE; import static org.objectweb.asm.Opcodes.ANEWARRAY; diff --git a/src/main/java/org/to2mbn/authlibinjector/transform/TransformUnit.java b/src/main/java/moe/yushi/authlibinjector/transform/TransformUnit.java similarity index 81% rename from src/main/java/org/to2mbn/authlibinjector/transform/TransformUnit.java rename to src/main/java/moe/yushi/authlibinjector/transform/TransformUnit.java index 77d023b..f5b0231 100644 --- a/src/main/java/org/to2mbn/authlibinjector/transform/TransformUnit.java +++ b/src/main/java/moe/yushi/authlibinjector/transform/TransformUnit.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.transform; +package moe.yushi.authlibinjector.transform; import java.util.Optional; import org.objectweb.asm.ClassVisitor; diff --git a/src/main/java/org/to2mbn/authlibinjector/transform/YggdrasilApiTransformUnit.java b/src/main/java/moe/yushi/authlibinjector/transform/YggdrasilApiTransformUnit.java similarity index 95% rename from src/main/java/org/to2mbn/authlibinjector/transform/YggdrasilApiTransformUnit.java rename to src/main/java/moe/yushi/authlibinjector/transform/YggdrasilApiTransformUnit.java index c97af76..985cb31 100644 --- a/src/main/java/org/to2mbn/authlibinjector/transform/YggdrasilApiTransformUnit.java +++ b/src/main/java/moe/yushi/authlibinjector/transform/YggdrasilApiTransformUnit.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.transform; +package moe.yushi.authlibinjector.transform; import java.util.function.Function; import java.util.regex.Pattern; diff --git a/src/main/java/org/to2mbn/authlibinjector/transform/YggdrasilKeyTransformUnit.java b/src/main/java/moe/yushi/authlibinjector/transform/YggdrasilKeyTransformUnit.java similarity index 98% rename from src/main/java/org/to2mbn/authlibinjector/transform/YggdrasilKeyTransformUnit.java rename to src/main/java/moe/yushi/authlibinjector/transform/YggdrasilKeyTransformUnit.java index cab0710..9bfdc27 100644 --- a/src/main/java/org/to2mbn/authlibinjector/transform/YggdrasilKeyTransformUnit.java +++ b/src/main/java/moe/yushi/authlibinjector/transform/YggdrasilKeyTransformUnit.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.transform; +package moe.yushi.authlibinjector.transform; import static org.objectweb.asm.Opcodes.ASM6; import static org.objectweb.asm.Opcodes.BASTORE; diff --git a/src/main/java/org/to2mbn/authlibinjector/util/IOUtils.java b/src/main/java/moe/yushi/authlibinjector/util/IOUtils.java similarity index 97% rename from src/main/java/org/to2mbn/authlibinjector/util/IOUtils.java rename to src/main/java/moe/yushi/authlibinjector/util/IOUtils.java index b6d5826..52407de 100644 --- a/src/main/java/org/to2mbn/authlibinjector/util/IOUtils.java +++ b/src/main/java/moe/yushi/authlibinjector/util/IOUtils.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.util; +package moe.yushi.authlibinjector.util; import static java.nio.charset.StandardCharsets.UTF_8; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/org/to2mbn/authlibinjector/util/JsonUtils.java b/src/main/java/moe/yushi/authlibinjector/util/JsonUtils.java similarity index 70% rename from src/main/java/org/to2mbn/authlibinjector/util/JsonUtils.java rename to src/main/java/moe/yushi/authlibinjector/util/JsonUtils.java index ac8a23c..90c1839 100644 --- a/src/main/java/org/to2mbn/authlibinjector/util/JsonUtils.java +++ b/src/main/java/moe/yushi/authlibinjector/util/JsonUtils.java @@ -1,11 +1,11 @@ -package org.to2mbn.authlibinjector.util; +package moe.yushi.authlibinjector.util; -import static org.to2mbn.authlibinjector.util.IOUtils.newUncheckedIOException; +import static moe.yushi.authlibinjector.util.IOUtils.newUncheckedIOException; import java.io.UncheckedIOException; -import org.to2mbn.authlibinjector.internal.org.json.simple.JSONArray; -import org.to2mbn.authlibinjector.internal.org.json.simple.JSONObject; -import org.to2mbn.authlibinjector.internal.org.json.simple.JSONValue; -import org.to2mbn.authlibinjector.internal.org.json.simple.parser.ParseException; +import moe.yushi.authlibinjector.internal.org.json.simple.JSONArray; +import moe.yushi.authlibinjector.internal.org.json.simple.JSONObject; +import moe.yushi.authlibinjector.internal.org.json.simple.JSONValue; +import moe.yushi.authlibinjector.internal.org.json.simple.parser.ParseException; public final class JsonUtils { diff --git a/src/main/java/org/to2mbn/authlibinjector/util/KeyUtils.java b/src/main/java/moe/yushi/authlibinjector/util/KeyUtils.java similarity index 86% rename from src/main/java/org/to2mbn/authlibinjector/util/KeyUtils.java rename to src/main/java/moe/yushi/authlibinjector/util/KeyUtils.java index 4b74866..920cfad 100644 --- a/src/main/java/org/to2mbn/authlibinjector/util/KeyUtils.java +++ b/src/main/java/moe/yushi/authlibinjector/util/KeyUtils.java @@ -1,7 +1,7 @@ -package org.to2mbn.authlibinjector.util; +package moe.yushi.authlibinjector.util; -import static org.to2mbn.authlibinjector.util.IOUtils.newUncheckedIOException; -import static org.to2mbn.authlibinjector.util.IOUtils.removeNewLines; +import static moe.yushi.authlibinjector.util.IOUtils.newUncheckedIOException; +import static moe.yushi.authlibinjector.util.IOUtils.removeNewLines; import java.io.UncheckedIOException; import java.security.GeneralSecurityException; import java.security.KeyFactory; diff --git a/src/main/java/org/to2mbn/authlibinjector/util/LoggingUtils.java b/src/main/java/moe/yushi/authlibinjector/util/LoggingUtils.java similarity index 92% rename from src/main/java/org/to2mbn/authlibinjector/util/LoggingUtils.java rename to src/main/java/moe/yushi/authlibinjector/util/LoggingUtils.java index d92e4e0..7e03cf4 100644 --- a/src/main/java/org/to2mbn/authlibinjector/util/LoggingUtils.java +++ b/src/main/java/moe/yushi/authlibinjector/util/LoggingUtils.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.util; +package moe.yushi.authlibinjector.util; import java.text.MessageFormat; diff --git a/src/test/java/org/to2mbn/authlibinjector/test/KeyUtilsTest.java b/src/test/java/moe/yushi/authlibinjector/test/KeyUtilsTest.java similarity index 88% rename from src/test/java/org/to2mbn/authlibinjector/test/KeyUtilsTest.java rename to src/test/java/moe/yushi/authlibinjector/test/KeyUtilsTest.java index 383d2ef..704338a 100644 --- a/src/test/java/org/to2mbn/authlibinjector/test/KeyUtilsTest.java +++ b/src/test/java/moe/yushi/authlibinjector/test/KeyUtilsTest.java @@ -1,7 +1,7 @@ -package org.to2mbn.authlibinjector.test; +package moe.yushi.authlibinjector.test; +import static moe.yushi.authlibinjector.util.KeyUtils.decodePEMPublicKey; import static org.junit.Assert.assertArrayEquals; -import static org.to2mbn.authlibinjector.util.KeyUtils.decodePEMPublicKey; import org.junit.Test; public class KeyUtilsTest { diff --git a/src/test/java/org/to2mbn/authlibinjector/test/UrlReplaceTest.java b/src/test/java/moe/yushi/authlibinjector/test/UrlReplaceTest.java similarity index 97% rename from src/test/java/org/to2mbn/authlibinjector/test/UrlReplaceTest.java rename to src/test/java/moe/yushi/authlibinjector/test/UrlReplaceTest.java index 58b3c2b..6a86cf0 100644 --- a/src/test/java/org/to2mbn/authlibinjector/test/UrlReplaceTest.java +++ b/src/test/java/moe/yushi/authlibinjector/test/UrlReplaceTest.java @@ -1,4 +1,4 @@ -package org.to2mbn.authlibinjector.test; +package moe.yushi.authlibinjector.test; import static org.junit.Assert.assertEquals; import java.util.Arrays; @@ -8,7 +8,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import org.to2mbn.authlibinjector.transform.YggdrasilApiTransformUnit; +import moe.yushi.authlibinjector.transform.YggdrasilApiTransformUnit; @RunWith(Parameterized.class) public class UrlReplaceTest {