Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ForgeFlower Legacy; FG-2.2 Base #139

Open
wants to merge 22 commits into
base: legacy-2.2
Choose a base branch
from
Open

ForgeFlower Legacy; FG-2.2 Base #139

wants to merge 22 commits into from

Commits on Mar 22, 2023

  1. Rebase on upstream 4961b5b (MinecraftForge#138)

    @SizableShrimp
    SizableShrimp authored Mar 22, 2023
    Configuration menu
    Copy the full SHA
    7534b3c View commit details
    Browse the repository at this point in the history

  2. Made changes to bring feature parity with FernFlowerLegacy/FernFlower… 

    …:2.0-SNAPSHOT
    @TheCurle @SizableShrimp
    TheCurle authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    38535fe View commit details
    Browse the repository at this point in the history

  3. Minimise patches, fix gradle wrapper. Now compiles on all my computers

    @TheCurle @SizableShrimp
    TheCurle authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    abf989d View commit details
    Browse the repository at this point in the history

  4. Fixes and adjustments

    @TheCurle @SizableShrimp
    TheCurle authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    9b9ac46 View commit details
    Browse the repository at this point in the history

  5. Consolidate patches 

    Thanks to Sciwhiz12
    @sciwhiz12 @SizableShrimp
    sciwhiz12 authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    1056f3b View commit details
    Browse the repository at this point in the history

  6. Add needed command line arguments 

    Thanks again to sciwhiz12.
    @sciwhiz12 @SizableShrimp
    sciwhiz12 authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    d5139ae View commit details
    Browse the repository at this point in the history

  7. Move to Gradle 6.8.1 and use java toolchains

    @sciwhiz12 @SizableShrimp
    sciwhiz12 authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    28d0153 View commit details
    Browse the repository at this point in the history

  8. Add patch to set StructContext, courtesy of @TheCurle (#4)

    @sciwhiz12 @SizableShrimp
    sciwhiz12 authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    7617d7d View commit details
    Browse the repository at this point in the history

  9. Add patch for prioritizing inconsistent inner class entries

    @sciwhiz12 @SizableShrimp
    sciwhiz12 authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    2cea121 View commit details
    Browse the repository at this point in the history

  10. Fix inner class patch (add in missing line)

    @sciwhiz12 @SizableShrimp
    sciwhiz12 authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    8ab8b4f View commit details
    Browse the repository at this point in the history

  11. Add more stabilization patching from master ForgeFlower

    @sciwhiz12 @SizableShrimp
    sciwhiz12 authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    a6c20c2 View commit details
    Browse the repository at this point in the history

  12. Filter out abstract parameter renaming file from output

    @sciwhiz12 @SizableShrimp
    sciwhiz12 authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    f359ea9 View commit details
    Browse the repository at this point in the history

  13. Update to newer buildscripts. Doesn't quite work yet.

    @TheCurle @SizableShrimp
    TheCurle authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    5b2950c View commit details
    Browse the repository at this point in the history

  14. More work towards parity with FernFlowerLegacy

    @TheCurle @SizableShrimp
    TheCurle authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    b0ca3ff View commit details
    Browse the repository at this point in the history

  15. test: Add Comparison Test against FG2 Output (#10) 

    * test: Add Comparison Test against FG2 Output

Setup Required:

#### testData/retrogradle/fg2/decompiled.zip
- clone 1.11.x (FG2) from <a href="https:/RetroGradle/MinecraftForge">RetroGradle/MinecraftForge</a>
- `gradlew setup` (May need to be from the terminal due to gradle version)
- copy `build/localCache/decompiled.zip`

#### testData/retrogradle/fg3/output.jar
- checkout retrogradle1.11 branch
- `gradlew setup` (May require a second `gradlew setup` as the first downloads the custom MCPConfig zip)
- copy `projects/mcp/build/mcp/decompile/output.jar`

Diffs are output to `testData/retrogradle/output`

Signed-off-by: AterAnimAvis <[email protected]>
    @AterAnimAvis @SizableShrimp
    AterAnimAvis authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    dba9577 View commit details
    Browse the repository at this point in the history

  16. fix: Java 8 no longer loading ClassStreams correctly (#11) 

    The original patched will skip the IBytecodeProvider due to the always present byte array (even if it is 0 length), It looks like the original intention is for `link.data` to be null in this case.

Signed-off-by: AterAnimAvis <[email protected]>
    @AterAnimAvis @SizableShrimp
    AterAnimAvis authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    46b9118 View commit details
    Browse the repository at this point in the history

  17. Pull in CPW commit for the BiomeMesa decomp difference (#12) 

    Fixes the following decomp difference in BiomeMesa:
<https://gist.github.com/AterAnimAvis/36edd447fde25c3ea9259bc20033d4cb>

Signed-off-by: AterAnimAvis <[email protected]>
    @AterAnimAvis @SizableShrimp
    AterAnimAvis authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    76755d0 View commit details
    Browse the repository at this point in the history

  18. fix: J9 issues again due to partially ported patch (#13) 

    Signed-off-by: AterAnimAvis <[email protected]>
    @AterAnimAvis @SizableShrimp
    AterAnimAvis authored and SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    9bd65fd View commit details
    Browse the repository at this point in the history

  19. Delete the added patch files from rebase

    @SizableShrimp
    SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    a1c7b1f View commit details
    Browse the repository at this point in the history

  20. Delete old reference to ForgeFlower9 subproject

    @SizableShrimp
    SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    377e49f View commit details
    Browse the repository at this point in the history

  21. Bump legacy ForgeFlower down to J8

    @SizableShrimp
    SizableShrimp committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    b2500c1 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. Adjust to ForgeFlowerLegacy basename

    @TheCurle
    TheCurle committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    2b3da33 View commit details
    Browse the repository at this point in the history