cleanup: rei #159
Merged
cleanup: rei #159
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
moves some common things out of the client package also fixes a bug where circuit fabricators were treated like a 3x3 grid internally uses default transfer handler that actually checks for materials
JustPyrrha
suggested changes
Sep 26, 2021
src/main/java/dev/galacticraft/mod/compat/rei/client/category/DefaultFabricationCategory.java
Outdated
Show resolved
Hide resolved
src/main/java/dev/galacticraft/mod/compat/rei/client/category/DefaultFabricationCategory.java
Outdated
Show resolved
Hide resolved
src/main/java/dev/galacticraft/mod/compat/rei/client/category/DefaultFabricationCategory.java
Outdated
Show resolved
Hide resolved
src/main/java/dev/galacticraft/mod/compat/rei/client/category/DefaultFabricationCategory.java
Outdated
Show resolved
Hide resolved
src/main/java/dev/galacticraft/mod/compat/rei/client/category/DefaultFabricationCategory.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Pyrrha <me@joezwet.me>
JustPyrrha
approved these changes
Sep 26, 2021
marcus8448
added a commit
that referenced
this pull request
Oct 19, 2021
* build: enable publishing to snapshot repo and publish snapshots from main pushes (#155) * feat: prevent players from extinguishing themselves with flammable fluids * chore: defer registration of objects to mod init (#156) prevents some annoying classloading order bug * fix: don't bother setting the executable bit in actions (#157) its already set in the repo * move damage source for oil boom to the proper location * fix: register chunk generators (#160) * cleanup: rei (#159) * cleanup: rei moves some common things out of the client package also fixes a bug where circuit fabricators were treated like a 3x3 grid internally uses default transfer handler that actually checks for materials * chore: transfer handlers for the compressor and circuit fabricator * chore: apply suggestions from code review Co-authored-by: Pyrrha <me@joezwet.me> * Feat: cave veins render correctly now (#163) * fix: use correct texture for arc furnace face (#164) * Slight change to make a difference * Make texture work * Apply 2/3 suggestions from code review Co-authored-by: Pyrrha <me@joezwet.me> * making changes for #165 * undo indentation changes no more indentation! no more spaces! * Feat: Kill burning entities when attempting to extinguish them with oil or fuel (#165) * feat: prevent players from extinguishing themselves with flammable fluids * move damage source for oil boom to the proper location * Apply 2/3 suggestions from code review Co-authored-by: Pyrrha <me@joezwet.me> * making changes for #165 * undo indentation changes no more indentation! no more spaces! Co-authored-by: Pyrrha <me@joezwet.me> * finish merging main * rename launch_pad to rocket_launch_pad to both fix models and make things more 'glancable' * fix: thermal leggings pattern + recipes (#166) * Crafting for Nuggets * Fixed wrong pattern * Advanced panel recipe * Dark Decoration Craft Using Desh for the craft * Applying Changes 1 * Applying Changes 2 Changed Recipe for it. With Craftablescience * marcus: defer some registration * Update src/main/java/dev/galacticraft/mod/block/entity/GalacticraftBlockEntityType.java Co-authored-by: marcus8448 <28928887+marcus8448@users.noreply.github.com> Co-authored-by: Pyrrha <me@joezwet.me> Co-authored-by: marcus8448 <28928887+marcus8448@users.noreply.github.com> Co-authored-by: mMONTAGEe <davidmamik10@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes a bug where the circuit fabricator was treated like a 3x3 grid
Fixes a bug where the electric compressor and compressor slot indexes did not match up, causing transfer handler problems
Fixes transfer handlers
Cleans up some generics
Moves some common things out of the client package
Actually serializes recipes for REI
Fixes LBA inventory interaction with REI
Fixes a bug where you would only need the recipe-defined item to move items into the circuit fabricator.