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

Fix clearing of memory card #7964

Merged
merged 1 commit into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"values": [
"ae2:exported_config_inv",
"ae2:exported_custom_name",
"ae2:exported_level_emitter_value",
"ae2:exported_p2p_frequency",
"ae2:exported_p2p_type",
"ae2:exported_patterns",
"ae2:exported_priority",
"ae2:exported_push_direction",
"ae2:exported_settings",
"ae2:exported_settings_source",
"ae2:exported_upgrades"
]
}
2 changes: 2 additions & 0 deletions src/main/java/appeng/datagen/AE2DataGenerators.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import appeng.datagen.providers.recipes.TransformRecipes;
import appeng.datagen.providers.tags.BiomeTagsProvider;
import appeng.datagen.providers.tags.BlockTagsProvider;
import appeng.datagen.providers.tags.DataComponentTypeTagProvider;
import appeng.datagen.providers.tags.FluidTagsProvider;
import appeng.datagen.providers.tags.ItemTagsProvider;
import appeng.datagen.providers.tags.PoiTypeTagsProvider;
Expand Down Expand Up @@ -90,6 +91,7 @@ public static void onGatherData(GatherDataEvent event) {
pack.addProvider(packOutput -> new FluidTagsProvider(packOutput, registries, existingFileHelper));
pack.addProvider(packOutput -> new BiomeTagsProvider(packOutput, registries, existingFileHelper));
pack.addProvider(packOutput -> new PoiTypeTagsProvider(packOutput, registries, existingFileHelper));
pack.addProvider(packOutput -> new DataComponentTypeTagProvider(packOutput, registries, existingFileHelper));

// Models
pack.addProvider(packOutput -> new BlockModelProvider(packOutput, existingFileHelper));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ public final class ConventionTags {
private ConventionTags() {
}

/**
* This tag contains all data component types that should be cleared from a memory card when it is
* shift+right-clicked.
*/
public static final TagKey<DataComponentType<?>> EXPORTED_SETTINGS = net.minecraft.tags.TagKey.create(
Registries.DATA_COMPONENT_TYPE,
AppEng.makeId("exported_settings"));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package appeng.datagen.providers.tags;

import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;

import org.jetbrains.annotations.Nullable;

import net.minecraft.core.HolderLookup;
import net.minecraft.core.component.DataComponentType;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.PackOutput;
import net.minecraft.data.tags.TagsProvider;
import net.minecraft.resources.ResourceKey;
import net.neoforged.neoforge.common.data.ExistingFileHelper;

import appeng.api.ids.AEComponents;
import appeng.core.AppEng;

public class DataComponentTypeTagProvider extends TagsProvider<DataComponentType<?>> {
public DataComponentTypeTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries,
@Nullable ExistingFileHelper existingFileHelper) {
super(output, Registries.DATA_COMPONENT_TYPE, registries, AppEng.MOD_ID, existingFileHelper);
}

@Override
protected void addTags(HolderLookup.Provider registries) {

Map<DataComponentType<?>, ResourceKey<DataComponentType<?>>> componentKeys = new IdentityHashMap<>();
for (var entry : AEComponents.DR.getEntries()) {
componentKeys.put(entry.get(), entry.getKey());
}

var exportedComponents = List.of(
AEComponents.EXPORTED_CONFIG_INV,
AEComponents.EXPORTED_CUSTOM_NAME,
AEComponents.EXPORTED_LEVEL_EMITTER_VALUE,
AEComponents.EXPORTED_P2P_FREQUENCY,
AEComponents.EXPORTED_P2P_TYPE,
AEComponents.EXPORTED_PATTERNS,
AEComponents.EXPORTED_PRIORITY,
AEComponents.EXPORTED_PUSH_DIRECTION,
AEComponents.EXPORTED_SETTINGS,
AEComponents.EXPORTED_SETTINGS_SOURCE,
AEComponents.EXPORTED_UPGRADES);
for (var exportedComponent : exportedComponents) {
var key = Objects.requireNonNull(componentKeys.get(exportedComponent));
tag(ConventionTags.EXPORTED_SETTINGS).add(key);
}
}
}