From 2681a34f22de963acbf8566ad2486568806d82d2 Mon Sep 17 00:00:00 2001 From: TropheusJ Date: Thu, 27 Feb 2025 12:18:59 -0500 Subject: [PATCH] use IntrinsicHolderTagsProvider --- .../storage/item/MountedItemStorageType.java | 2 +- .../CreateMountedItemStorageTypeTagsProvider.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java b/src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java index 9386173fc7..a78297d76d 100644 --- a/src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java +++ b/src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java @@ -29,7 +29,7 @@ public abstract class MountedItemStorageType { }); public final Codec codec; - public final Holder> holder; + public final Holder.Reference> holder; protected MountedItemStorageType(Codec codec) { this.codec = codec; diff --git a/src/main/java/com/simibubi/create/infrastructure/data/CreateMountedItemStorageTypeTagsProvider.java b/src/main/java/com/simibubi/create/infrastructure/data/CreateMountedItemStorageTypeTagsProvider.java index 3e314f0a48..4cc5029ccc 100644 --- a/src/main/java/com/simibubi/create/infrastructure/data/CreateMountedItemStorageTypeTagsProvider.java +++ b/src/main/java/com/simibubi/create/infrastructure/data/CreateMountedItemStorageTypeTagsProvider.java @@ -12,23 +12,22 @@ import com.simibubi.create.api.registry.CreateRegistries; import net.minecraft.core.HolderLookup.Provider; import net.minecraft.data.PackOutput; -import net.minecraft.data.tags.TagsProvider; -import net.minecraft.tags.TagEntry; +import net.minecraft.data.tags.IntrinsicHolderTagsProvider; import net.minecraftforge.common.data.ExistingFileHelper; -public class CreateMountedItemStorageTypeTagsProvider extends TagsProvider> { +public class CreateMountedItemStorageTypeTagsProvider extends IntrinsicHolderTagsProvider> { public CreateMountedItemStorageTypeTagsProvider(PackOutput output, CompletableFuture lookupProvider, @Nullable ExistingFileHelper existingFileHelper) { - super(output, CreateRegistries.MOUNTED_ITEM_STORAGE_TYPE, lookupProvider, Create.ID, existingFileHelper); + super(output, CreateRegistries.MOUNTED_ITEM_STORAGE_TYPE, lookupProvider, type -> type.holder.key(), Create.ID, existingFileHelper); } @Override protected void addTags(Provider pProvider) { tag(AllMountedItemStorageTypeTags.INTERNAL.tag).add( - TagEntry.element(AllMountedStorageTypes.DISPENSER.getId()) + AllMountedStorageTypes.DISPENSER.get() ); tag(AllMountedItemStorageTypeTags.FUEL_BLACKLIST.tag).add( - TagEntry.element(AllMountedStorageTypes.VAULT.getId()) + AllMountedStorageTypes.VAULT.get() ); // VALIDATE