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

rename slimeball tag, melee tools adjustment, and fix entries for some biome and food tags #1372

Merged

Conversation

TelepathicGrunt
Copy link
Contributor

@TelepathicGrunt TelepathicGrunt commented Jul 25, 2024

Hold on merging until I give approval

Last PR was merged accidentally too early: #1348

There was still more discussions to be done. Changes here are:

  • Added Old Growth Spruce Taiga, Windswept Hills, Windswept Gravelly Hills, Windswept Forest, and Stony Shores to the c:is_cold/overworld tag.

  • Moved Melon Slice from c:foods/vegetable to c:foods/fruit as melons are usually considered fruits.

  • Removed Glistering Melon Slice from c:foods/golden because it is not actually edible and thus, not food.

  • Melee weapon tag no longer has pickaxes, hoes, or shovels in it. And clarified the melee weapon tag's javadoc to make it clear pickaxes are excluded because being a weapon is not a pickaxe's primary purpose.

  • rename c:slimeballs to c:slime_balls and deprecate the older tag. The tag name is closer match to vanilla slime ball registry name. The translation name would have no space to match vanilla slimeball translation name

@TelepathicGrunt TelepathicGrunt added enhancement New (or improvement to existing) feature or request 1.21 Targeted at Minecraft 1.21 labels Jul 25, 2024
@TelepathicGrunt TelepathicGrunt self-assigned this Jul 25, 2024
@neoforged-pr-publishing
Copy link

neoforged-pr-publishing bot commented Jul 25, 2024

  • Publish PR to GitHub Packages

Last commit published: deedfce2ddb69235f94fbef03eecb5c469bfbcce.

PR Publishing

The artifacts published by this PR:

Repository Declaration

In order to use the artifacts published by the PR, add the following repository to your buildscript:

repositories {
    maven {
        name 'Maven for PR #1372' // https://github.com/neoforged/NeoForge/pull/1372
        url 'https://prmaven.neoforged.net/NeoForge/pr1372'
        content {
            includeModule('net.neoforged', 'neoforge')
            includeModule('net.neoforged', 'testframework')
        }
    }
}

MDK installation

In order to setup a MDK using the latest PR version, run the following commands in a terminal.
The script works on both *nix and Windows as long as you have the JDK bin folder on the path.
The script will clone the MDK in a folder named NeoForge-pr1372.
On Powershell you will need to remove the -L flag from the curl invocation.

mkdir NeoForge-pr1372
cd NeoForge-pr1372
curl -L https://prmaven.neoforged.net/NeoForge/pr1372/net/neoforged/neoforge/21.0.159-pr-1372-SlimeToolsAndFixesTags/mdk-pr1372.zip -o mdk.zip
jar xf mdk.zip
rm mdk.zip || del mdk.zip

To test a production environment, you can download the installer from here.

@TelepathicGrunt TelepathicGrunt changed the title Slime tools and fixes tags Slime tools and fix entries for some biome and food tags Jul 25, 2024
@TelepathicGrunt TelepathicGrunt changed the title Slime tools and fix entries for some biome and food tags melee tools adjustment and fix entries for some biome and food tags Jul 31, 2024
@TelepathicGrunt TelepathicGrunt changed the title melee tools adjustment and fix entries for some biome and food tags rename slimeball tag, melee tools adjustment, and fix entries for some biome and food tags Jul 31, 2024
@TelepathicGrunt
Copy link
Contributor Author

Fabric side reach agreement and was merged. Merging this now

@sciwhiz12 sciwhiz12 added the data driven This request involves a data driven system label Aug 4, 2024
@TelepathicGrunt
Copy link
Contributor Author

FabricMC/fabric#3957

@sciwhiz12 sciwhiz12 self-requested a review August 4, 2024 13:26
Copy link
Member

@sciwhiz12 sciwhiz12 left a comment

Choose a reason for hiding this comment

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

Merge at will.

@TelepathicGrunt TelepathicGrunt merged commit 4bd040d into neoforged:1.21.x Aug 4, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.21 Targeted at Minecraft 1.21 data driven This request involves a data driven system enhancement New (or improvement to existing) feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Melon slices are tagged as "vegetable", rather than "fruit" or "berry"
3 participants