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.

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

full RA1 removal #2713

Merged
merged 111 commits into from
Jul 21, 2024
Merged

full RA1 removal #2713

merged 111 commits into from
Jul 21, 2024

Conversation

boubou19
Copy link
Member

@boubou19 boubou19 commented Jul 8, 2024

This PR aims to finally say goodbye to RA1 🥳 However, we need to remove any external RA1 call before we merge this PR.

This is ready to be merged, as well as the following PRs:
GTNewHorizons/Botanic-horizons#29
https://github.com/GTNewHorizons/Galaxy-Space-GTNH/pull/111
GTNewHorizons/HydroEnergy#26
GTNewHorizons/Computronics#25
GTNewHorizons/StorageDrawers#31
GTNewHorizons/Minetweaker-Gregtech-5-Addon#63
GTNewHorizons/NewHorizonsCoreMod#895 (this one needs this current PR to be merged first)

Copy link
Contributor

Warning: 2 uncommitted changes
#2742

@Dream-Master Dream-Master merged commit a8b46c1 into master Jul 21, 2024
2 checks passed
@Dream-Master Dream-Master deleted the remove_RA1_calls branch July 21, 2024 14:36
boubou19 added a commit that referenced this pull request Jul 22, 2024
* Add some sense to circuit tier enums

* Change CompAss circuit tier names to match the new oreDict

* Remove blinkCell override from YOTTAHatch.java (#2737)

* Remove blinkCell override from YOTTAHatch.java

* update

---------

Co-authored-by: Dream Master <[email protected]>

* Fix CAL weirdness (#2740)

* do not save length variable in item nbt

* remove implicit recipe lock from cal

* Beamline (#2619)

* Beamline

* Remove hardcoded dreamcraft items and spotless

* Remove logs and fix auto structure check

* Remove logs and fix auto structure check

* Fix typo and synchrotron high MF scaling

* sa

(cherry picked from commit b2796d9)

* Add multi textures, add structuredesc info, remove test TC input, add synchrotron/input/output recipes

* Spotless

* Prevent mob spawning on casings

* Fix LINAC glass requirement, make synchrotron structure less ugly, add last recipe

* Spotless

* Add placeholder particle textures

* Add some mask recipes I missed

* Spotless apply for branch lanth-beamline for #2619 (#2630)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

* Add further error messages to LINAC and Synchrotron, fix MM & LaB6 recipes

* Spotless apply for branch lanth-beamline for #2619 (#2648)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

* Minor changes, add more multi error messages & 9x U-238 SC recipe

* Spotless apply for branch lanth-beamline for #2619 (#2651)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

* Missed a change

* Spotless apply for branch lanth-beamline for #2619 (#2652)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

* Update beamline desc

* Remove comments, move coolant fluid check to Util class

* Spotless

* Spotless apply for branch lanth-beamline for #2619 (#2666)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

* Fix Mu-Metal recipe output amount, tool stats for MM & LaB6

* Spotless

* Fix multi hatch textures

* Spotless apply for branch lanth-beamline for #2619 (#2676)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

* Increase Synchrotron output rate eut & antenna tier scaling, in general improve output rates, buff all TC recipes' processing time

* Fix misleading BL tooltip

* update

* remove import

* Buff higher-tier wafer recipes for each IC, from a 4x to 3x increase of recipe amount per two wafer tier increases

* Remove RA1 calls in beamline (#2716)

* Spotless apply for branch lanth-beamline for #2619 (#2717)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

* fix

* Spotless apply for branch lanth-beamline for #2619 (#2733)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

---------

Co-authored-by: unknown <[email protected]>
Co-authored-by: Elisis <[email protected]>
Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* full RA1 removal (#2713)

* remove addExtractionRecipes

* remove addPulverisationRecipe

* remove thermalcraft fake compat

* deprecate addAlloySmelterRecipe

* remove fake compat

* remove RA1 fusion recipe usage

* remove RA1 centrifuge recipe usage

* remove RA1 compressor recipe usage

* remove RA1 electrolyzer recipe usage

* remove RA1 chemical reactor recipe usage

* deprecate GT based recipes adders

* obliterate RA1 entries in interfaces (1/?)

* remove RA1 blast furnace recipe usage

* remove RA1 canner recipe usage

* remove RA1 alloy smelter recipe usage

* remove RA1 circuit assembler recipe usage

* obliterate RA1 entries in interfaces (2/?)

* remove RA1 bender recipe usage

* clean class

* remove RA1 cutter recipe usage

* remove RA1 fuels recipe usage

* remove RA1 implosion compressor recipe usage

* remove RA1 thermal centrifuge recipe usage

* clean GT_ModHandler

* obliterate RA1 entries in interfaces (3/?)

* remove RA1 packager recipe usage

* remove RA1 lathe recipe usage

* remove RA1 vacuum freezer recipe usage

* remove RA1 fluid heater recipe usage

* remove RA1 nano forge recipe usage

* remove RA1 autoclave recipe usage

* obliterate RA1 entries in interfaces (4/?)

* remove RA1 cracker recipe usage

* remove RA1 pyrolyse recipe usage

* remove RA1 pulveriser recipe usage

* remove RA1 fluid extractor recipe usage

* remove RA1 assembly line recipe usage

* remove RA1 alloy blast smelter recipe usage

* remove RA1 coke oven recipe usage

* obliterate RA1 entries in interfaces (5/?)

* remove RA1 dehydrator recipe usage

* remove deprecated usages

* obliterate RA1 entries in interfaces (6/?)

* remove RA1 assembler recipe usage

* obliterate RA1 entries in interfaces (7/?)

* remove RA1 mixer recipe usage

* remove RA1 forge hammer recipe usage

* remove RA1 wiremill recipe usage

* remove RA1 extruder recipe usage

* remove RA1 fluid soldifier recipe usage

* remove RA1 chemical bath recipe usage

* remove RA1 electromagnetic separator recipe usage

* remove RA1 sifter recipe usage

* remove distillery recipe usage

* remove distillation tower usage

* remove extractor usage

* obliterate RA1 entries in interfaces (8/?)

* remove QFT usage

* cleaning

* remove packager usage

* remove fluid heater usage

* remove vacuum freezer usage

* remove distillery usage

* fix QFT chances arrays

* remove fission fuel usage

* remove cyclotron usage

* remove molecular transformer usage

* remove chemplant usage

* remove coldtrap and reactor processing unit usage

* obliterate RA1 entries in interfaces (9/?)

* spotlessApply

* fixes

* remove addRecipe calls

* migrate forge of gods recipes

* yeet special value calls (1 / 2)

* yeet special value calls (2 / 2)

* migrate GG Fuel recipes

* migrate all GG maps except EHE

* CORE.RA is no more

* clear GT_RecipeAdder

* remove dead code

* clean RecipeMap a bit

* spotless apply

* fix output chances

* Update RecipeLoader.java

* fix

* remove buggy recipe

* migrate to enum for IDs

* sort enum

* move to enum

* fix recipes

* spotless apply

* fix recipe

* remove useless recipes

* spotless apply

* remove unused blocks

* fix GT++ recipe

* Update RecipeLoader.java

* Update RecipeLoader.java

* fix imports

* Spotless apply for branch remove_RA1_calls for #2713 (#2742)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

* fix recipe

(cherry picked from commit a25d3b6)

* fix

(cherry picked from commit d9af011)

* temporarily remove panic mode

* fix recipes

* Revert "temporarily remove panic mode"

This reverts commit 483cfcf.

* fix recipes

---------

Co-authored-by: Dream Master <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* update

* Add some sense to circuit tier enums

* Change CompAss circuit tier names to match the new oreDict

* Fix some UMV and UXV circuit oreDicts

* Spotless

---------

Co-authored-by: tth05 <[email protected]>
Co-authored-by: Dream Master <[email protected]>
Co-authored-by: NotAPenguin <[email protected]>
Co-authored-by: Raven Szewczyk <[email protected]>
Co-authored-by: unknown <[email protected]>
Co-authored-by: Elisis <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: boubou19 <[email protected]>
@chochem chochem mentioned this pull request Aug 5, 2024
@chochem chochem mentioned this pull request Oct 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants