diff --git a/FernFlower b/FernFlower index 0e3593f..6a802a6 160000 --- a/FernFlower +++ b/FernFlower @@ -1 +1 @@ -Subproject commit 0e3593f12741eed59e88368eba933bb10fd4f6a6 +Subproject commit 6a802a6fc971f37b1cde2db35c97d9984c877626 diff --git a/FernFlower-Patches/0001-Git-filter-and-setup-cleanup-for-java-17.patch b/FernFlower-Patches/0001-Git-filter-and-setup-cleanup-for-java-17.patch deleted file mode 100644 index 884e58a..0000000 --- a/FernFlower-Patches/0001-Git-filter-and-setup-cleanup-for-java-17.patch +++ /dev/null @@ -1,713 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: LexManos -Date: Tue, 11 Apr 2017 20:44:39 -0700 -Subject: [PATCH] Git filter and setup, cleanup for java 17 - - -diff --git a/.gitattributes b/.gitattributes -index f1df734f9f0bc7080a99140482eedf28bfe6b166..972529aebd1f5daa057f1fe9606c79be1dc4f64f 100644 ---- a/.gitattributes -+++ b/.gitattributes -@@ -1 +1,42 @@ --*.dec text -+# Convert line endings to linux for files detected as text -+# and leave all files detected as binary untouched. -+* text eol=lf -+ -+# -+# The above will handle all files NOT found below -+# -+# These files are text and should be normalized (Convert crlf => lf) -+*.css text -+*.df text -+*.htm text -+*.html text -+*.java text -+*.js text -+*.json text -+*.jsp text -+*.jspf text -+*.jspx text -+*.properties text -+*.sh text -+*.tld text -+*.txt text -+*.tag text -+*.tagx text -+*.xml text -+*.yml text -+*.dec text -+ -+# These files are binary and should be left untouched -+# (binary is a macro for -text -diff) -+*.class binary -+*.dll binary -+*.ear binary -+*.gif binary -+*.ico binary -+*.jar binary -+*.jpg binary -+*.jpeg binary -+*.png binary -+*.so binary -+*.war binary -+ -\ No newline at end of file -diff --git a/.gitignore b/.gitignore -index 2b5420b0d76d97d25c4de444bc669891fd9ea4f3..c52eb2e815432be8d1f1e6b61cffdcce68af85bb 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -1,4 +1,231 @@ --/.idea/ --/.gradle/ -+ -+# Created by https://www.gitignore.io/api/java,macos,linux,gradle,windows,eclipse,intellij -+ -+### Eclipse ### -+ -+.metadata -+bin/ -+tmp/ -+*.tmp -+*.bak -+*.swp -+*~.nib -+local.properties -+.settings/ -+.loadpath -+.recommenders -+ -+# Eclipse Core -+.project -+ -+# External tool builders -+.externalToolBuilders/ -+ -+# Locally stored "Eclipse launch configurations" -+*.launch -+ -+# PyDev specific (Python IDE for Eclipse) -+*.pydevproject -+ -+# CDT-specific (C/C++ Development Tooling) -+.cproject -+ -+# JDT-specific (Eclipse Java Development Tools) -+.classpath -+ -+# Java annotation processor (APT) -+.factorypath -+ -+# PDT-specific (PHP Development Tools) -+.buildpath -+ -+# sbteclipse plugin -+.target -+ -+# Tern plugin -+.tern-project -+ -+# TeXlipse plugin -+.texlipse -+ -+# STS (Spring Tool Suite) -+.springBeans -+ -+# Code Recommenders -+.recommenders/ -+ -+# Scala IDE specific (Scala & Java development for Eclipse) -+.cache-main -+.scala_dependencies -+.worksheet -+ -+### Intellij ### -+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 -+ -+# User-specific stuff: -+.idea/**/workspace.xml -+.idea/**/tasks.xml -+.idea/dictionaries -+ -+# Sensitive or high-churn files: -+.idea/**/dataSources/ -+.idea/**/dataSources.ids -+.idea/**/dataSources.xml -+.idea/**/dataSources.local.xml -+.idea/**/sqlDataSources.xml -+.idea/**/dynamic.xml -+.idea/**/uiDesigner.xml -+ -+# Gradle: -+.idea/**/gradle.xml -+.idea/**/libraries -+ -+# Mongo Explorer plugin: -+.idea/**/mongoSettings.xml -+ -+## File-based project format: -+*.iws -+ -+## Plugin-specific files: -+ -+# IntelliJ -+/out/ -+ -+# mpeltonen/sbt-idea plugin -+.idea_modules/ -+ -+# JIRA plugin -+atlassian-ide-plugin.xml -+ -+# Cursive Clojure plugin -+.idea/replstate.xml -+ -+# Crashlytics plugin (for Android Studio and IntelliJ) -+com_crashlytics_export_strings.xml -+crashlytics.properties -+crashlytics-build.properties -+fabric.properties -+ -+### Intellij Patch ### -+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 -+ -+# *.iml -+# modules.xml -+# .idea/misc.xml -+# *.ipr -+ -+# Sonarlint plugin -+.idea/sonarlint -+ -+### Java ### -+# Compiled class file -+*.class -+ -+# Log file -+*.log -+ -+# BlueJ files -+*.ctxt -+ -+# Mobile Tools for Java (J2ME) -+.mtj.tmp/ -+ -+# Package Files # -+*.jar -+*.war -+*.ear -+*.zip -+*.tar.gz -+*.rar -+ -+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -+hs_err_pid* -+ -+### Linux ### -+*~ -+ -+# temporary files which can be created if a process still has a handle open of a deleted file -+.fuse_hidden* -+ -+# KDE directory preferences -+.directory -+ -+# Linux trash folder which might appear on any partition or disk -+.Trash-* -+ -+# .nfs files are created when an open file is removed but is still being accessed -+.nfs* -+ -+### macOS ### -+*.DS_Store -+.AppleDouble -+.LSOverride -+ -+# Icon must end with two \r -+Icon -+ -+ -+# Thumbnails -+._* -+ -+# Files that might appear in the root of a volume -+.DocumentRevisions-V100 -+.fseventsd -+.Spotlight-V100 -+.TemporaryItems -+.Trashes -+.VolumeIcon.icns -+.com.apple.timemachine.donotpresent -+ -+# Directories potentially created on remote AFP share -+.AppleDB -+.AppleDesktop -+Network Trash Folder -+Temporary Items -+.apdisk -+ -+### Windows ### -+# Windows thumbnail cache files -+Thumbs.db -+ehthumbs.db -+ehthumbs_vista.db -+ -+# Folder config file -+Desktop.ini -+ -+# Recycle Bin used on file shares -+$RECYCLE.BIN/ -+ -+# Windows Installer files -+*.cab -+*.msi -+*.msm -+*.msp -+ -+# Windows shortcuts -+*.lnk -+ -+### Gradle ### -+.gradle - /build/ --/out/ -\ No newline at end of file -+ -+# Ignore Gradle GUI config -+gradle-app.setting -+ -+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -+!gradle-wrapper.jar -+ -+# Cache of project -+.gradletasknamecache -+ -+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 -+# gradle/wrapper/gradle-wrapper.properties -+ -+# End of https://www.gitignore.io/api/java,macos,linux,gradle,windows,eclipse,intellij -+ -+### ForgeFlower ### -+ForgeFlower/ -+.idea/ -+repo -+!testData/classes/** -diff --git a/README.md b/README.md -index 3f5a417a01d918a21b7dcb057b2eb259ec2df475..9b15cd643468b3852b0092f7bffd399518fc03b3 100644 ---- a/README.md -+++ b/README.md -@@ -11,6 +11,8 @@ Fernflower is licenced under the [Apache Licence Version 2.0](http://www.apache. - - ### Running from command line - -+ForgeFlower requires Java 17 to run. -+ - `java -jar fernflower.jar [-