Change fuel to accept any "torch" #32
Merged
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
This was referenced Oct 7, 2019
skaldarnar
requested changes
Oct 18, 2019
| @@ -55,7 +55,7 @@ public void update(float delta) { | |||
| ItemComponent itemComponent = fuelSlot.getComponent(ItemComponent.class); | |||
| BlockItemComponent biComponent = fuelSlot.getComponent(BlockItemComponent.class); | |||
| //add 5 energy units for 1 torch | |||
| if (biComponent.blockFamily.getURI().toString().equalsIgnoreCase("core:torch")) { | |||
| if (biComponent.blockFamily.getURI().toString().toLowerCase().endsWith("torch")) { | |||
There was a problem hiding this comment.
Could you please add a helper method isTorch(BlockItemComponent blockItem) containing this check. I hope that will make it easier to find the check later on in case we find a better way to check for torches...
Suggested change
| if (biComponent.blockFamily.getURI().toString().toLowerCase().endsWith("torch")) { | |
| if (isTorch(biComponent)) { |
There was a problem hiding this comment.
private boolean isTorch(BlockItemComponent blockItem) {
return blockItem.blockFamily.getURI().toString().toLowerCase().endsWith("torch");
}
skaldarnar
approved these changes
Oct 18, 2019
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.
In addition to accepting other modules' torches, this allows compatibility with CoreBlocks for MovingBlocks/Terasology#3737