Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Ran a Node script to remove the damage property from the recipes.yml.… #1073

Closed
wants to merge 6 commits into from

Conversation

birbe
Copy link
Contributor

@birbe birbe commented Jan 14, 2020

Removed the damage property from the recipes with a Node script. This also makes it easier to deal with as in many places we no longer return a map that includes a material along with its damage but simply the material namespaced key alone.

Someone still needs to remove the non-existent blocks from the recipes.

@claassistantio
Copy link

claassistantio commented Jan 14, 2020

CLA assistant check
All committers have signed the CLA.

@birbe
Copy link
Contributor Author

birbe commented Jan 14, 2020

Building has failed as I haven't updated code to suit the new format.

Copy link
Member

@mastercoms mastercoms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also gets rid of the amount specifier. I wouldn't change the format and instead just remove the damage IDs.

@birbe
Copy link
Contributor Author

birbe commented Jan 14, 2020

This also gets rid of the amount specifier. I wouldn't change the format and instead just remove the damage IDs.

My bad. Will fix.

@birbe
Copy link
Contributor Author

birbe commented Jan 14, 2020

I've updated the result.

@birbe
Copy link
Contributor Author

birbe commented Jan 15, 2020

The YML parser seemed to have messed up re-serializing some of the arrays and they are now just keyed maps, am fixing.

Birbyy added 3 commits January 15, 2020 18:42
… normal arrays, causing an error. This is fixed here.
…e now updated. Also along is the updated version of CraftingManager which sets some flags in the item maps to tell Bukkit that we're not using legacy Material names which was the other half of the errors. This system is a little messy so we should switch over to using the Mojang provided recipes.json or whatever it is ASAP.
@mastercoms mastercoms changed the base branch from 1.13 to 1.15 May 6, 2020 12:09
furnaceRecipes.add(
new FurnaceRecipe(key, resultStack, inputStack.getType(),
inputStack.getDurability(), xp, 200));
//float xp = ((Number) data.get("xp")).floatValue(); // NON-NLS
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like xp was removed from the original recipes.yml. Is that intentional? If not, could you add it back?

ItemStack inputStack
= ItemStack.deserialize((Map<String, Object>) data.get("input")); // NON-NLS
= ItemStack.deserialize((Map<String, Object>) data.get("input")); // NON-NLS;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove semicolon here.

@birbe birbe closed this Aug 24, 2020
@mastercoms
Copy link
Member

@birbe could you possibly send us the Node script under a compatible license for us to continue this work?

@birbe
Copy link
Contributor Author

birbe commented Aug 24, 2020

I probably won't be able to find it; I might be able to rewrite it though.

@mastercoms
Copy link
Member

Ok, if you could do that, it would be most helpful. Thank you!

@birbe
Copy link
Contributor Author

birbe commented Dec 22, 2020

Oof, really sorry to leave you hanging like this. I got the script; I'm cleaning up my computer and I found it, not sure if it's still relevant.
rx2j.zip

As for the license:

I donate the attached files and code as a part of the GlowstoneMC project, you may use it however you'd like.

@mastercoms
Copy link
Member

Thanks so much!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants