├── .gitignore ├── HEADER ├── Jenkinsfile ├── LICENSE ├── README.md ├── build.gradle ├── gradle.properties ├── gradle └── wrapper │ ├── gradle-wrapper.jar │ └── gradle-wrapper.properties ├── gradlew ├── gradlew.bat ├── settings.gradle └── src └── main └── java └── net └── fabricmc └── weave ├── Command.java ├── CommandFindMappingErrors.java ├── CommandTinyify.java ├── Main.java └── util ├── EnigmaUtils.java └── Utils.java /.gitignore: -------------------------------------------------------------------------------- 1 | # Ignore everything 2 | /* 3 | 4 | # Folders 5 | !/gradle 6 | !/src 7 | 8 | # Files 9 | !/.gitattributes 10 | !/.gitignore 11 | !/build.gradle 12 | !/gradle.properties 13 | !/gradlew 14 | !/gradlew.bat 15 | !/HEADER 16 | !/Jenkinsfile 17 | !/LICENSE 18 | !/README.md 19 | !/settings.gradle 20 | -------------------------------------------------------------------------------- /HEADER: -------------------------------------------------------------------------------- 1 | Copyright (c) 2016, 2017, 2018 FabricMC 2 | 3 | Licensed under the Apache License, Version 2.0 (the "License"); 4 | you may not use this file except in compliance with the License. 5 | You may obtain a copy of the License at 6 | 7 | http://www.apache.org/licenses/LICENSE-2.0 8 | 9 | Unless required by applicable law or agreed to in writing, software 10 | distributed under the License is distributed on an "AS IS" BASIS, 11 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 12 | See the License for the specific language governing permissions and 13 | limitations under the License. 14 | -------------------------------------------------------------------------------- /Jenkinsfile: -------------------------------------------------------------------------------- 1 | node { 2 | stage 'Checkout' 3 | 4 | checkout scm 5 | 6 | stage 'Build' 7 | 8 | sh "rm -rf build/libs/" 9 | sh "chmod +x gradlew" 10 | sh "./gradlew clean" 11 | sh "./gradlew build" 12 | 13 | stage "Archive artifacts" 14 | 15 | sh "./gradlew upload" 16 | } 17 | -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- 1 | Apache License 2 | Version 2.0, January 2004 3 | http://www.apache.org/licenses/ 4 | 5 | TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 6 | 7 | 1. Definitions. 8 | 9 | "License" shall mean the terms and conditions for use, reproduction, 10 | and distribution as defined by Sections 1 through 9 of this document. 11 | 12 | "Licensor" shall mean the copyright owner or entity authorized by 13 | the copyright owner that is granting the License. 14 | 15 | "Legal Entity" shall mean the union of the acting entity and all 16 | other entities that control, are controlled by, or are under common 17 | control with that entity. For the purposes of this definition, 18 | "control" means (i) the power, direct or indirect, to cause the 19 | direction or management of such entity, whether by contract or 20 | otherwise, or (ii) ownership of fifty percent (50%) or more of the 21 | outstanding shares, or (iii) beneficial ownership of such entity. 22 | 23 | "You" (or "Your") shall mean an individual or Legal Entity 24 | exercising permissions granted by this License. 25 | 26 | "Source" form shall mean the preferred form for making modifications, 27 | including but not limited to software source code, documentation 28 | source, and configuration files. 29 | 30 | "Object" form shall mean any form resulting from mechanical 31 | transformation or translation of a Source form, including but 32 | not limited to compiled object code, generated documentation, 33 | and conversions to other media types. 34 | 35 | "Work" shall mean the work of authorship, whether in Source or 36 | Object form, made available under the License, as indicated by a 37 | copyright notice that is included in or attached to the work 38 | (an example is provided in the Appendix below). 39 | 40 | "Derivative Works" shall mean any work, whether in Source or Object 41 | form, that is based on (or derived from) the Work and for which the 42 | editorial revisions, annotations, elaborations, or other modifications 43 | represent, as a whole, an original work of authorship. For the purposes 44 | of this License, Derivative Works shall not include works that remain 45 | separable from, or merely link (or bind by name) to the interfaces of, 46 | the Work and Derivative Works thereof. 47 | 48 | "Contribution" shall mean any work of authorship, including 49 | the original version of the Work and any modifications or additions 50 | to that Work or Derivative Works thereof, that is intentionally 51 | submitted to Licensor for inclusion in the Work by the copyright owner 52 | or by an individual or Legal Entity authorized to submit on behalf of 53 | the copyright owner. For the purposes of this definition, "submitted" 54 | means any form of electronic, verbal, or written communication sent 55 | to the Licensor or its representatives, including but not limited to 56 | communication on electronic mailing lists, source code control systems, 57 | and issue tracking systems that are managed by, or on behalf of, the 58 | Licensor for the purpose of discussing and improving the Work, but 59 | excluding communication that is conspicuously marked or otherwise 60 | designated in writing by the copyright owner as "Not a Contribution." 61 | 62 | "Contributor" shall mean Licensor and any individual or Legal Entity 63 | on behalf of whom a Contribution has been received by Licensor and 64 | subsequently incorporated within the Work. 65 | 66 | 2. Grant of Copyright License. Subject to the terms and conditions of 67 | this License, each Contributor hereby grants to You a perpetual, 68 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable 69 | copyright license to reproduce, prepare Derivative Works of, 70 | publicly display, publicly perform, sublicense, and distribute the 71 | Work and such Derivative Works in Source or Object form. 72 | 73 | 3. Grant of Patent License. Subject to the terms and conditions of 74 | this License, each Contributor hereby grants to You a perpetual, 75 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable 76 | (except as stated in this section) patent license to make, have made, 77 | use, offer to sell, sell, import, and otherwise transfer the Work, 78 | where such license applies only to those patent claims licensable 79 | by such Contributor that are necessarily infringed by their 80 | Contribution(s) alone or by combination of their Contribution(s) 81 | with the Work to which such Contribution(s) was submitted. If You 82 | institute patent litigation against any entity (including a 83 | cross-claim or counterclaim in a lawsuit) alleging that the Work 84 | or a Contribution incorporated within the Work constitutes direct 85 | or contributory patent infringement, then any patent licenses 86 | granted to You under this License for that Work shall terminate 87 | as of the date such litigation is filed. 88 | 89 | 4. Redistribution. You may reproduce and distribute copies of the 90 | Work or Derivative Works thereof in any medium, with or without 91 | modifications, and in Source or Object form, provided that You 92 | meet the following conditions: 93 | 94 | (a) You must give any other recipients of the Work or 95 | Derivative Works a copy of this License; and 96 | 97 | (b) You must cause any modified files to carry prominent notices 98 | stating that You changed the files; and 99 | 100 | (c) You must retain, in the Source form of any Derivative Works 101 | that You distribute, all copyright, patent, trademark, and 102 | attribution notices from the Source form of the Work, 103 | excluding those notices that do not pertain to any part of 104 | the Derivative Works; and 105 | 106 | (d) If the Work includes a "NOTICE" text file as part of its 107 | distribution, then any Derivative Works that You distribute must 108 | include a readable copy of the attribution notices contained 109 | within such NOTICE file, excluding those notices that do not 110 | pertain to any part of the Derivative Works, in at least one 111 | of the following places: within a NOTICE text file distributed 112 | as part of the Derivative Works; within the Source form or 113 | documentation, if provided along with the Derivative Works; or, 114 | within a display generated by the Derivative Works, if and 115 | wherever such third-party notices normally appear. The contents 116 | of the NOTICE file are for informational purposes only and 117 | do not modify the License. You may add Your own attribution 118 | notices within Derivative Works that You distribute, alongside 119 | or as an addendum to the NOTICE text from the Work, provided 120 | that such additional attribution notices cannot be construed 121 | as modifying the License. 122 | 123 | You may add Your own copyright statement to Your modifications and 124 | may provide additional or different license terms and conditions 125 | for use, reproduction, or distribution of Your modifications, or 126 | for any such Derivative Works as a whole, provided Your use, 127 | reproduction, and distribution of the Work otherwise complies with 128 | the conditions stated in this License. 129 | 130 | 5. Submission of Contributions. Unless You explicitly state otherwise, 131 | any Contribution intentionally submitted for inclusion in the Work 132 | by You to the Licensor shall be under the terms and conditions of 133 | this License, without any additional terms or conditions. 134 | Notwithstanding the above, nothing herein shall supersede or modify 135 | the terms of any separate license agreement you may have executed 136 | with Licensor regarding such Contributions. 137 | 138 | 6. Trademarks. This License does not grant permission to use the trade 139 | names, trademarks, service marks, or product names of the Licensor, 140 | except as required for reasonable and customary use in describing the 141 | origin of the Work and reproducing the content of the NOTICE file. 142 | 143 | 7. Disclaimer of Warranty. Unless required by applicable law or 144 | agreed to in writing, Licensor provides the Work (and each 145 | Contributor provides its Contributions) on an "AS IS" BASIS, 146 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 147 | implied, including, without limitation, any warranties or conditions 148 | of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A 149 | PARTICULAR PURPOSE. You are solely responsible for determining the 150 | appropriateness of using or redistributing the Work and assume any 151 | risks associated with Your exercise of permissions under this License. 152 | 153 | 8. Limitation of Liability. In no event and under no legal theory, 154 | whether in tort (including negligence), contract, or otherwise, 155 | unless required by applicable law (such as deliberate and grossly 156 | negligent acts) or agreed to in writing, shall any Contributor be 157 | liable to You for damages, including any direct, indirect, special, 158 | incidental, or consequential damages of any character arising as a 159 | result of this License or out of the use or inability to use the 160 | Work (including but not limited to damages for loss of goodwill, 161 | work stoppage, computer failure or malfunction, or any and all 162 | other commercial damages or losses), even if such Contributor 163 | has been advised of the possibility of such damages. 164 | 165 | 9. Accepting Warranty or Additional Liability. While redistributing 166 | the Work or Derivative Works thereof, You may choose to offer, 167 | and charge a fee for, acceptance of support, warranty, indemnity, 168 | or other liability obligations and/or rights consistent with this 169 | License. However, in accepting such obligations, You may act only 170 | on Your own behalf and on Your sole responsibility, not on behalf 171 | of any other Contributor, and only if You agree to indemnify, 172 | defend, and hold each Contributor harmless for any liability 173 | incurred by, or claims asserted against, such Contributor by reason 174 | of your accepting any such warranty or additional liability. 175 | 176 | END OF TERMS AND CONDITIONS 177 | 178 | APPENDIX: How to apply the Apache License to your work. 179 | 180 | To apply the Apache License to your work, attach the following 181 | boilerplate notice, with the fields enclosed by brackets "{}" 182 | replaced with your own identifying information. (Don't include 183 | the brackets!) The text should be enclosed in the appropriate 184 | comment syntax for the file format. We also recommend that a 185 | file or class name and description of purpose be included on the 186 | same "printed page" as the copyright notice for easier 187 | identification within third-party archives. 188 | 189 | Copyright {yyyy} {name of copyright owner} 190 | 191 | Licensed under the Apache License, Version 2.0 (the "License"); 192 | you may not use this file except in compliance with the License. 193 | You may obtain a copy of the License at 194 | 195 | http://www.apache.org/licenses/LICENSE-2.0 196 | 197 | Unless required by applicable law or agreed to in writing, software 198 | distributed under the License is distributed on an "AS IS" BASIS, 199 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 200 | See the License for the specific language governing permissions and 201 | limitations under the License. 202 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # Weave 2 | 3 | Weave is a tool for merging Minecraft client and server JARs, as well as auxillary tasks related to mapping format management. 4 | -------------------------------------------------------------------------------- /build.gradle: -------------------------------------------------------------------------------- 1 | apply plugin: 'java' 2 | apply plugin: 'eclipse' 3 | apply plugin: 'idea' 4 | apply plugin: 'maven-publish' 5 | 6 | buildscript { 7 | repositories { 8 | maven { 9 | url "https://plugins.gradle.org/m2/" 10 | } 11 | jcenter() 12 | } 13 | } 14 | 15 | sourceCompatibility = 1.8 16 | 17 | def ENV = System.getenv() 18 | if (ENV.BUILD_NUMBER) { 19 | version = version + "." + "${System.getenv().BUILD_NUMBER}" 20 | } 21 | 22 | group = 'net.fabricmc' 23 | archivesBaseName = project.name.toLowerCase() 24 | 25 | repositories { 26 | mavenCentral() 27 | maven { 28 | name = 'fabric' 29 | url = 'http://maven.fabricmc.net/' 30 | } 31 | maven { 32 | name = 'modmuss' 33 | url = 'http://maven.modmuss50.me/' 34 | } 35 | maven { 36 | name "RX14 Repository" 37 | url 'http://mvn.rx14.co.uk/local/' 38 | } 39 | } 40 | 41 | dependencies { 42 | compile 'com.google.guava:guava:27.1-jre' 43 | compile 'org.ow2.asm:asm:7.1' 44 | compile 'org.ow2.asm:asm-commons:7.1' 45 | compile 'org.ow2.asm:asm-tree:7.1' 46 | compile 'org.ow2.asm:asm-util:7.1' 47 | 48 | compile('cuchaz:enigma:0.14.0.120:lib') { 49 | exclude group: 'org.ow2.asm' 50 | } 51 | } 52 | 53 | apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/maven.gradle' 54 | apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/license.gradle' 55 | 56 | jar { 57 | manifest { 58 | attributes 'Implementation-Title': 'Weave', 59 | 'Implementation-Version': version, 60 | 'Main-Class': "net.fabricmc.weave.Main" 61 | } 62 | } 63 | 64 | task fatJar(type: Jar) { 65 | from { 66 | configurations.compile.collect { 67 | it.isDirectory() ? it : zipTree(it) 68 | } 69 | } 70 | manifest { 71 | attributes 'Implementation-Title': 'Weave', 72 | 'Implementation-Version': version, 73 | 'Main-Class': "net.fabricmc.weave.Main" 74 | } 75 | classifier = 'fat' 76 | with jar 77 | } 78 | 79 | artifacts { 80 | archives fatJar 81 | } 82 | -------------------------------------------------------------------------------- /gradle.properties: -------------------------------------------------------------------------------- 1 | name = weave 2 | description = Fabric Enigma tools 3 | url = https://github.com/FabricMC/weave 4 | version = 0.4.0 5 | -------------------------------------------------------------------------------- /gradle/wrapper/gradle-wrapper.jar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/FabricMC/weave/c700d002901743e7ba0df0776588d107a61c423f/gradle/wrapper/gradle-wrapper.jar -------------------------------------------------------------------------------- /gradle/wrapper/gradle-wrapper.properties: -------------------------------------------------------------------------------- 1 | #Tue Aug 16 01:28:54 BST 2016 2 | distributionBase=GRADLE_USER_HOME 3 | distributionPath=wrapper/dists 4 | zipStoreBase=GRADLE_USER_HOME 5 | zipStorePath=wrapper/dists 6 | distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip 7 | -------------------------------------------------------------------------------- /gradlew: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env bash 2 | 3 | ############################################################################## 4 | ## 5 | ## Gradle start up script for UN*X 6 | ## 7 | ############################################################################## 8 | 9 | # Attempt to set APP_HOME 10 | # Resolve links: $0 may be a link 11 | PRG="$0" 12 | # Need this for relative symlinks. 13 | while [ -h "$PRG" ] ; do 14 | ls=`ls -ld "$PRG"` 15 | link=`expr "$ls" : '.*-> \(.*\)$'` 16 | if expr "$link" : '/.*' > /dev/null; then 17 | PRG="$link" 18 | else 19 | PRG=`dirname "$PRG"`"/$link" 20 | fi 21 | done 22 | SAVED="`pwd`" 23 | cd "`dirname \"$PRG\"`/" >/dev/null 24 | APP_HOME="`pwd -P`" 25 | cd "$SAVED" >/dev/null 26 | 27 | APP_NAME="Gradle" 28 | APP_BASE_NAME=`basename "$0"` 29 | 30 | # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. 31 | DEFAULT_JVM_OPTS="" 32 | 33 | # Use the maximum available, or set MAX_FD != -1 to use that value. 34 | MAX_FD="maximum" 35 | 36 | warn ( ) { 37 | echo "$*" 38 | } 39 | 40 | die ( ) { 41 | echo 42 | echo "$*" 43 | echo 44 | exit 1 45 | } 46 | 47 | # OS specific support (must be 'true' or 'false'). 48 | cygwin=false 49 | msys=false 50 | darwin=false 51 | nonstop=false 52 | case "`uname`" in 53 | CYGWIN* ) 54 | cygwin=true 55 | ;; 56 | Darwin* ) 57 | darwin=true 58 | ;; 59 | MINGW* ) 60 | msys=true 61 | ;; 62 | NONSTOP* ) 63 | nonstop=true 64 | ;; 65 | esac 66 | 67 | CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 68 | 69 | # Determine the Java command to use to start the JVM. 70 | if [ -n "$JAVA_HOME" ] ; then 71 | if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 72 | # IBM's JDK on AIX uses strange locations for the executables 73 | JAVACMD="$JAVA_HOME/jre/sh/java" 74 | else 75 | JAVACMD="$JAVA_HOME/bin/java" 76 | fi 77 | if [ ! -x "$JAVACMD" ] ; then 78 | die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME 79 | 80 | Please set the JAVA_HOME variable in your environment to match the 81 | location of your Java installation." 82 | fi 83 | else 84 | JAVACMD="java" 85 | which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 86 | 87 | Please set the JAVA_HOME variable in your environment to match the 88 | location of your Java installation." 89 | fi 90 | 91 | # Increase the maximum file descriptors if we can. 92 | if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then 93 | MAX_FD_LIMIT=`ulimit -H -n` 94 | if [ $? -eq 0 ] ; then 95 | if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then 96 | MAX_FD="$MAX_FD_LIMIT" 97 | fi 98 | ulimit -n $MAX_FD 99 | if [ $? -ne 0 ] ; then 100 | warn "Could not set maximum file descriptor limit: $MAX_FD" 101 | fi 102 | else 103 | warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" 104 | fi 105 | fi 106 | 107 | # For Darwin, add options to specify how the application appears in the dock 108 | if $darwin; then 109 | GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" 110 | fi 111 | 112 | # For Cygwin, switch paths to Windows format before running java 113 | if $cygwin ; then 114 | APP_HOME=`cygpath --path --mixed "$APP_HOME"` 115 | CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` 116 | JAVACMD=`cygpath --unix "$JAVACMD"` 117 | 118 | # We build the pattern for arguments to be converted via cygpath 119 | ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` 120 | SEP="" 121 | for dir in $ROOTDIRSRAW ; do 122 | ROOTDIRS="$ROOTDIRS$SEP$dir" 123 | SEP="|" 124 | done 125 | OURCYGPATTERN="(^($ROOTDIRS))" 126 | # Add a user-defined pattern to the cygpath arguments 127 | if [ "$GRADLE_CYGPATTERN" != "" ] ; then 128 | OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" 129 | fi 130 | # Now convert the arguments - kludge to limit ourselves to /bin/sh 131 | i=0 132 | for arg in "$@" ; do 133 | CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` 134 | CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option 135 | 136 | if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition 137 | eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` 138 | else 139 | eval `echo args$i`="\"$arg\"" 140 | fi 141 | i=$((i+1)) 142 | done 143 | case $i in 144 | (0) set -- ;; 145 | (1) set -- "$args0" ;; 146 | (2) set -- "$args0" "$args1" ;; 147 | (3) set -- "$args0" "$args1" "$args2" ;; 148 | (4) set -- "$args0" "$args1" "$args2" "$args3" ;; 149 | (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; 150 | (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; 151 | (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; 152 | (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; 153 | (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; 154 | esac 155 | fi 156 | 157 | # Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules 158 | function splitJvmOpts() { 159 | JVM_OPTS=("$@") 160 | } 161 | eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS 162 | JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" 163 | 164 | exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" 165 | -------------------------------------------------------------------------------- /gradlew.bat: -------------------------------------------------------------------------------- 1 | @if "%DEBUG%" == "" @echo off 2 | @rem ########################################################################## 3 | @rem 4 | @rem Gradle startup script for Windows 5 | @rem 6 | @rem ########################################################################## 7 | 8 | @rem Set local scope for the variables with windows NT shell 9 | if "%OS%"=="Windows_NT" setlocal 10 | 11 | @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. 12 | set DEFAULT_JVM_OPTS= 13 | 14 | set DIRNAME=%~dp0 15 | if "%DIRNAME%" == "" set DIRNAME=. 16 | set APP_BASE_NAME=%~n0 17 | set APP_HOME=%DIRNAME% 18 | 19 | @rem Find java.exe 20 | if defined JAVA_HOME goto findJavaFromJavaHome 21 | 22 | set JAVA_EXE=java.exe 23 | %JAVA_EXE% -version >NUL 2>&1 24 | if "%ERRORLEVEL%" == "0" goto init 25 | 26 | echo. 27 | echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 28 | echo. 29 | echo Please set the JAVA_HOME variable in your environment to match the 30 | echo location of your Java installation. 31 | 32 | goto fail 33 | 34 | :findJavaFromJavaHome 35 | set JAVA_HOME=%JAVA_HOME:"=% 36 | set JAVA_EXE=%JAVA_HOME%/bin/java.exe 37 | 38 | if exist "%JAVA_EXE%" goto init 39 | 40 | echo. 41 | echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 42 | echo. 43 | echo Please set the JAVA_HOME variable in your environment to match the 44 | echo location of your Java installation. 45 | 46 | goto fail 47 | 48 | :init 49 | @rem Get command-line arguments, handling Windowz variants 50 | 51 | if not "%OS%" == "Windows_NT" goto win9xME_args 52 | if "%@eval[2+2]" == "4" goto 4NT_args 53 | 54 | :win9xME_args 55 | @rem Slurp the command line arguments. 56 | set CMD_LINE_ARGS= 57 | set _SKIP=2 58 | 59 | :win9xME_args_slurp 60 | if "x%~1" == "x" goto execute 61 | 62 | set CMD_LINE_ARGS=%* 63 | goto execute 64 | 65 | :4NT_args 66 | @rem Get arguments from the 4NT Shell from JP Software 67 | set CMD_LINE_ARGS=%$ 68 | 69 | :execute 70 | @rem Setup the command line 71 | 72 | set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar 73 | 74 | @rem Execute Gradle 75 | "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% 76 | 77 | :end 78 | @rem End local scope for the variables with windows NT shell 79 | if "%ERRORLEVEL%"=="0" goto mainEnd 80 | 81 | :fail 82 | rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of 83 | rem the _cmd.exe /c_ return code! 84 | if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 85 | exit /b 1 86 | 87 | :mainEnd 88 | if "%OS%"=="Windows_NT" endlocal 89 | 90 | :omega 91 | -------------------------------------------------------------------------------- /settings.gradle: -------------------------------------------------------------------------------- 1 | rootProject.name = 'weave' 2 | 3 | -------------------------------------------------------------------------------- /src/main/java/net/fabricmc/weave/Command.java: -------------------------------------------------------------------------------- 1 | /* 2 | * Copyright (c) 2016, 2017, 2018 FabricMC 3 | * 4 | * Licensed under the Apache License, Version 2.0 (the "License"); 5 | * you may not use this file except in compliance with the License. 6 | * You may obtain a copy of the License at 7 | * 8 | * http://www.apache.org/licenses/LICENSE-2.0 9 | * 10 | * Unless required by applicable law or agreed to in writing, software 11 | * distributed under the License is distributed on an "AS IS" BASIS, 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 13 | * See the License for the specific language governing permissions and 14 | * limitations under the License. 15 | */ 16 | 17 | package net.fabricmc.weave; 18 | 19 | public abstract class Command { 20 | public final String name; 21 | 22 | public Command(String name) { 23 | this.name = name; 24 | } 25 | 26 | public abstract String getHelpString(); 27 | public abstract boolean isArgumentCountValid(int count); 28 | public abstract void run(String[] args) throws Exception; 29 | } 30 | -------------------------------------------------------------------------------- /src/main/java/net/fabricmc/weave/CommandFindMappingErrors.java: -------------------------------------------------------------------------------- 1 | /* 2 | * Copyright (c) 2016, 2017, 2018 FabricMC 3 | * 4 | * Licensed under the Apache License, Version 2.0 (the "License"); 5 | * you may not use this file except in compliance with the License. 6 | * You may obtain a copy of the License at 7 | * 8 | * http://www.apache.org/licenses/LICENSE-2.0 9 | * 10 | * Unless required by applicable law or agreed to in writing, software 11 | * distributed under the License is distributed on an "AS IS" BASIS, 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 13 | * See the License for the specific language governing permissions and 14 | * limitations under the License. 15 | */ 16 | 17 | package net.fabricmc.weave; 18 | 19 | import cuchaz.enigma.Enigma; 20 | import cuchaz.enigma.EnigmaProject; 21 | import cuchaz.enigma.ProgressListener; 22 | import cuchaz.enigma.analysis.EntryReference; 23 | import cuchaz.enigma.analysis.index.EntryIndex; 24 | import cuchaz.enigma.analysis.index.InheritanceIndex; 25 | import cuchaz.enigma.analysis.index.JarIndex; 26 | import cuchaz.enigma.analysis.index.ReferenceIndex; 27 | import cuchaz.enigma.translation.mapping.EntryMapping; 28 | import cuchaz.enigma.translation.mapping.EntryRemapper; 29 | import cuchaz.enigma.translation.mapping.serde.MappingFormat; 30 | import cuchaz.enigma.translation.mapping.tree.EntryTree; 31 | import cuchaz.enigma.translation.representation.AccessFlags; 32 | import cuchaz.enigma.translation.representation.entry.ClassEntry; 33 | import cuchaz.enigma.translation.representation.entry.FieldEntry; 34 | import cuchaz.enigma.translation.representation.entry.MethodDefEntry; 35 | import cuchaz.enigma.translation.representation.entry.MethodEntry; 36 | 37 | import java.io.File; 38 | import java.util.ArrayList; 39 | import java.util.Collection; 40 | import java.util.HashSet; 41 | import java.util.Set; 42 | import java.util.SortedMap; 43 | import java.util.TreeMap; 44 | 45 | public class CommandFindMappingErrors extends Command { 46 | public CommandFindMappingErrors() { 47 | super("findMappingErrors"); 48 | } 49 | 50 | @Override 51 | public String getHelpString() { 52 | return " "; 53 | } 54 | 55 | @Override 56 | public boolean isArgumentCountValid(int count) { 57 | return count == 2; 58 | } 59 | 60 | private void addError(SortedMap> errorStrings, String error, String cause) { 61 | if (!errorStrings.containsKey(error)) { 62 | errorStrings.put(error, new HashSet<>()); 63 | } 64 | errorStrings.get(error).add(cause); 65 | } 66 | 67 | private boolean isRefValid(AccessFlags entryAcc, EntryReference ref, EnigmaProject enigmaProject) { 68 | EntryReference refDeobf = enigmaProject.getMapper().deobfuscate(ref); 69 | String packageCtx = refDeobf.context.getContainingClass().getPackageName(); 70 | String packageEntry = refDeobf.entry.getContainingClass().getPackageName(); 71 | boolean samePackage = (packageCtx == null && packageEntry == null) || (packageCtx != null && packageCtx.equals(packageEntry)); 72 | if (samePackage) { 73 | return true; 74 | } else if (entryAcc.isProtected()) { 75 | // TODO: Is this valid? 76 | InheritanceIndex inheritanceIndex = enigmaProject.getJarIndex().getInheritanceIndex(); 77 | 78 | for (ClassEntry outerClass : getOuterClasses(ref.context.getContainingClass())) { 79 | Set callerAncestors = inheritanceIndex.getAncestors(outerClass); 80 | if (callerAncestors.contains(ref.entry.getContainingClass())) { 81 | return true; 82 | } 83 | } 84 | } 85 | 86 | return false; 87 | } 88 | 89 | private Collection getOuterClasses(ClassEntry entry) { 90 | Collection outerClasses = new ArrayList<>(); 91 | 92 | ClassEntry currentEntry = entry; 93 | while (currentEntry != null) { 94 | outerClasses.add(currentEntry); 95 | currentEntry = currentEntry.getOuterClass(); 96 | } 97 | 98 | return outerClasses; 99 | } 100 | 101 | @Override 102 | public void run(String[] args) throws Exception { 103 | File fileJarIn = new File(args[0]); 104 | File fileMappings = new File(args[1]); 105 | 106 | System.out.println("Reading JAR..."); 107 | EnigmaProject deobfuscator = Enigma.create().openJar(fileJarIn.toPath(), ProgressListener.none()); 108 | System.out.println("Reading mappings..."); 109 | 110 | MappingFormat format = fileMappings.isDirectory() ? MappingFormat.ENIGMA_DIRECTORY : MappingFormat.ENIGMA_FILE; 111 | EntryTree mappings = format.read(fileMappings.toPath(), ProgressListener.none()); 112 | deobfuscator.setMappings(mappings); 113 | 114 | JarIndex idx = deobfuscator.getJarIndex(); 115 | EntryIndex entryIndex = idx.getEntryIndex(); 116 | ReferenceIndex referenceIndex = idx.getReferenceIndex(); 117 | 118 | EntryRemapper mapper = deobfuscator.getMapper(); 119 | 120 | SortedMap> errorStrings = new TreeMap<>(); 121 | 122 | for (FieldEntry entry : entryIndex.getFields()) { 123 | AccessFlags entryAcc = entryIndex.getFieldAccess(entry); 124 | if (!entryAcc.isPublic() && !entryAcc.isPrivate()) { 125 | for (EntryReference ref : referenceIndex.getReferencesToField(entry)) { 126 | boolean valid = isRefValid(entryAcc, ref, deobfuscator); 127 | 128 | if (!valid) { 129 | EntryReference refDeobf = mapper.deobfuscate(ref); 130 | addError(errorStrings, "ERROR: Must be in one package: " + refDeobf.context.getContainingClass() + " and " + refDeobf.entry.getContainingClass(), "field " + refDeobf.entry.getName()); 131 | } 132 | } 133 | } 134 | } 135 | 136 | for (MethodEntry entry : entryIndex.getMethods()) { 137 | AccessFlags entryAcc = entryIndex.getMethodAccess(entry); 138 | if (!entryAcc.isPublic() && !entryAcc.isPrivate()) { 139 | for (EntryReference ref : referenceIndex.getReferencesToMethod(entry)) { 140 | boolean valid = isRefValid(entryAcc, ref, deobfuscator); 141 | 142 | if (!valid) { 143 | EntryReference refDeobf = mapper.deobfuscate(ref); 144 | addError(errorStrings, "ERROR: Must be in one package: " + refDeobf.context.getContainingClass() + " and " + refDeobf.entry.getContainingClass(), "method " + refDeobf.entry.getName()); 145 | } 146 | } 147 | } 148 | } 149 | 150 | for (String s : errorStrings.keySet()) { 151 | System.out.println(s + " (" + String.join(", ", errorStrings.get(s)) + ")"); 152 | } 153 | } 154 | } 155 | -------------------------------------------------------------------------------- /src/main/java/net/fabricmc/weave/CommandTinyify.java: -------------------------------------------------------------------------------- 1 | /* 2 | * Copyright (c) 2016, 2017, 2018 FabricMC 3 | * 4 | * Licensed under the Apache License, Version 2.0 (the "License"); 5 | * you may not use this file except in compliance with the License. 6 | * You may obtain a copy of the License at 7 | * 8 | * http://www.apache.org/licenses/LICENSE-2.0 9 | * 10 | * Unless required by applicable law or agreed to in writing, software 11 | * distributed under the License is distributed on an "AS IS" BASIS, 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 13 | * See the License for the specific language governing permissions and 14 | * limitations under the License. 15 | */ 16 | 17 | package net.fabricmc.weave; 18 | 19 | import com.google.common.collect.Lists; 20 | import cuchaz.enigma.ProgressListener; 21 | import cuchaz.enigma.analysis.ClassCache; 22 | import cuchaz.enigma.analysis.index.JarIndex; 23 | import cuchaz.enigma.translation.MappingTranslator; 24 | import cuchaz.enigma.translation.Translator; 25 | import cuchaz.enigma.translation.mapping.EntryMapping; 26 | import cuchaz.enigma.translation.mapping.MappingDelta; 27 | import cuchaz.enigma.translation.mapping.MappingsChecker; 28 | import cuchaz.enigma.translation.mapping.VoidEntryResolver; 29 | import cuchaz.enigma.translation.mapping.serde.MappingFormat; 30 | import cuchaz.enigma.translation.mapping.serde.MappingsWriter; 31 | import cuchaz.enigma.translation.mapping.tree.EntryTree; 32 | import cuchaz.enigma.translation.mapping.tree.EntryTreeNode; 33 | import cuchaz.enigma.translation.representation.entry.ClassEntry; 34 | import cuchaz.enigma.translation.representation.entry.Entry; 35 | import cuchaz.enigma.translation.representation.entry.FieldEntry; 36 | import cuchaz.enigma.translation.representation.entry.MethodEntry; 37 | import net.fabricmc.weave.util.EnigmaUtils; 38 | import net.fabricmc.weave.util.Utils; 39 | 40 | import java.io.BufferedWriter; 41 | import java.io.File; 42 | import java.io.FileNotFoundException; 43 | import java.io.IOException; 44 | import java.io.Writer; 45 | import java.nio.charset.StandardCharsets; 46 | import java.nio.file.Files; 47 | import java.nio.file.Path; 48 | import java.util.Comparator; 49 | import java.util.HashSet; 50 | import java.util.Set; 51 | 52 | public class CommandTinyify extends Command { 53 | public CommandTinyify() { 54 | super("tinyify"); 55 | } 56 | 57 | @Override 58 | public String getHelpString() { 59 | return " [name-obf] [name-deobf]"; 60 | } 61 | 62 | @Override 63 | public boolean isArgumentCountValid(int count) { 64 | return count >= 3 && count <= 5; 65 | } 66 | 67 | @Override 68 | public void run(String[] args) throws Exception { 69 | File injf = new File(args[0]); 70 | File inf = new File(args[1]); 71 | File outf = new File(args[2]); 72 | String nameObf = args.length > 3 ? args[3] : "official"; 73 | String nameDeobf = args.length > 4 ? args[4] : "named"; 74 | 75 | if (!injf.exists() || !injf.isFile()) { 76 | throw new FileNotFoundException("Input JAR could not be found!"); 77 | } 78 | 79 | if (!inf.exists()) { 80 | throw new FileNotFoundException("Enigma mappings could not be found!"); 81 | } 82 | 83 | System.out.println("Reading JAR file..."); 84 | 85 | JarIndex index = JarIndex.empty(); 86 | index.indexJar(ClassCache.of(injf.toPath()), ProgressListener.none()); 87 | 88 | System.out.println("Reading Enigma mappings..."); 89 | MappingFormat format = inf.isDirectory() ? MappingFormat.ENIGMA_DIRECTORY : MappingFormat.ENIGMA_FILE; 90 | EntryTree mappings = format.read(inf.toPath(), ProgressListener.none()); 91 | 92 | MappingsChecker checker = new MappingsChecker(index, mappings); 93 | checker.dropBrokenMappings(ProgressListener.none()); 94 | 95 | System.out.println("Writing Tiny mappings..."); 96 | 97 | MappingsWriter writer = new TinyMappingsWriter(nameObf, nameDeobf); 98 | writer.write(mappings, MappingDelta.added(mappings), outf.toPath(), ProgressListener.none()); 99 | } 100 | 101 | private static class TinyMappingsWriter implements MappingsWriter { 102 | private static final String VERSION_CONSTANT = "v1"; 103 | 104 | // HACK: as of enigma 0.13.1, some fields seem to appear duplicated? 105 | private final Set writtenLines = new HashSet<>(); 106 | private final String nameObf; 107 | private final String nameDeobf; 108 | 109 | private TinyMappingsWriter(String nameObf, String nameDeobf) { 110 | this.nameObf = nameObf; 111 | this.nameDeobf = nameDeobf; 112 | } 113 | 114 | @Override 115 | public void write(EntryTree mappings, MappingDelta delta, Path path, ProgressListener progress) { 116 | try { 117 | Files.deleteIfExists(path); 118 | Files.createFile(path); 119 | } catch (IOException e) { 120 | e.printStackTrace(); 121 | } 122 | 123 | try (BufferedWriter writer = Files.newBufferedWriter(path, StandardCharsets.UTF_8)) { 124 | writeLine(writer, new String[] { VERSION_CONSTANT, nameObf, nameDeobf }); 125 | 126 | Lists.newArrayList(mappings).stream() 127 | .map(EntryTreeNode::getEntry).sorted(Comparator.comparing(Object::toString)) 128 | .forEach(entry -> writeEntry(writer, mappings, entry)); 129 | } catch (IOException e) { 130 | e.printStackTrace(); 131 | } 132 | } 133 | 134 | private void writeEntry(Writer writer, EntryTree mappings, Entry entry) { 135 | EntryTreeNode node = mappings.findNode(entry); 136 | if (node == null) { 137 | return; 138 | } 139 | 140 | Translator translator = new MappingTranslator(mappings, VoidEntryResolver.INSTANCE); 141 | 142 | EntryMapping mapping = mappings.get(entry); 143 | if (mapping != null && !entry.getName().equals(mapping.getTargetName())) { 144 | if (entry instanceof ClassEntry) { 145 | writeClass(writer, (ClassEntry) entry, translator); 146 | } else if (entry instanceof FieldEntry) { 147 | writeLine(writer, EnigmaUtils.serializeEntry(entry, true, mapping.getTargetName())); 148 | } else if (entry instanceof MethodEntry) { 149 | writeLine(writer, EnigmaUtils.serializeEntry(entry, true, mapping.getTargetName())); 150 | } 151 | } 152 | 153 | writeChildren(writer, mappings, node); 154 | } 155 | 156 | private void writeChildren(Writer writer, EntryTree mappings, EntryTreeNode node) { 157 | node.getChildren().stream() 158 | .filter(e -> e instanceof FieldEntry).sorted() 159 | .forEach(child -> writeEntry(writer, mappings, child)); 160 | 161 | node.getChildren().stream() 162 | .filter(e -> e instanceof MethodEntry).sorted() 163 | .forEach(child -> writeEntry(writer, mappings, child)); 164 | 165 | node.getChildren().stream() 166 | .filter(e -> e instanceof ClassEntry).sorted() 167 | .forEach(child -> writeEntry(writer, mappings, child)); 168 | } 169 | 170 | private void writeClass(Writer writer, ClassEntry entry, Translator translator) { 171 | ClassEntry translatedEntry = translator.translate(entry); 172 | 173 | String obfClassName = Utils.NONE_PREFIX_REMOVER.map(entry.getFullName()); 174 | String deobfClassName = Utils.NONE_PREFIX_REMOVER.map(translatedEntry.getFullName()); 175 | writeLine(writer, new String[] { "CLASS", obfClassName, deobfClassName }); 176 | } 177 | 178 | private void writeLine(Writer writer, String[] data) { 179 | try { 180 | String line = Utils.TAB_JOINER.join(data) + "\n"; 181 | if (writtenLines.add(line)) { 182 | writer.write(line); 183 | } 184 | } catch (IOException e) { 185 | throw new RuntimeException(e); 186 | } 187 | } 188 | } 189 | } 190 | -------------------------------------------------------------------------------- /src/main/java/net/fabricmc/weave/Main.java: -------------------------------------------------------------------------------- 1 | /* 2 | * Copyright (c) 2016, 2017, 2018 FabricMC 3 | * 4 | * Licensed under the Apache License, Version 2.0 (the "License"); 5 | * you may not use this file except in compliance with the License. 6 | * You may obtain a copy of the License at 7 | * 8 | * http://www.apache.org/licenses/LICENSE-2.0 9 | * 10 | * Unless required by applicable law or agreed to in writing, software 11 | * distributed under the License is distributed on an "AS IS" BASIS, 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 13 | * See the License for the specific language governing permissions and 14 | * limitations under the License. 15 | */ 16 | 17 | package net.fabricmc.weave; 18 | 19 | import net.fabricmc.weave.util.EnigmaUtils; 20 | 21 | import java.util.Map; 22 | import java.util.TreeMap; 23 | 24 | public class Main { 25 | private static final Map COMMAND_MAP = new TreeMap<>(); 26 | 27 | public static void addCommand(Command command) { 28 | COMMAND_MAP.put(command.name.toLowerCase(), command); 29 | } 30 | 31 | static { 32 | boolean ENIGMA_PRESENT = true; 33 | try { 34 | Class.forName("cuchaz.enigma.translation.representation.entry.Entry"); 35 | } catch (ClassNotFoundException e) { 36 | ENIGMA_PRESENT = false; 37 | } 38 | 39 | if (ENIGMA_PRESENT) { 40 | EnigmaUtils.addEnigmaCommands(); 41 | } 42 | } 43 | 44 | public static void error(String message) { 45 | System.err.println(message); 46 | System.exit(1); 47 | } 48 | 49 | public static void main(String[] args) { 50 | if (args.length == 0 51 | || !COMMAND_MAP.containsKey(args[0].toLowerCase()) 52 | || !COMMAND_MAP.get(args[0].toLowerCase()).isArgumentCountValid(args.length - 1)) { 53 | System.out.println("Available commands:"); 54 | for (Command command : COMMAND_MAP.values()) { 55 | System.out.println("\t" + command.name + " " + command.getHelpString()); 56 | } 57 | System.out.println(); 58 | return; 59 | } 60 | 61 | try { 62 | String[] argsCommand = new String[args.length - 1]; 63 | if (args.length > 1) { 64 | System.arraycopy(args, 1, argsCommand, 0, argsCommand.length); 65 | } 66 | COMMAND_MAP.get(args[0].toLowerCase()).run(argsCommand); 67 | } catch (Exception e) { 68 | e.printStackTrace(); 69 | System.exit(1); 70 | } 71 | } 72 | } 73 | -------------------------------------------------------------------------------- /src/main/java/net/fabricmc/weave/util/EnigmaUtils.java: -------------------------------------------------------------------------------- 1 | /* 2 | * Copyright (c) 2016, 2017, 2018 FabricMC 3 | * 4 | * Licensed under the Apache License, Version 2.0 (the "License"); 5 | * you may not use this file except in compliance with the License. 6 | * You may obtain a copy of the License at 7 | * 8 | * http://www.apache.org/licenses/LICENSE-2.0 9 | * 10 | * Unless required by applicable law or agreed to in writing, software 11 | * distributed under the License is distributed on an "AS IS" BASIS, 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 13 | * See the License for the specific language governing permissions and 14 | * limitations under the License. 15 | */ 16 | 17 | package net.fabricmc.weave.util; 18 | 19 | import cuchaz.enigma.translation.representation.MethodDescriptor; 20 | import cuchaz.enigma.translation.representation.TypeDescriptor; 21 | import cuchaz.enigma.translation.representation.entry.ClassEntry; 22 | import cuchaz.enigma.translation.representation.entry.Entry; 23 | import cuchaz.enigma.translation.representation.entry.FieldEntry; 24 | import cuchaz.enigma.translation.representation.entry.MethodEntry; 25 | import net.fabricmc.weave.CommandFindMappingErrors; 26 | import net.fabricmc.weave.CommandTinyify; 27 | import net.fabricmc.weave.Main; 28 | 29 | public class EnigmaUtils { 30 | public static String[] serializeEntry(Entry entry, boolean removeNone, String... extraFields) { 31 | String[] data = null; 32 | 33 | if (entry instanceof FieldEntry) { 34 | data = new String[4 + extraFields.length]; 35 | data[0] = "FIELD"; 36 | data[1] = entry.getContainingClass().getFullName(); 37 | data[2] = ((FieldEntry) entry).getDesc().toString(); 38 | data[3] = entry.getName(); 39 | 40 | if (removeNone) { 41 | data[1] = Utils.NONE_PREFIX_REMOVER.map(data[1]); 42 | data[2] = Utils.NONE_PREFIX_REMOVER.mapDesc(data[2]); 43 | } 44 | } else if (entry instanceof MethodEntry) { 45 | data = new String[4 + extraFields.length]; 46 | data[0] = "METHOD"; 47 | data[1] = entry.getContainingClass().getFullName(); 48 | data[2] = ((MethodEntry) entry).getDesc().toString(); 49 | data[3] = entry.getName(); 50 | 51 | if (removeNone) { 52 | data[1] = Utils.NONE_PREFIX_REMOVER.map(data[1]); 53 | data[2] = Utils.NONE_PREFIX_REMOVER.mapMethodDesc(data[2]); 54 | } 55 | } else if (entry instanceof ClassEntry) { 56 | data = new String[2 + extraFields.length]; 57 | data[0] = "CLASS"; 58 | data[1] = ((ClassEntry) entry).getFullName(); 59 | 60 | if (removeNone) { 61 | data[1] = Utils.NONE_PREFIX_REMOVER.map(data[1]); 62 | } 63 | } 64 | 65 | if (data != null) { 66 | System.arraycopy(extraFields, 0, data, data.length - extraFields.length, extraFields.length); 67 | } 68 | 69 | return data; 70 | } 71 | 72 | public static Entry deserializeEntry(String[] data) { 73 | if (data.length > 0) { 74 | if (data[0].equals("FIELD") && data.length >= 4) { 75 | return new FieldEntry(new ClassEntry(data[1]), data[3], new TypeDescriptor(data[2])); 76 | } else if (data[0].equals("METHOD") && data.length >= 4) { 77 | return new MethodEntry(new ClassEntry(data[1]), data[3], new MethodDescriptor(data[2])); 78 | } else if (data[0].equals("CLASS") && data.length >= 2) { 79 | return new ClassEntry(data[1]); 80 | } 81 | } 82 | 83 | return null; 84 | } 85 | 86 | public static void addEnigmaCommands() { 87 | Main.addCommand(new CommandTinyify()); 88 | Main.addCommand(new CommandFindMappingErrors()); 89 | } 90 | } 91 | -------------------------------------------------------------------------------- /src/main/java/net/fabricmc/weave/util/Utils.java: -------------------------------------------------------------------------------- 1 | /* 2 | * Copyright (c) 2016, 2017, 2018 FabricMC 3 | * 4 | * Licensed under the Apache License, Version 2.0 (the "License"); 5 | * you may not use this file except in compliance with the License. 6 | * You may obtain a copy of the License at 7 | * 8 | * http://www.apache.org/licenses/LICENSE-2.0 9 | * 10 | * Unless required by applicable law or agreed to in writing, software 11 | * distributed under the License is distributed on an "AS IS" BASIS, 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 13 | * See the License for the specific language governing permissions and 14 | * limitations under the License. 15 | */ 16 | 17 | package net.fabricmc.weave.util; 18 | 19 | import com.google.common.base.Joiner; 20 | import com.google.common.base.Splitter; 21 | import org.objectweb.asm.commons.Remapper; 22 | 23 | import java.util.*; 24 | 25 | public final class Utils { 26 | public static final Remapper NONE_PREFIX_REMOVER = new Remapper() { 27 | @Override 28 | public String map(String name) { 29 | if (name.startsWith("none/")) { 30 | return name.substring(5); 31 | } else { 32 | return name; 33 | } 34 | } 35 | }; 36 | public static final Joiner TAB_JOINER = Joiner.on('\t'); 37 | public static final Splitter TAB_SPLITTER = Splitter.on('\t'); 38 | 39 | private Utils() { 40 | 41 | } 42 | 43 | public static long getTime() { 44 | return new Date().getTime(); 45 | } 46 | 47 | public static List mergePreserveOrder(List first, List second) { 48 | List out = new ArrayList<>(); 49 | 50 | int i = 0; 51 | int j = 0; 52 | while (i < first.size() || j < second.size()) { 53 | while (i < first.size() && j < second.size() 54 | && first.get(i).equals(second.get(j))) { 55 | out.add(first.get(i)); 56 | i++; 57 | j++; 58 | } 59 | 60 | while (i < first.size() && !second.contains(first.get(i))) { 61 | out.add(first.get(i)); 62 | i++; 63 | } 64 | 65 | while (j < second.size() && !first.contains(second.get(j))) { 66 | out.add(second.get(j)); 67 | j++; 68 | } 69 | } 70 | return out; 71 | } 72 | } 73 | --------------------------------------------------------------------------------