Team-EnderIO/EnderIO
1
0
Fork 0
Code Issues 114 Pull requests 13 Projects Releases 79 Packages Wiki Activity Actions

Hide glass and soul recipes from jei #696

Merged
ferriarnus merged 7 commits from jei-hide into dev/1.21 2024-06-30 14:24:30 +00:00
Conversation 4 Commits 7 Files changed 7 +118 -33
ferriarnus commented 2024-06-20 23:02:40 +00:00 (Migrated from github.com)
Copy link

Description

This PR hides all colored glass from jei, and reduces the broken spawner to the first entry (allay).
The reasoning is that these don't add much to the user experience. They will still show up in recipes as ingredients of course.

Fixes crafting issues related to the powered spawner recipe not showing up.

Note:

  • Soul vials are not hidden, as I think these add usability to the player.
  • Removed all broken spawners with entity data.

Idea:

  • Can we make a JEI component that cycles?

closes: #627

TODO

  • Hidden items also don't show up in recipe inputs at times, that's an issue

Breaking Changes

List any breaking changes in this section, such as: changed/removed APIs, changed or removed items/blocks or modifications to recipes and gameplay mechanics.

Checklist

  • My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you).
  • I have made corresponding changes to the documentation.
  • My changes are ready for review from a contributor.
# Description This PR hides all colored glass from jei, and reduces the broken spawner to the first entry (allay). The reasoning is that these don't add much to the user experience. They will still show up in recipes as ingredients of course. Fixes crafting issues related to the powered spawner recipe not showing up. Note: - Soul vials are not hidden, as I think these add usability to the player. - Removed all broken spawners with entity data. Idea: - Can we make a JEI component that cycles? closes: #627 <!-- If you're submitting a Draft PR, consider providing a TODO list using checkboxes --> # TODO - [ ] Hidden items also don't show up in recipe inputs at times, that's an issue # Breaking Changes List any breaking changes in this section, such as: changed/removed APIs, changed or removed items/blocks or modifications to recipes and gameplay mechanics. <!-- For drafts, fill this in as you go; if you are leaving draft, make sure these are all complete. --> # Checklist - [ ] My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you). - [ ] I have made corresponding changes to the documentation. - [ ] My changes are ready for review from a contributor. <!-- Thanks to: https://embeddedartistry.com/blog/2017/08/04/a-github-pull-request-template-for-your-projects/ for the building blocks of this template -->
Rover656 (Migrated from github.com) reviewed 2024-06-29 23:27:42 +00:00
src/machines/java/com/enderio/machines/common/init/MachineBlocks.java
Rover656 (Migrated from github.com) commented 2024-06-29 23:25:02 +00:00
Copy link

What is the purpose of this change?

What is the purpose of this change?
src/main/java/com/enderio/base/common/integrations/jei/EnderIOJEI.java
Rover656 (Migrated from github.com) commented 2024-06-29 23:26:08 +00:00
Copy link

I think we need a different way of hiding these - removing the ingredients is breaking recipes:

  • coloured glass recipes show the clear glass as the result
  • soul binding with broken spawner shows no mob on the input stack
I think we need a different way of hiding these - removing the ingredients is breaking recipes: - coloured glass recipes show the clear glass as the result - soul binding with broken spawner shows no mob on the input stack
src/main/java/com/enderio/base/common/integrations/jei/extension/ShapedEntityStorageCategoryExtension.java
@ -59,0 +67,4 @@
ItemStack itemStack = output.get().getTypedValue().getIngredient();
if (itemStack.is(EIOTags.Items.ENTITY_STORAGE)) {
results = List.of(itemStack);
StoredEntityData storedEntityData = itemStack.getOrDefault(EIODataComponents.STORED_ENTITY, StoredEntityData.EMPTY);
Rover656 (Migrated from github.com) commented 2024-06-29 23:27:33 +00:00
Copy link

I'm struggling to follow the new logic here - could you maybe explain what you've changed and why?

I'm struggling to follow the new logic here - could you maybe explain what you've changed and why?
ferriarnus (Migrated from github.com) reviewed 2024-06-30 10:26:29 +00:00
src/machines/java/com/enderio/machines/common/init/MachineBlocks.java
ferriarnus (Migrated from github.com) commented 2024-06-30 10:26:29 +00:00
Copy link

This is so our tooltip logic shows that this item needs a soul to work in jei. It doesn't show up anywhere else, just jei and creative inv. I would keep it like this since a machine with an empty component can be seen as one that needs a soul, while a machine without the component is one that will work without, but can potentially use one.

This is so our tooltip logic shows that this item needs a soul to work in jei. It doesn't show up anywhere else, just jei and creative inv. I would keep it like this since a machine with an empty component can be seen as one that needs a soul, while a machine without the component is one that will work without, but can potentially use one.
ferriarnus (Migrated from github.com) reviewed 2024-06-30 10:26:57 +00:00
src/main/java/com/enderio/base/common/integrations/jei/EnderIOJEI.java
ferriarnus (Migrated from github.com) commented 2024-06-30 10:26:57 +00:00
Copy link

Verified the first one, the second one I'm unsure what you mean

Verified the first one, the second one I'm unsure what you mean
ferriarnus (Migrated from github.com) reviewed 2024-06-30 10:27:52 +00:00
src/main/java/com/enderio/base/common/integrations/jei/extension/ShapedEntityStorageCategoryExtension.java
@ -59,0 +67,4 @@
ItemStack itemStack = output.get().getTypedValue().getIngredient();
if (itemStack.is(EIOTags.Items.ENTITY_STORAGE)) {
results = List.of(itemStack);
StoredEntityData storedEntityData = itemStack.getOrDefault(EIODataComponents.STORED_ENTITY, StoredEntityData.EMPTY);
ferriarnus (Migrated from github.com) commented 2024-06-30 10:27:52 +00:00
Copy link

This logic is to make it so the input soul and output soul match when searching. Otherwise they keep cycling and are out of sync.

This logic is to make it so the input soul and output soul match when searching. Otherwise they keep cycling and are out of sync.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Area-Assets

   
Area-Backend

Backend work not usually visible to players.

  
Area-Conduits

Everything involving conduits

  
Area-Datapacks

   
Area-Lang

   
Area-Mod Compat

   
Area-Parity

1.12.2 missing features

  
Area-Rendering

Rendering code, might be shaders specific or general.

  
Good first issue

   
MC-1.19.2

   
MC-1.20.1

   
MC-1.20.4

   
MC-1.20.6

   
MC-1.21

   
MC-1.21.1

   
Modtoberfest

   
P-0-High

High priority, crash/breaking.

  
P-1-Medium

Medium priority. Potentially deleting items or breaking functionality.

  
P-2-Low

Low priority. Not hurting anyone, just annoying.

  
Status-Awaiting Response

Waiting for OP to respond

  
Status-Behind-Flag

This change is available but is placed behind a feature flag.

  
Status-Blocked

Blocked by a specific issue or protocol.

  
Status-Cannot Reproduce

   
Status-Duplicate

This issue or pull request already exists

  
Status-Help Wanted

We need some help to try and track this thing down..

  
Status-Incomplete Report

   
Status-Invalid

This doesn't seem right

  
Status-Needs LTS Backport

Fixed in latest but requires LTS backport.

  
Status-Needs Updating

Needs updating to a newer Minecraft version.

  
Status-Stale

This may not be updated by the OP any further.

  
Status-To Implement

   
Status-Triage

A Triage Member should take a look at this

  
Status-Wontfix

This will not be worked on

  
Status-Wontmerge

This PR won't be merged, but is left now for reference of ongoing or future works.

  
Type-Backport

   
Type-Bug

There is a problem.

  
Type-Documentation

Improvements or additions to documentation

  
Type-Enhancement

New feature or enhancement to existing feature.

  
Type-Question

Further information is requested

  
Type-RFC

Request for comments.

  
Type-Suggestion
No labels
Area-Assets
Area-Backend
Area-Conduits
Area-Datapacks
Area-Lang
Area-Mod Compat
Area-Parity
Area-Rendering
Good first issue
MC-1.19.2
MC-1.20.1
MC-1.20.4
MC-1.20.6
MC-1.21
MC-1.21.1
Modtoberfest
P-0-High
P-1-Medium
P-2-Low
Status-Awaiting Response
Status-Behind-Flag
Status-Blocked
Status-Cannot Reproduce
Status-Duplicate
Status-Help Wanted
Status-Incomplete Report
Status-Invalid
Status-Needs LTS Backport
Status-Needs Updating
Status-Stale
Status-To Implement
Status-Triage
Status-Wontfix
Status-Wontmerge
Type-Backport
Type-Bug
Type-Documentation
Type-Enhancement
Type-Question
Type-RFC
Type-Suggestion
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Team-EnderIO/EnderIO#696
No description provided.
Delete branch "jei-hide"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?