This PR updates Nomi-Labs to 0.7.0, allowing for associate updates to GT, GCYM, GrS and Architecture Craft, as well as the removal of Random Patches, Just Enough Dimensions, and Difficulty Lock.
Although GT 2.8.10 also fixed Extreme RAM Usage in Alfheim 1.3, (See PR https://github.com/GregTechCEu/GregTech/pull/2475) this PR **does not** update Alfheim to 1.3. This is because Alfheim 1.3, although not consuming large amounts of memory, still consumes more memory than 1.1.1, and causes fps spikes.
Also, because Nomi-Labs now implements a native and better difficulty lock, of which works on dedicated servers, `server.properties` overrides, as well as previously changed parts in README and Pack Mode Switchers (in https://github.com/Nomi-CEu/Nomi-CEu/pull/292), have been removed.
This PR also fixes an issue with corrupted images and jar files in built packs.
/* Github Stuff */
[FIXUP]
[[fixes]]
sha = "bd58b9072f45d647734ae66168cbd27bf9b2f220"
newTitle = "Update GT and Related Mods for 1.7"
newBody = '''
[EXPAND]
[[messages]]
messageTitle = "Update GT to 2.8+, add Nomi Labs"
messageBody = """
[BREAKING]
[DETAILS]
details = [
\"**Please DO NOT revert any saves that have been loaded in this release to 1.6.1b, 1.6.1a, or prior!**\",
\"**Lots of Recipes have been moved to the Assembly Line, and now require Assembly Line Research.**\",
\"Adds Assembly Line Research\",
\"Adds ME Hatches and Buses, for combining Multiblocks with AE Networks\",
\"Adds Filtered Output Hatches\",
\"Adds EU Multiblock Power Storage\",
\"Adds Multiblock Transformer and Laser Power Transfer\",
\"Adds Long Distance Pipes\",
\"Creating Waypoints in the Prospector\",
\"Fixing many Bugs\",
\"And many more!\"
]
[DETAILS]
[PRIORITY]
priority = 100
[PRIORITY]
"""
[[messages]]
messageTitle = "Multiblock Changes"
messageBody = """
[BREAKING]
[DETAILS]
details = [
\"Multiblocks accept a new **maximum** of 2 Energy Hatches.\",
\"All Custom Multiblocks, such as Naquadah Reactors and Multiverse Projectors, now have **minimum casing requirements** and a **maintenance hatch**.\",
\"Some Custom Multiblocks now have Distinct Mode\",
\"All Custom Multiblocks now have custom Front Overlays\",
\"Reworked & Improved Multiblock UIs\"
]
[DETAILS]
[PRIORITY]
priority = 50
[PRIORITY]
"""
[EXPAND]
'''
[FIXUP]
[EXPAND]
[[messages]]
messageTitle = "Upgrade AE2 Stuff to AE2 Stuff Unofficial"
messageBody = '''
[BREAKING]
[DETAILS]
details = [
"Pattern Encoders have been Removed!",
"Any existing Pattern Encoders, whether items, in patterns or placed, have been remapped to AE2 Interfaces.",
"All Usages in Recipes have also been changed to AE2 Interfaces!",
]
[DETAILS]
[PRIORITY]
priority=25
[PRIORITY]
'''
[[messages]]
messageTitle = "Update GT to 2.8.10"
messageBody = '''
[BREAKING]
[DETAILS]
details = [
"Allows GregTech Data Sticks to Copy ME Hatch Settings",
"Adds an 'Stocking' Version of ME Hatches and Buses",
"Support for Displaying Power Substation on Central Monitor",
]
[DETAILS]
[PRIORITY]
priority=20
[PRIORITY]
[IGNORE]
checks = { compareBefore = "1.7-alpha-4" } # Only apply this if the commit being compared against is 1.7-alpha-4 or newer
[IGNORE]
'''
[[messages]]
messageTitle = "Update Nomi Labs to 0.7.0"
messageBody = '''
[BREAKING]
[DETAILS]
details = [
"Improvement of DME Simulation Chamber (now increases Tiers and Data Counts of Models)",
"Custom Implementation of Difficulty Lock, now works on Dedicated Servers",
"Replacement of the Void Dimension, fixing issues with Difficulty Changing",
"Replacement of Custom Window Titles and Logos, Allowing the Removal of Random Patches",
"Improvements to FTB Utils and Effortless Building",
"Allows Setting of Default Keybinds for New Players",
]
[DETAILS]
[PRIORITY]
priority=15
[PRIORITY]
[IGNORE]
checks = { compareBefore = "1.7-alpha-4" } # Only apply this if the commit being compared against is 1.7-alpha-4 or newer
[IGNORE]
'''
[EXPAND]
[MOD INFO]
[[infos]]
projectID = 254317
info = "Replaced by Nomi Labs"
[[infos]]
projectID = 285612
info = "Replaced by Nomi Labs"
[[infos]]
projectID = 390886
info = "Replaced by Nomi Labs"
[[infos]]
projectID = 538092
info = "Replaced by Betterer P2P"
[MOD INFO]
This reverts a change made in #619 (specifically commits [`be70198` (#619)](be7019840c) and [`4220f6c` (#619)](4220f6c185)), where the Void Raw Oil Deposit was changed from Raw Oil to Oil.
Although this was intended initially to maintain the same resource production as before the GregTech update, this decreased the production of Naphtha, leading to Gasoline and HoG being even less viable than before.
## Ratio Changes:
Before: 50mb (Oil) -> 20mb (Sulfuric Naphtha), Ratio of 5:2
After: 100mb (Raw Oil) -> 150mb (Sulfuric Naphtha), Ratio of 2:3
All other ratios are not changed (as Deposit has also been changed to give x2 amount).
/* GitHub Stuff */
[BALANCING]
[IGNORE]
checks = { compareNot = "1.7-alpha-4" }
[IGNORE]
[DETAILS]
details = [
"Increase Viability of Naphtha, especially in Hard Mode",
"Before: 50mb (Oil) -> 20mb (Sulfuric Naphtha), Ratio of 5:2",
"After: 100mb (Raw Oil) -> 150mb (Sulfuric Naphtha), Ratio of 2:3",
"Other Products have No Changed Ratios, due to Increasing Yield from 40-80",
]
[DETAILS]
Fixes#714
The Eternal Catalyst Tooltip has been implemented in https://github.com/Nomi-CEu/Nomi-Labs/blob/main/src/main/java/com/nomiceu/nomilabs/item/registry/register/LabsEndgame.java#L17.
The Ultimate Gem and Generator tooltips, which specify that their recipe is shapeless, is not needed, as a shapeless icon is shown in the JEI pages for their recipes.
/* Git Stuff */
[BUG]
[IGNORE]
checks = { compareNot = "1.7-alpha-3" }
[IGNORE]
[FIXUP]
[[fixes]]
sha = "2f6ca989e7522039fb49d62fa4e64f00d152d2b5"
mode = "ADDITION"
newBody = "[QOL]"
[[fixes]]
sha = "bd58b9072f45d647734ae66168cbd27bf9b2f220"
newTitle = "Update GT and Related Mods for 1.7"
newBody = '''
[EXPAND]
[[messages]]
messageTitle = "Update GT to 2.8+, add Nomi Labs"
messageBody = """
[BREAKING]
[DETAILS]
details = [
\"**Please DO NOT revert any saves that have been loaded in this release to 1.7-alpha-2a or prior! (Including 1.6.1b & 1.6.1a!)**\",
\"**Lots of Recipes have been moved to the Assembly Line, and now require Assembly Line Research.**\",
\"Adds Assembly Line Research\",
\"Adds ME Hatches and Buses, for combining Multiblocks with AE Networks\",
\"Adds Filtered Output Hatches\",
\"Adds EU Multiblock Power Storage\",
\"Adds Multiblock Transformer and Laser Power Transfer\",
\"Adds Long Distance Pipes\",
\"Creating Waypoints in the Prospector\",
\"Fixing many Bugs\",
\"And many more!\"
]
[DETAILS]
[PRIORITY]
priority = 10
[PRIORITY]
"""
[[messages]]
messageTitle = "Multiblock Changes"
messageBody = """
[BREAKING]
[DETAILS]
details = [
\"**Multiblock Overclocking Logic has Changed.**\",
[
\"The Maximum Voltage of a Recipe a Multiblock can run, for 1A, 4A and 16A Energy Hatches, is dependent on the Tier of its Hatches.\",
\"You can increase the Maximum Voltage by 1, for 1A, 4A and 16A Energy Hatches, by Adding Another Hatch.\",
\"However, the Maximum Overclock Voltage still takes into account the Amperage and Voltage, and retains its previous behaviour (4 Amps = +1 Voltage).\",
],
\"Multiblocks accept a new **maximum** of 2 Energy Hatches. GCYM Machines only accept **1**.\",
\"All Custom Multiblocks, such as Naquadah Reactors and Multiverse Projectors, now have **minimum casing requirements** and a **maintenance hatch**.\",
\"Some Custom Multiblocks now have Distinct Mode\",
\"All Custom Multiblocks now have custom Front Overlays\",
\"Reworked & Improved Multiblock UIs\"
]
[DETAILS]
[PRIORITY]
priority = 5
[PRIORITY]
"""
[EXPAND]
'''
[FIXUP]
Fixes most migration issues, adds some presence helpers.
1. On the first load of an old world on 1.7-alpha-3, everything migrates correctly.
2. However, if the player saves and quits, then loads the world again, and then loads an old chunk:
- ex. They were in the overworld when they loaded in, they saved and quit, then loaded their void world base
3. Everything in chunks that were not loaded in the first load is not migrated correctly (hence you get broken items (other players on servers), broken blocks, broken multiblocks, crashes with multiblocks, etc.)
[BUG]
[IGNORE]
checks = { compareNot = "1.7-alpha-3" }
[IGNORE]
/* Git Stuff */
[FIXUP]
[[fixes]]
sha = "388b670ed1ebd48e7d9dfae6020b09ef3f62a9cc"
newBody = '''
[EXPAND]
[[messages]]
messageTitle = "Fix Small Dust & Tiny Dust Crafting Conversion Recipes (#696)"
messageBody = """
[BUG]
[DETAILS]
detail = \"Recipes are now as Shown in JEI! Change your AE2 Patterns!\"
[DETAILS]
"""
[[messages]]
messageTitle = "Fix Dust to Dye Conversion Recipes (#696)"
messageBody = """
[BUG]
[IGNORE]
checks = { compareNot = \"1.7-alpha-3\" }
[IGNORE]
[DETAILS]
details = [\"Dust to Dye Conversion Recipes are no longer Shapeless.\"]
[DETAILS]
"""
[EXPAND]
'''
[[fixes]]
sha = "776799b8f24e3fefee8b78a77e8cebd56b472197"
mode = "ADDITION"
newBody = '''
[IGNORE]
checks = { compareNot = "1.7-alpha-3" }
[IGNORE]
'''
[[fixes]]
sha = "63f6f3824450d7fa5a56d25fa548639ec1b1004a"
mode = "ADDITION"
newBody = '''
[IGNORE]
checks = { compareNot = "1.7-alpha-3" }
[IGNORE]
'''
[FIXUP]
Can now separately change all aspects of range.
Changes the default range distance to powers of 2.
Also fixes Mode-Only Multiblock Structures showing up in the other mode.
/* Git/Changelog Stuff */
[FIXUP]
sha = "352cd2268722ef9240c41ff93fe89880ae9f28d1"
newTitle = "Effortless Building Enhancements"
newBody = '''
[FEATURE]
[DETAILS]
details = [
"Makes Reach, Placement Reach and Max Blocks Placed Powers of 2",
"Clears Up Reach Upgrade Tooltips and Messages",
]
[DETAILS]
'''
changeFixes = false
[FIXUP]
[EXPAND]
[[messages]]
messageTitle = "Fixes Mode-Only Multiblock Structures Showing in Other Mode (#687)"
messageBody = '''
[BUG]
[IGNORE]
checks = { compareNot = "1.7-alpha-3" } # Only apply this if the commit being compared against is 1.7-alpha-3
[IGNORE]
'''
[[messages]]
messageBody = '''
[IGNORE]
checks = { compareAfter = "1.7-alpha-3" } # Only apply this if the commit being compared against is before 1.7-alpha-3
[IGNORE]
[COMBINE]
commit = "352cd2268722ef9240c41ff93fe89880ae9f28d1"
[COMBINE]
'''
[[messages]]
messageTitle = "Effortless Building Enhancements"
messageBody = '''
[IGNORE]
checks = { compareBefore = "1.7-alpha-3" } # Only apply this if the commit being compared against 1.7-alpha-3 or older
[IGNORE]
[FEATURE]
[DETAILS]
details = [
"Makes Reach, Placement Reach and Max Blocks Placed Powers of 2",
"Clears Up Reach Upgrade Tooltips and Messages",
]
[DETAILS]
'''
[EXPAND]
- When you show uses for lapis, bonemeal, cocoa or ink sacs, you won't see 41 JEI pages of recipes making things blue, unless you craft them into a dye first. Inspired by 1.14 dyes.
This breaks some autocrafts, like concrete and other dyed things, but imo reducing JEI clutter is worth it
- Change elevator and slime block redyeing recipes to use dye oredicts instead of just vanilla items
- Add the `dye` tag to all dyes to fix satchel redyeing
[EXPAND]
[[messages]]
messageTitle = "Dye Fixes and Improvements (#628)"
messageBody = """
[BUG]
[DETAILS]
details = [\"Fixes Elevator & Slime Block Redyeing\", \"Fixes Stachel Redyeing\"]
"""
[[messages]]
messageTitle = "Dye Fixes and Improvements (#628)"
messageBody = """
[FEATURE]
[DETAILS]
details = [\"Cleans Up JEI, Raw Materials are No Longer Dyes\"]
"""
[EXPAND]
Sets Max Render Distance of Storage Drawers (32)
Make Simply Jetpacks and GregTech Jetpacks' HUDs be bottom left
[EXPAND]
[[messages]]
messageTitle = "Change Simply Jetpacks and GregTech Jetpacks' HUD Locations"
messageBody = """
[BUG]
[DETAILS]
details = [\"Moves to the Bottom Left of the Screen.\", \"Fixes Blocking TOP HUD.\"]
[DETAILS]
"""
[[messages]]
messageTitle = "Set Max Render Distance of Storage Drawers Items to 32 Blocks"
messageBody = "[PERFORMANCE]"
[EXPAND]
This reverts it back to the old way of building the JSON files and the lang at build time, instead of storing the built JSON and lang files.
Requested by @NotMyWing
[INTERNAL]
[IGNORE]
checks = { compareNot = "1.7-alpha-1" }
[IGNORE]
This improves the Build CI/CD System and the Release Commit Workflows.
The CD system now builds and zips the pack in parallel, increasing the speed twofold.
The CI system now does not produce double zips, but remains the same speed, thanks to parallel processing.
The CI system now also changes server.properties and random patches config files for the build, and the buildscript has been edited for that.
Since the CI system replaces the nightly task, the nightly workflow has been deleted. The makeArtifactNames task is now used, and has been changed to remove usage of deprecated features.
The release commit workflows now supports updating files without version input, and the version is grabbed from versions.txt.' The code for the release commit workflows has also been greatly cleaned up.
The changes made to the random patches template files have also been updated. The changes made incorrectly to the issue templates in #487 have also been fixed.
The README badges have also been changed. The issue badge has been replaced by a nightly builds badge.
Finally, this changes the forge download process to try again if the response is null, resulting in a decrease, to almost none, test build pack and build pack failures.
[INTERNAL]
[IGNORE]
checks = { compareNot = "1.7-alpha-1" }
[IGNORE]
