mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev

Browse source 
# Conflicts:
#	src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java
This commit is contained in:
IThundxr 2025-02-27 14:06:52 -05:00
commit bcb571a017
No known key found for this signature in database
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java
View file

@ -1,9 +1,10 @@
package com.simibubi.create.api.contraption.storage.item; package com.simibubi.create.api.contraption.storage.item;
import com.mojang.serialization.MapCodec;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.simibubi.create.api.registry.CreateBuiltInRegistries; import com.simibubi.create.api.registry.CreateBuiltInRegistries;
import com.simibubi.create.api.registry.CreateRegistries; import com.simibubi.create.api.registry.CreateRegistries;
import com.simibubi.create.api.registry.SimpleRegistry; import com.simibubi.create.api.registry.SimpleRegistry;
@ -30,7 +31,7 @@ public abstract class MountedItemStorageType<T extends MountedItemStorage> {
}); });
public final MapCodec<? extends T> codec; public final MapCodec<? extends T> codec;
public final Holder<MountedItemStorageType<?>> holder = CreateBuiltInRegistries.MOUNTED_ITEM_STORAGE_TYPE.createIntrusiveHolder(this); public final Holder.Reference<MountedItemStorageType<?>> holder = CreateBuiltInRegistries.MOUNTED_ITEM_STORAGE_TYPE.createIntrusiveHolder(this);
protected MountedItemStorageType(MapCodec<? extends T> codec) { protected MountedItemStorageType(MapCodec<? extends T> codec) {
this.codec = codec; this.codec = codec;

11
src/main/java/com/simibubi/create/infrastructure/data/CreateMountedItemStorageTypeTagsProvider.java
View file

@ -12,23 +12,22 @@ import com.simibubi.create.api.registry.CreateRegistries;
import net.minecraft.core.HolderLookup.Provider; import net.minecraft.core.HolderLookup.Provider;
import net.minecraft.data.PackOutput; import net.minecraft.data.PackOutput;
import net.minecraft.data.tags.TagsProvider; import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
import net.minecraft.tags.TagEntry;
import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.common.data.ExistingFileHelper;
public class CreateMountedItemStorageTypeTagsProvider extends TagsProvider<MountedItemStorageType<?>> { public class CreateMountedItemStorageTypeTagsProvider extends IntrinsicHolderTagsProvider<MountedItemStorageType<?>> {
public CreateMountedItemStorageTypeTagsProvider(PackOutput output, CompletableFuture<Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) { public CreateMountedItemStorageTypeTagsProvider(PackOutput output, CompletableFuture<Provider> 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 @Override
protected void addTags(Provider pProvider) { protected void addTags(Provider pProvider) {
tag(AllMountedItemStorageTypeTags.INTERNAL.tag).add( tag(AllMountedItemStorageTypeTags.INTERNAL.tag).add(
TagEntry.element(AllMountedStorageTypes.DISPENSER.getId()) AllMountedStorageTypes.DISPENSER.get()
); );
tag(AllMountedItemStorageTypeTags.FUEL_BLACKLIST.tag).add( tag(AllMountedItemStorageTypeTags.FUEL_BLACKLIST.tag).add(
TagEntry.element(AllMountedStorageTypes.VAULT.getId()) AllMountedStorageTypes.VAULT.get()
); );
// VALIDATE // VALIDATE