Skip to content

Port compat to 26.1.x#2624

Open
a6tumn wants to merge 5 commits into
TeamTwilight:26.1.xfrom
a6tumn:port-disabled-compat
Open

Port compat to 26.1.x#2624
a6tumn wants to merge 5 commits into
TeamTwilight:26.1.xfrom
a6tumn:port-disabled-compat

Conversation

@a6tumn

@a6tumn a6tumn commented Jun 11, 2026

Copy link
Copy Markdown

Feel free to review this, but I would not recommend merging until the main source set gets ported. I updated the Jade compat and some of the dependencies, but the recipe and curios compat may depend on other PRs from me or Albazavr.

@GizmoTheMoonPig GizmoTheMoonPig left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

For future reference, if you dont know what youre doing with the build.gradle, please ask. Things are set up the way they are for a reason, a lot of the changes you made there should not have happened.

IElementHelper helper = IElementHelper.get();
int total = data.getInt("total");
tooltip.add(helper.text(Component.translatable("jade.drying_rack.remaining", RecipeViewerConstants.getDryingTime(total - progress))).translate(new Vec2(10.0F, 0.0F)));
int progress = data.getInt("progress").orElseThrow();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

do not throw here. Use getIntOr for all the tag checks, defaulting to 0 if they dont exist

CompoundTag tag = rack.saveWithoutMetadata(accessor.getLevel().registryAccess());
data.putInt("progress", tag.getInt("dry_time"));
data.putInt("total", tag.getInt("total_dry_time"));
data.putInt("progress", tag.getInt("dry_time").orElseThrow());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

same here, see above

Comment thread build.gradle Outdated

//make sure to only pick one of these when testing (switch others to compileOnly)
// implementation "mezz.jei:jei-${project.minecraft_version}-neoforge:${project.jei_version}"
// implementation "mezz.jei:jei-26.1.2-neoforge:${project.jei_version}"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

why are you hardcoding versions here? Use the gradle properties like we were before

Comment thread build.gradle Outdated

//curse maven
// implementation "curse.maven:jade-324717:6170888"
// implementation "maven.modrinth:jade:${project.minecraft_version}+neoforge"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

why are you switching to the modrinth maven? The CF one works fine, keep using that.
New version for 26.1 is 324717:8251883. You can also uncomment the line so the jade source is actually added to the workspace

Comment thread build.gradle Outdated

// theillusivec4
// implementation "top.theillusivec4.curios:curios-neoforge:${project.curios_version}+${project.base_minecraft_version}"
// implementation "top.theillusivec4.curios:curios-neoforge:${project.curios_version}+26.1.2"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

see above

Comment thread build.gradle Outdated
maven {
name = "OctoStudios" //Curios
url = uri("https://maven.octo-studios.com/releases")
repositories {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

why is there an extra repositories block here?

@a6tumn

a6tumn commented Jun 18, 2026

Copy link
Copy Markdown
Author

For future reference, if you dont know what youre doing with the build.gradle, please ask. Things are set up the way they are for a reason, a lot of the changes you made there should not have happened.

Do you mind if I DM you on Discord? I have a few questions about the build script and I think that's probably more efficient.

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.

2 participants