search

Cubed-Development / Modern-Warfare-Cubed

Welcome to the official GitHub Repository for Modern Warfare Cubed!
Apache License 2.0
91 stars 59 forks source link

hotfix on groovyscript/metadata/oredict #371

Closed yor42 closed 5 months ago

yor42 commented 5 months ago

📝 Description

This PR should fix Groovyscript-powered custom recipe system not accounting for oredict/metadate. this also fixes incorrect item name display when item has metadata.

🎯 Goals

❌ Non Goals

🚦 Testing

mods.mwc.craftingstation.removeAll()

mods.mwc.craftingstation.recipeBuilder().output(item('minecraft:iron_ingot')).input(item('immersiveengineering:metal', 2)*4).setYield(0.5).input(ore('ingotCopper')*4).register()

use this example script to test all 3 of changes.

⏮️ Backwards Compatibility

has chance of breaking existing Json recipe, but groovy is much more human-readable and completely replaces, or even supersedes json, impact would be negligible.

📚 Related Issues & Documents

N/A

🖼️ Screenshots/Recordings

image

image

image

📖 Added to documentation?

😄 [optional] What gif best describes this PR or how it makes you feel?

image

Summary by CodeRabbit

coderabbitai[bot] commented 5 months ago

[!WARNING]

Rate Limit Exceeded

@yor42 has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 20 minutes and 13 seconds before requesting another review.

How to resolve this issue? After the wait time has elapsed, a review can be triggered using the `@coderabbitai review` command as a PR comment. Alternatively, push new commits to this PR. We recommend that you space out your commits to avoid hitting the rate limit.
How do rate limits work? CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our [FAQ](https://coderabbit.ai/docs/faq) for further information.
Commits Files that changed from the base of the PR and between ad1b34169e68b9522b505c2e9c51222ca94b4488 and 035ad6239c0a9c4cda42760d76a480bce4580178.

Walkthrough

The updates across various files primarily focus on enhancing the crafting system by introducing a shift from using Item to Ingredient in handling crafting operations. This change facilitates a more flexible crafting process. Additionally, there's an emphasis on improving recipe management with functions to clear recipe registries and update ingredient handling. The changes also include fixes for gameplay issues and support for Oredict in crafting, enhancing both the player experience and the mod's functionality.

Changes

File(s) Summary
.../groovyscript/script/CraftingStation.java, .../crafting/CraftingRegistry.java Updated recipe registry management with new methods and refactored ingredient handling.
.../handlers/WorkbenchServerMessageHandler.java, .../crafting/CraftingEntry.java, .../crafting/base/GUIContainerStation.java, .../crafting/base/TileEntityStation.java, .../crafting/ammopress/TileEntityAmmoPress.java Shifted from Item to Ingredient for crafting operations, enhancing flexibility and ingredient management.
.../command/MainCommand.java Improved item name retrieval and display formatting in recipe output.
.../crafting/CraftingFileManager.java Simplified item name retrieval for JSON object construction.
.../crafting/base/GUIContainerStation.java Enhanced GUI rendering and tooltip rendering to better handle items and ingredients.
Changelog.md Documented fixes for gameplay issues and added Oredict support for the crafting system.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share - [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai) - [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai) - [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai) - [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code)
Tips ### Chat There are 3 ways to chat with CodeRabbit: - Review comments: Directly reply to a review comment made by CodeRabbit. Example: - `I pushed a fix in commit .` - `Generate unit-tests for this file.` - `Open a follow-up GitHub issue for this discussion.` - Files and specific lines of code (under the "Files changed" tab): Tag `@coderabbitai` in a new review comment at the desired location with your query. Examples: - `@coderabbitai generate unit tests for this file.` - `@coderabbitai modularize this function.` - PR comments: Tag `@coderabbitai` in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples: - `@coderabbitai generate interesting stats about this repository and render them as a table.` - `@coderabbitai show all the console.log statements in this repository.` - `@coderabbitai read src/utils.ts and generate unit tests.` - `@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.` Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. ### CodeRabbit Commands (invoked as PR comments) - `@coderabbitai pause` to pause the reviews on a PR. - `@coderabbitai resume` to resume the paused reviews. - `@coderabbitai review` to trigger a review. This is useful when automatic reviews are disabled for the repository. - `@coderabbitai resolve` resolve all the CodeRabbit review comments. - `@coderabbitai help` to get help. Additionally, you can add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed. ### CodeRabbit Configration File (`.coderabbit.yaml`) - You can programmatically configure CodeRabbit by adding a `.coderabbit.yaml` file to the root of your repository. - The JSON schema for the configuration file is available [here](https://coderabbit.ai/integrations/coderabbit-overrides.v2.json). - If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: `# yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json` ### CodeRabbit Discord Community Join our [Discord Community](https://discord.com/invite/GsXnASn26c) to get help, request features, and share feedback.
Desoroxxx commented 5 months ago

Haven't taken a complete look yet but does this retain ore dictionary compatibility for when it is implemented in the crafting stations logic?

yor42 commented 5 months ago

if you are talking about json recipe, it works with existing Json recipes. image