Create turtle/pocket item stacks

[SirEndii]

Greetings,
I currently port AP to 1.21.1 (see #679)
But I currently struggle a bit to make turtle and pocket item stacks for our villager trades. I was able to use the peace of code from CC to add our turtles and pockets to our creative tab, but I am stuck at creating them for other purposes.

So there is DataComponentUtil.createStack which I tried to use

            DataComponentUtil.createStack(ModRegistry.Items.POCKET_COMPUTER_ADVANCED.get(), ModRegistry.DataComponents.RIGHT_TURTLE_UPGRADE.get(), UpgradeData.ofDefault(CCRegistration.PLAYER_DETECTOR_POCKET));

But I really struggle with the whole holder and reference stuff from mojang, so I am not sure how I can create a Holder.Reference<UpgradeBase> for that method.

And I have a second problem
I just thought "let's look where CC does that" but Intellij/gradle is unable to find CC sources, so I can't freely look around the references.
I downloaded the cc-tweaked-1.21.1-forge-1.114.2-sources.jar manually and opened it, but it seems that it lacks a lot of the original source files - or I am just lost

I hope someone smarter than me can help

[SquidDev]

You need to get the upgrade registry in the available HolderLookup.Provider, and then fetch the upgrade from that. For village trades, you can probably use the enchantment or potion trades as an example:

public MerchantOffer getOffer(Entity trader, RandomSource random) {
    var registryaccess = trader.level().registryAccess();
    var upgrade = registryaccess.registryOrThrow(IPocketUpgrade.REGISTRY)
        .getHolder(ResourceLocation.fromNamespaceAndPath("mymod", "my_upgade_id"))
        .orElseThrow();
    var stack = DataComponentUtil.createStack(ModRegistry.Items.POCKET_COMPUTER_ADVANCED.get(), ModRegistry.DataComponents.RIGHT_TURTLE_UPGRADE.get(), UpgradeData.ofDefault(upgrade));
    return new MerchantOffer(...)
}

I guess it's worth remembering that upgrades are not guaranteed to be present (someone can remove them via datapacks!). It's a real shame that villager trades aren't data-driven :/. I kinda wonder if you could mimic that by using data maps to map turtle/pocket upgrades to emerald costs, but maybe not as part of the initial update. 😉

[SirEndii]

Big thank you, that works great

I will keep things simple for now, will look at using data maps in the future

Do you have an idea for my second problem? CC is the only third party dependency where I am unable to use sources

[SquidDev]

So the jar we're publishing apparently doesn't include all the sources (the Forge one just includes the Forge-specific files). I'm afraid I'm not sure why that is — we should be including them, so will poke the build system.

[SirEndii]

Alrighty, thank you

[SquidDev]

I'm not actually quite sure what's going on here!

• On Forge/MC 1.20.1, versions up to and including 1.109.2 have the sources, but 1.109.3 onwards does not.
• On Forge/MC 1.21, 1.111.1 has sources, but 1.112.0 does not.

I don't even see anything obvious in the diff that might be causing this! Will try to get this sorted before the next release.

[SirEdvin]

Build systems, I love them so much :)

Sorry for this side note, but I also struggle with gradle a lot