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

[1.21.4] Sync remaining c tags from Fabric side #1628

Open
wants to merge 31 commits into
base: 1.21.x
Choose a base branch
from

Conversation

TelepathicGrunt
Copy link
Contributor

@TelepathicGrunt TelepathicGrunt commented Oct 25, 2024

Neoforge 1.21.1 port: #1593
Fabric 1.21.4 PR: FabricMC/fabric#4186

Note, I did not add any new Pale Garden stuff myself to the tags because those will need special handling to only add to the tags when the user activates the feature flag. Maybe that is better split into a separate PR by someone with more experience with feature flags than me.


Fabric had some tags that was not in Neo. This PR aims to solve that by importing those tags. Specifically c:potions item tag and c:is_temperate biome tags. I added the torchflower seeds to c:seeds/torchflower and then added that to the c:seeds tag as well as it was a missing seed.

I also improved javadoc for several tags, did some cleanup in a few spots, and marked the c:is_modified biome tag as deprecated and for removal in 1.22. Reason being the modified tag was based off of how the old biome layout used to work in the long past. Since Mojang revamped how biomes work, this tag lost all of its meaning and serves no purpose anymore. Hence time to retire it.

The PR to add the tags that are not in Fabric from Neoforge is in this other PR. Discussions ongoing of course: FabricMC/fabric#4186

The Nether stem and hyphae was missing from the Stripped wood/logs tag. This is fixed as well.

@TelepathicGrunt TelepathicGrunt self-assigned this Oct 25, 2024
@TelepathicGrunt TelepathicGrunt changed the title [1.21.3] Sync remaining c tags from Fabric side [1.21.3] Sync remaining c tags from Fabric side Oct 25, 2024
@neoforged-pr-publishing
Copy link

neoforged-pr-publishing bot commented Oct 25, 2024

  • Publish PR to GitHub Packages

Last commit published: 3fea4f1f63ed68f5b122218692ef3fec20f94df6.

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 #1628' // https://github.com/neoforged/NeoForge/pull/1628
        url 'https://prmaven.neoforged.net/NeoForge/pr1628'
        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-pr1628.
On Powershell you will need to remove the -L flag from the curl invocation.

mkdir NeoForge-pr1628
cd NeoForge-pr1628
curl -L https://prmaven.neoforged.net/NeoForge/pr1628/net/neoforged/neoforge/21.4.59-beta-pr-1628-SyncToFabricTags2/mdk-pr1628.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 [1.21.3] Sync remaining c tags from Fabric side [1.21.4] Sync remaining c tags from Fabric side Dec 12, 2024
@TelepathicGrunt TelepathicGrunt added 1.21.4 Targeted at Minecraft 1.21.4 and removed 1.21.3 Targeted at Minecraft 1.21.3 labels Dec 12, 2024
@neoforged-automation
Copy link

@TelepathicGrunt, this pull request has conflicts, please resolve them for this PR to move forward.

Copy link
Contributor

@dhyces dhyces left a comment

Choose a reason for hiding this comment

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

  • Noticed that the Fabric PR used a different translation for "tag.block.c.fences.nether_brick". Neo's is currently "Fences Nether Brick" and the Fabric PR (as well as Neo's item tag) uses "Nether Brick Fences".
  • Fabric PR uses singular "Plateau" while Neo is using plural "Plateaus" for "tag.worldgen.biome.c.is_plateau"

src/main/java/net/neoforged/neoforge/common/Tags.java Outdated Show resolved Hide resolved
dhyces
dhyces previously approved these changes Dec 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.21.4 Targeted at Minecraft 1.21.4 awaiting community agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants