Adds Groovyscript support for crafting #325

yor42 · 2023-12-19T03:27:47Z

📝 Description

This PR Adds Groovyscript support for crafting such as ammo press and workbench.

🎯 Goals

add Groovyscript support for crafting such as ammo press and workbench for easier modpack development.

❌ Non Goals

Completely replacing existing json recipe is not a goal for compatibility's sake

🚦 Testing

use following example script on Postinit Script of Groovyscript (E.G: run/groovy/postinit/main.groovy)

mods.mwc.craftingstation.removeAllinGroup("GUN")
mods.mwc.craftingstation.recipeBuilder().output(item('minecraft:clay')).addEntry(item('minecraft:nether_star')*4).register()
mods.mwc.craftingstation.recipeBuilder().output(item('minecraft:iron_ingot')).addOredict("oreIron", 4, 0.5).addOredict("oreCoal", 4).register()

this script should do 3 things:

clear ALL the recipes in gun tab of workbench
add 2 example script. 1 recipe that turns 4 nether star into 1 clay block with 100% yield, and 1 recipe that turns 4 Iron Ore (50% Yield) and 1 Coal Ore(100% Yield) (both are ore dictionary entry) into 1 Iron ingot.

Test video to prove that this PR doesn't break anything even if Groovyscript isn't present in runtime:

2023-12-19.20-49-10_1.mp4

⏮️ Backwards Compatibility

Exisiting JSON Recipe system is not replaced. since it should not cause issue with any existing modpack that utilizes the JSON for their costom recipes.

📚 Related Issues & Documents

N/A

🖼️ Screenshots/Recordings

📖 Added to documentation?

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

N/A

Summary by CodeRabbit

New Features
- Introduced a new crafting system with enhanced recipe management and crafting stations.
- Added compatibility with Groovy scripting for mod customization.
Enhancements
- Updated user interfaces for crafting stations, improving user experience.
- Streamlined crafting processes, allowing for more intuitive item crafting.
Bug Fixes
- Resolved issues with item crafting logic that affected the correct item output.
- Fixed tooltip rendering issues in crafting interfaces.
Refactor
- Standardized item return types across various methods for consistency.
- Optimized conditional checks and control flow for better performance.
Documentation
- Updated in-game tooltips and help sections to reflect new crafting features.
Chores
- Cleaned up unused import statements and redundant code.

Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

….java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

…bit lighter

…tion.java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

….java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

…tion.java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

…tion.java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

src/main/java/com/paneedah/mwc/MWC.java

codescene-delta-analysis

✅ Code Health Quality Gates: OK

Declining Code Health: 1 findings(s) 🚩
Improving Code Health: 8 findings(s) ✅
Affected Hotspots: 0 files(s) 🔥

Recommended Review Level: Detailed -- Increased risk for defects: The risk is higher as much of the code in this repo (99% of all commits) is written by other authors.
View detailed results in CodeScene

🚩 Declining Code Health (highest to lowest):

Primitive Obsession CraftingEntry.java

✅ Improving Code Health:

Complex Method GUIContainerStation.java: drawGuiContainerBackgroundLayer
Overall Code Complexity MainCommand.java
Overall Code Complexity GUIContainerStation.java
Deep, Nested Complexity TileEntityStation.java: update
Deep, Nested Complexity GUIContainerStation.java: drawGuiContainerBackgroundLayer
Complex Method GUIContainerStation.java: drawTooltips
Complex Method TileEntityStation.java: update
Bumpy Road Ahead MainCommand.java: showRecipe

codescene-delta-analysis

✅ Code Health Quality Gates: OK

Declining Code Health: 1 findings(s) 🚩
Improving Code Health: 8 findings(s) ✅
Affected Hotspots: 0 files(s) 🔥

Recommended Review Level: Detailed -- Increased risk for defects: The risk is higher as much of the code in this repo (99% of all commits) is written by other authors.
View detailed results in CodeScene

🚩 Declining Code Health (highest to lowest):

Primitive Obsession CraftingEntry.java

✅ Improving Code Health:

Complex Method GUIContainerStation.java: drawGuiContainerBackgroundLayer
Overall Code Complexity MainCommand.java
Overall Code Complexity GUIContainerStation.java
Deep, Nested Complexity TileEntityStation.java: update
Deep, Nested Complexity GUIContainerStation.java: drawGuiContainerBackgroundLayer
Complex Method GUIContainerStation.java: drawTooltips
Complex Method TileEntityStation.java: update
Bumpy Road Ahead MainCommand.java: showRecipe

codescene-delta-analysis

✅ Code Health Quality Gates: OK

Declining Code Health: 1 findings(s) 🚩
Improving Code Health: 8 findings(s) ✅
Affected Hotspots: 0 files(s) 🔥

Recommended Review Level: Detailed -- Increased risk for defects: The risk is higher as much of the code in this repo (99% of all commits) is written by other authors.
View detailed results in CodeScene

🚩 Declining Code Health (highest to lowest):

Primitive Obsession CraftingEntry.java

✅ Improving Code Health:

Complex Method GUIContainerStation.java: drawGuiContainerBackgroundLayer
Overall Code Complexity MainCommand.java
Overall Code Complexity GUIContainerStation.java
Deep, Nested Complexity TileEntityStation.java: update
Deep, Nested Complexity GUIContainerStation.java: drawGuiContainerBackgroundLayer
Complex Method GUIContainerStation.java: drawTooltips
Complex Method TileEntityStation.java: update
Bumpy Road Ahead MainCommand.java: showRecipe

codescene-delta-analysis

✅ Code Health Quality Gates: OK

Declining Code Health: 1 findings(s) 🚩
Improving Code Health: 8 findings(s) ✅
Affected Hotspots: 0 files(s) 🔥

Recommended Review Level: Detailed -- Increased risk for defects: The risk is higher as much of the code in this repo (99% of all commits) is written by other authors.
View detailed results in CodeScene

🚩 Declining Code Health (highest to lowest):

Primitive Obsession CraftingEntry.java

✅ Improving Code Health:

Complex Method GUIContainerStation.java: drawGuiContainerBackgroundLayer
Overall Code Complexity MainCommand.java
Overall Code Complexity GUIContainerStation.java
Deep, Nested Complexity TileEntityStation.java: update
Deep, Nested Complexity GUIContainerStation.java: drawGuiContainerBackgroundLayer
Complex Method GUIContainerStation.java: drawTooltips
Complex Method TileEntityStation.java: update
Bumpy Road Ahead MainCommand.java: showRecipe

Desoroxxx · 2023-12-19T14:13:30Z

@coderabbitai review

coderabbitai

Review Status

Actionable comments generated: 0

Configuration used: CodeRabbit UI

Commits

Files that changed from the base of the PR and between 7035ca7 and c54c6d0.

Files selected for processing (24)

build.gradle (1 hunks)
src/main/java/com/paneedah/mwc/MWC.java (2 hunks)
src/main/java/com/paneedah/mwc/groovyscript/MWCGroovyPlugin.java (1 hunks)
src/main/java/com/paneedah/mwc/groovyscript/recipes/GSCrafting.java (1 hunks)
src/main/java/com/paneedah/mwc/groovyscript/script/CraftingStation.java (1 hunks)
src/main/java/com/paneedah/mwc/init/MWCRecipes.java (2 hunks)
src/main/java/com/paneedah/mwc/items/equipment/carryable/ItemCarryable.java (1 hunks)
src/main/java/com/paneedah/mwc/network/handlers/WorkbenchServerMessageHandler.java (1 hunks)
src/main/java/com/paneedah/weaponlib/CustomArmor.java (1 hunks)
src/main/java/com/paneedah/weaponlib/HighIQSpawnEgg.java (2 hunks)
src/main/java/com/paneedah/weaponlib/ItemAttachment.java (1 hunks)
src/main/java/com/paneedah/weaponlib/ItemVest.java (1 hunks)
src/main/java/com/paneedah/weaponlib/Weapon.java (1 hunks)
src/main/java/com/paneedah/weaponlib/command/MainCommand.java (1 hunks)
src/main/java/com/paneedah/weaponlib/config/BalancePackManager.java (1 hunks)
src/main/java/com/paneedah/weaponlib/crafting/CraftingEntry.java (1 hunks)
src/main/java/com/paneedah/weaponlib/crafting/CraftingRegistry.java (5 hunks)
src/main/java/com/paneedah/weaponlib/crafting/IModernCrafting.java (2 hunks)
src/main/java/com/paneedah/weaponlib/crafting/ammopress/GUIContainerAmmoPress.java (2 hunks)
src/main/java/com/paneedah/weaponlib/crafting/base/GUIContainerStation.java (5 hunks)
src/main/java/com/paneedah/weaponlib/crafting/base/TileEntityStation.java (1 hunks)
src/main/java/com/paneedah/weaponlib/crafting/workbench/GUIContainerWorkbench.java (1 hunks)
src/main/java/com/paneedah/weaponlib/crafting/workbench/TileEntityWorkbench.java (1 hunks)
src/main/java/com/paneedah/weaponlib/grenade/ItemGrenade.java (1 hunks)

Files skipped from review due to trivial changes (1)

src/main/java/com/paneedah/weaponlib/config/BalancePackManager.java

Additional comments: 3

src/main/java/com/paneedah/weaponlib/crafting/workbench/GUIContainerWorkbench.java (1)

200-204: The change in method calls from getSelectedCraftingPiece().getItem() to getSelectedCraftingPiece().getItem().getItem() is consistent with the PR's objective to modify the getItem method's return type from Item to ItemStack. However, ensure that the getSelectedCraftingPiece().getItem() method itself correctly returns an ItemStack and not another wrapper that would require further unwrapping.

src/main/java/com/paneedah/weaponlib/crafting/workbench/TileEntityWorkbench.java (1)

130-132: The change to pass this.craftingTarget.getItem() directly to addStackToInventoryRange suggests that the method signature for addStackToInventoryRange has been updated to accept an Item instead of an ItemStack. Verify that the addStackToInventoryRange method has been appropriately modified to handle an Item as its parameter and that this change is consistent across all usages of the method.

src/main/java/com/paneedah/weaponlib/grenade/ItemGrenade.java (1)

50-51: The change in the getItem method's return type from Item to ItemStack is consistent with the PR's objective. Ensure that all usages of the getItem method within the ItemGrenade class and any other classes that interact with ItemGrenade objects are updated to handle an ItemStack return type.

Desoroxxx

Missed some important things in previous reviews but apart from that looking ready to merge

src/main/java/com/paneedah/mwc/groovyscript/recipes/GSCrafting.java

src/main/java/com/paneedah/weaponlib/crafting/IModernCrafting.java

src/main/java/com/paneedah/weaponlib/grenade/ItemGrenade.java

src/main/java/com/paneedah/weaponlib/crafting/IModernCrafting.java

src/main/java/com/paneedah/weaponlib/Weapon.java

src/main/java/com/paneedah/weaponlib/crafting/IModernCrafting.java

src/main/java/com/paneedah/weaponlib/config/BalancePackManager.java

src/main/java/com/paneedah/weaponlib/HighIQSpawnEgg.java

src/main/java/com/paneedah/weaponlib/CustomArmor.java

src/main/java/com/paneedah/mwc/items/equipment/carryable/ItemCarryable.java

codescene-delta-analysis

✅ Code Health Quality Gates: OK

Declining Code Health: 1 findings(s) 🚩
Improving Code Health: 8 findings(s) ✅
Affected Hotspots: 0 files(s) 🔥

Recommended Review Level: Detailed -- Increased risk for defects: The risk is higher as much of the code in this repo (99% of all commits) is written by other authors.
View detailed results in CodeScene

🚩 Declining Code Health (highest to lowest):

Primitive Obsession CraftingEntry.java

✅ Improving Code Health:

Complex Method GUIContainerStation.java: drawGuiContainerBackgroundLayer
Overall Code Complexity MainCommand.java
Overall Code Complexity GUIContainerStation.java
Deep, Nested Complexity TileEntityStation.java: update
Deep, Nested Complexity GUIContainerStation.java: drawGuiContainerBackgroundLayer
Complex Method GUIContainerStation.java: drawTooltips
Complex Method TileEntityStation.java: update
Bumpy Road Ahead MainCommand.java: showRecipe

src/main/java/com/paneedah/weaponlib/crafting/base/GUIContainerStation.java

src/main/java/com/paneedah/weaponlib/crafting/base/TileEntityStation.java

codescene-delta-analysis

✅ Code Health Quality Gates: OK

Declining Code Health: 1 findings(s) 🚩
Improving Code Health: 8 findings(s) ✅
Affected Hotspots: 0 files(s) 🔥

Recommended Review Level: Detailed -- Increased risk for defects: The risk is higher as much of the code in this repo (99% of all commits) is written by other authors.
View detailed results in CodeScene

🚩 Declining Code Health (highest to lowest):

Primitive Obsession CraftingEntry.java

✅ Improving Code Health:

Complex Method GUIContainerStation.java: drawGuiContainerBackgroundLayer
Overall Code Complexity MainCommand.java
Overall Code Complexity GUIContainerStation.java
Deep, Nested Complexity TileEntityStation.java: update
Deep, Nested Complexity GUIContainerStation.java: drawGuiContainerBackgroundLayer
Complex Method GUIContainerStation.java: drawTooltips
Complex Method TileEntityStation.java: update
Bumpy Road Ahead MainCommand.java: showRecipe

codescene-delta-analysis

✅ Code Health Quality Gates: OK

Declining Code Health: 1 findings(s) 🚩
Improving Code Health: 8 findings(s) ✅
Affected Hotspots: 0 files(s) 🔥

Recommended Review Level: Detailed -- Increased risk for defects: The risk is higher as much of the code in this repo (99% of all commits) is written by other authors.
View detailed results in CodeScene

🚩 Declining Code Health (highest to lowest):

Primitive Obsession CraftingEntry.java

✅ Improving Code Health:

Complex Method GUIContainerStation.java: drawGuiContainerBackgroundLayer
Overall Code Complexity MainCommand.java
Overall Code Complexity GUIContainerStation.java
Deep, Nested Complexity TileEntityStation.java: update
Deep, Nested Complexity GUIContainerStation.java: drawGuiContainerBackgroundLayer
Complex Method GUIContainerStation.java: drawTooltips
Complex Method TileEntityStation.java: update
Bumpy Road Ahead MainCommand.java: showRecipe

yor42 and others added 30 commits November 15, 2023 23:47

add GS support for Crafting

8dc99ae

add documentations

ad607cd

Update build.gradle

346d8ef

Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

Update src/main/java/com/paneedah/mwc/groovyscript/MWC.java

051fdb2

Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

Update src/main/java/com/paneedah/mwc/groovyscript/recipes/GSCrafting…

b656827

….java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

commit changes

1f43aa2

Merge remote-tracking branch 'origin/groovyscript' into groovyscript

a0aa812

clean up jank and make groovyscript compile only so runtime gets tad …

58611cb

…bit lighter

messed up name here

4856847

Update src/main/java/com/paneedah/mwc/groovyscript/script/CraftingSta…

ad16559

…tion.java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

Update src/main/java/com/paneedah/weaponlib/crafting/CraftingEntry.java

9b037e0

Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

Update src/main/java/com/paneedah/weaponlib/crafting/CraftingRegistry…

e5bdf99

….java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

fixin some more

f890e4d

make javadoc a bit more detailed.

e4e5fe7

more cleanup

f4def57

move Recipe Registry to its own event as Brachy suggested

c4fd040

make IModernCrafting to output ItemStack

738fd6e

string formatting

522e2bd

Update src/main/java/com/paneedah/mwc/groovyscript/script/CraftingSta…

c4cba87

…tion.java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

Update src/main/java/com/paneedah/mwc/MWC.java

83c5978

Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

Update src/main/java/com/paneedah/mwc/groovyscript/script/CraftingSta…

38ab505

…tion.java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

Update src/main/java/com/paneedah/mwc/groovyscript/script/CraftingSta…

893af30

…tion.java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

Update src/main/java/com/paneedah/mwc/groovyscript/script/CraftingSta…

454ea52

…tion.java Co-authored-by: Desoroxxx <desoroxxx@gmail.com>

remove space

8207056

Merge remote-tracking branch 'origin/groovyscript' into groovyscript

41015ef

rename MWCContainer

04909e2

remove dangling javadoc

ec31ae4

fix edgecase and empty validate

82bf49b

fix dumb mistake

1e9d8f3

support GS 0.7.0

39904b9

Desoroxxx added the Configuration label Dec 19, 2023

Desoroxxx added this to the 0.1 milestone Dec 19, 2023

Desoroxxx requested changes Dec 19, 2023

View reviewed changes

src/main/java/com/paneedah/mwc/MWC.java Outdated Show resolved Hide resolved

Update src/main/java/com/paneedah/mwc/MWC.java

99db0e8

codescene-delta-analysis bot approved these changes Dec 19, 2023

View reviewed changes

fix 1 java issue and make groovyscript compileonly

46107bb

codescene-delta-analysis bot approved these changes Dec 19, 2023

View reviewed changes

add a space back in

4527d90

codescene-delta-analysis bot approved these changes Dec 19, 2023

View reviewed changes

yor42 marked this pull request as ready for review December 19, 2023 12:04

yor42 requested a review from Desoroxxx December 19, 2023 12:05

remove spongeforge maven

c54c6d0

Desoroxxx marked this pull request as draft December 19, 2023 14:09

Desoroxxx previously approved these changes Dec 19, 2023

View reviewed changes

Desoroxxx dismissed their stale review via c54c6d0 December 19, 2023 14:11

codescene-delta-analysis bot approved these changes Dec 19, 2023

View reviewed changes

Desoroxxx marked this pull request as ready for review December 19, 2023 14:12

Desoroxxx approved these changes Dec 19, 2023

View reviewed changes

coderabbitai bot reviewed Dec 19, 2023

View reviewed changes

Desoroxxx requested changes Dec 19, 2023

View reviewed changes

rename IModernCrafting, and getItem

7c7333e

codescene-delta-analysis bot approved these changes Dec 19, 2023

View reviewed changes

remove unnecessary comments

569a873

codescene-delta-analysis bot approved these changes Dec 19, 2023

View reviewed changes

update changelog

5c3af6b

codescene-delta-analysis bot approved these changes Dec 19, 2023

View reviewed changes

Desoroxxx approved these changes Dec 19, 2023

View reviewed changes

Desoroxxx merged commit fd189ab into Cubed-Development:next Dec 19, 2023
1 check passed

yor42 deleted the groovyscript branch December 19, 2023 16:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds Groovyscript support for crafting #325

Adds Groovyscript support for crafting #325

yor42 commented Dec 19, 2023 •

edited by coderabbitai bot

Loading

codescene-delta-analysis bot left a comment

codescene-delta-analysis bot left a comment

codescene-delta-analysis bot left a comment

codescene-delta-analysis bot left a comment

Desoroxxx commented Dec 19, 2023

coderabbitai bot left a comment

Desoroxxx left a comment

codescene-delta-analysis bot left a comment

codescene-delta-analysis bot left a comment

codescene-delta-analysis bot left a comment

Adds Groovyscript support for crafting #325

Adds Groovyscript support for crafting #325

Conversation

yor42 commented Dec 19, 2023 • edited by coderabbitai bot Loading

📝 Description

🎯 Goals

❌ Non Goals

🚦 Testing

⏮️ Backwards Compatibility

📚 Related Issues & Documents

🖼️ Screenshots/Recordings

📖 Added to documentation?

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

Summary by CodeRabbit

codescene-delta-analysis bot left a comment

Choose a reason for hiding this comment

🚩 Declining Code Health (highest to lowest):

✅ Improving Code Health:

codescene-delta-analysis bot left a comment

Choose a reason for hiding this comment

🚩 Declining Code Health (highest to lowest):

✅ Improving Code Health:

codescene-delta-analysis bot left a comment

Choose a reason for hiding this comment

🚩 Declining Code Health (highest to lowest):

✅ Improving Code Health:

codescene-delta-analysis bot left a comment

Choose a reason for hiding this comment

🚩 Declining Code Health (highest to lowest):

✅ Improving Code Health:

Desoroxxx commented Dec 19, 2023

coderabbitai bot left a comment

Choose a reason for hiding this comment

Desoroxxx left a comment

Choose a reason for hiding this comment

codescene-delta-analysis bot left a comment

Choose a reason for hiding this comment

🚩 Declining Code Health (highest to lowest):

✅ Improving Code Health:

codescene-delta-analysis bot left a comment

Choose a reason for hiding this comment

🚩 Declining Code Health (highest to lowest):

✅ Improving Code Health:

codescene-delta-analysis bot left a comment

Choose a reason for hiding this comment

🚩 Declining Code Health (highest to lowest):

✅ Improving Code Health:

yor42 commented Dec 19, 2023 •

edited by coderabbitai bot

Loading