Skip to content

Remove unchecked casts in TagPrefix #4559

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.

Sign up for GitHub

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

Merged
TechLord22 merged 2 commits into from
Feb 8, 2026
Merged

Remove unchecked casts in TagPrefix #4559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03bdf18
remove unchecked casts in TagPrefix
TechLord22 Feb 6, 2026
9140669
use `@Unmodifiable`
TechLord22 Feb 8, 2026
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
16 changes: 8 additions & 8 deletions src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public static MaterialEntry getMaterialEntry(ItemLike itemLike) {
MaterialEntry materialEntry1 = getMaterialEntry(itemTag);
// check that it's not the empty marker and that it's not a parent tag
if (!materialEntry1.isEmpty() &&
Arrays.stream(materialEntry1.tagPrefix().getItemParentTags()).noneMatch(itemTag::equals)) {
materialEntry1.tagPrefix().getItemParentTags().stream().noneMatch(itemTag::equals)) {
return materialEntry1;
}
}
Expand All @@ -210,7 +210,7 @@ public static MaterialEntry getMaterialEntry(TagKey<Item> tag) {
Set<TagKey<Item>> allItemTags = BuiltInRegistries.ITEM.getTagNames().collect(Collectors.toSet());
for (TagPrefix prefix : TagPrefix.values()) {
for (Material material : GTCEuAPI.materialManager.getRegisteredMaterials()) {
Arrays.stream(prefix.getItemTags(material))
prefix.getItemTags(material).stream()
.filter(allItemTags::contains)
.forEach(tagKey -> {
// remove the tag so that the next iteration is faster.
Expand Down Expand Up @@ -291,19 +291,19 @@ public static Block getBlock(TagPrefix orePrefix, Material material) {
@Nullable
public static TagKey<Block> getBlockTag(TagPrefix orePrefix, @NotNull Material material) {
var tags = orePrefix.getBlockTags(material);
if (tags.length > 0) {
return tags[0];
if (tags.isEmpty()) {
return null;
}
return null;
return tags.get(0);
}

@Nullable
public static TagKey<Item> getTag(TagPrefix orePrefix, @NotNull Material material) {
var tags = orePrefix.getItemTags(material);
if (tags.length > 0) {
return tags[0];
if (tags.isEmpty()) {
return null;
}
return null;
return tags.get(0);
}

public static List<Pair<ItemStack, ItemMaterialInfo>> getAllItemInfos() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/ItemMaterialData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public static void reinitializeMaterialData() {
// Load new data
TagsHandler.initExtraUnificationEntries();
for (TagPrefix prefix : TagPrefix.values()) {
prefix.getIgnored().forEach((mat, items) -> registerMaterialEntries(Arrays.asList(items), prefix, mat));
prefix.getIgnored().forEach((mat, items) -> registerMaterialEntries(items, prefix, mat));
}
GTMaterialItems.toUnify
.forEach((materialEntry, supplier) -> registerMaterialEntry(supplier, materialEntry));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/stack/MaterialEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public String toString() {
return material.getResourceLocation().toString();
}
var tags = tagPrefix.getItemTags(material);
if (tags.length == 0) {
if (tags.isEmpty()) {
return tagPrefix.name + "/" + material.getName();
}
return tags[0].location().toString();
return tags.get(0).location().toString();
}

public static @Nullable MaterialEntry of(Object o) {
Expand Down
93 changes: 56 additions & 37 deletions src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import lombok.experimental.Accessors;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.Unmodifiable;

import java.util.*;
import java.util.function.*;
Expand Down Expand Up @@ -1034,7 +1035,7 @@ public record BlockProperties(Supplier<Supplier<RenderType>> renderType,
@Setter
private BiConsumer<Material, List<Component>> tooltip;

private final Map<Material, Supplier<? extends ItemLike>[]> ignoredMaterials = new HashMap<>();
private final Map<Material, @Unmodifiable Collection<Supplier<? extends ItemLike>>> ignoredMaterials = new HashMap<>();
private final Object2FloatMap<Material> materialAmounts = new Object2FloatOpenHashMap<>();

@Getter
Expand Down Expand Up @@ -1173,43 +1174,51 @@ public static TagPrefix getPrefix(String prefixName, @Nullable TagPrefix replace
return PREFIXES.getOrDefault(prefixName, replacement);
}

@SuppressWarnings("unchecked")
public TagKey<Item>[] getItemParentTags() {
return tags.stream().filter(TagType::isParentTag).map(type -> type.getTag(this, GTMaterials.NULL))
.toArray(TagKey[]::new);
public @Unmodifiable List<TagKey<Item>> getItemParentTags() {
return tags.stream()
.filter(TagType::isParentTag)
.map(type -> type.getTag(this, GTMaterials.NULL))
.filter(Objects::nonNull)
.toList();
}

@SuppressWarnings("unchecked")
public TagKey<Item>[] getItemTags(@NotNull Material mat) {
return tags.stream().filter(type -> !type.isParentTag()).map(type -> type.getTag(this, mat))
public @Unmodifiable List<TagKey<Item>> getItemTags(@NotNull Material mat) {
return tags.stream()
.filter(type -> !type.isParentTag())
.map(type -> type.getTag(this, mat))
.filter(Objects::nonNull)
.toArray(TagKey[]::new);
.toList();
}

@SuppressWarnings("unchecked")
public TagKey<Item>[] getAllItemTags(@NotNull Material mat) {
return tags.stream().map(type -> type.getTag(this, mat)).filter(Objects::nonNull).toArray(TagKey[]::new);
public @Unmodifiable List<TagKey<Item>> getAllItemTags(@NotNull Material mat) {
return tags.stream()
.map(type -> type.getTag(this, mat))
.filter(Objects::nonNull)
.toList();
}

@SuppressWarnings("unchecked")
public TagKey<Block>[] getBlockTags(@NotNull Material mat) {
return tags.stream().filter(type -> !type.isParentTag()).map(type -> type.getTag(this, mat))
.map(itemTagKey -> TagKey.create(Registries.BLOCK, itemTagKey.location())).toArray(TagKey[]::new);
public @Unmodifiable List<TagKey<Block>> getBlockTags(@NotNull Material mat) {
return tags.stream()
.filter(type -> !type.isParentTag())
.map(type -> type.getTag(this, mat))
.filter(Objects::nonNull)
.map(itemTagKey -> TagKey.create(Registries.BLOCK, itemTagKey.location()))
.toList();
}

@SuppressWarnings("unchecked")
public TagKey<Block>[] getAllBlockTags(@NotNull Material mat) {
public @Unmodifiable List<TagKey<Block>> getAllBlockTags(@NotNull Material mat) {
return tags.stream().map(type -> type.getTag(this, mat))
.map(itemTagKey -> TagKey.create(Registries.BLOCK, itemTagKey.location())).toArray(TagKey[]::new);
.filter(Objects::nonNull)
.map(itemTagKey -> TagKey.create(Registries.BLOCK, itemTagKey.location()))
.toList();
}

public boolean hasItemTable() {
return itemTable != null;
}

@SuppressWarnings("unchecked")
public Supplier<ItemLike> getItemFromTable(Material material) {
return (Supplier<ItemLike>) itemTable.get().get(this, material);
public Supplier<? extends ItemLike> getItemFromTable(Material material) {
return itemTable.get().get(this, material);
}

public boolean doGenerateItem() {
Expand Down Expand Up @@ -1267,41 +1276,51 @@ public boolean isIgnored(Material material) {

@SafeVarargs
public final void setIgnored(Material material, Supplier<? extends ItemLike>... items) {
setIgnored(material, Arrays.asList(items));
}

public final void setIgnored(Material material, Collection<Supplier<? extends ItemLike>> items) {
ignoredMaterials.put(material, items);
if (items.length > 0) {
ItemMaterialData.registerMaterialEntries(Arrays.asList(items), this, material);
if (!items.isEmpty()) {
ItemMaterialData.registerMaterialEntries(items, this, material);
}
}

@SuppressWarnings("unchecked")
public void setIgnored(Material material, ItemLike... items) {
// go through setIgnoredBlock to wrap if this is a block prefix
Collection<Supplier<? extends ItemLike>> collection = new ArrayList<>(items.length);
if (this.doGenerateBlock()) {
this.setIgnoredBlock(material,
Arrays.stream(items).filter(Block.class::isInstance).map(Block.class::cast).toArray(Block[]::new));
for (var item : items) {
if (item instanceof Block b) {
collection.add(GTMemoizer.memoizeBlockSupplier(() -> b));
}
}
} else {
this.setIgnored(material,
Arrays.stream(items).map(item -> (Supplier<ItemLike>) () -> item).toArray(Supplier[]::new));
for (var item : items) {
collection.add(() -> item);
}
}
setIgnored(material, collection);
}

@SuppressWarnings("unchecked")
public void setIgnoredBlock(Material material, Block... items) {
this.setIgnored(material, Arrays.stream(items).map(block -> GTMemoizer.memoizeBlockSupplier(() -> block))
.toArray(Supplier[]::new));
public void setIgnoredBlock(Material material, Block... blocks) {
Collection<Supplier<? extends ItemLike>> collection = new ArrayList<>(blocks.length);
for (var block : blocks) {
collection.add(GTMemoizer.memoizeBlockSupplier(() -> block));
}
setIgnored(material, collection);
}

@SuppressWarnings("unchecked")
public void setIgnored(Material material) {
this.ignoredMaterials.put(material, new Supplier[0]);
this.ignoredMaterials.put(material, List.of());
}

public void removeIgnored(Material material) {
ignoredMaterials.remove(material);
}

public Map<Material, Supplier<? extends ItemLike>[]> getIgnored() {
return new HashMap<>(ignoredMaterials);
public @Unmodifiable Map<Material, @Unmodifiable Collection<Supplier<? extends ItemLike>>> getIgnored() {
return Map.copyOf(ignoredMaterials);
}

public boolean isAmountModified(Material material) {
Expand Down
4 changes: 2 additions & 2 deletions ...va/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/item/IntersectionMapIngredient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public static List<AbstractMapIngredient> from(ItemStack stack) {

if (!entry.isEmpty() && TagPrefix.ORES.containsKey(entry.tagPrefix())) {
List<AbstractMapIngredient> children = new ArrayList<>();
children.add(new ItemTagMapIngredient(entry.tagPrefix().getItemTags(entry.material())[0]));
children.add(new ItemTagMapIngredient(entry.tagPrefix().getItemParentTags()[0]));
children.add(new ItemTagMapIngredient(entry.tagPrefix().getItemTags(entry.material()).get(0)));
children.add(new ItemTagMapIngredient(entry.tagPrefix().getItemParentTags().get(0)));

return Collections.singletonList(new IntersectionMapIngredient(children));
}
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/data/recipe/VanillaRecipeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,9 @@ public static void addShapedRecipe(Consumer<FinishedRecipe> provider, boolean se
} else if (content instanceof TagKey<?> key) {
builder.define(sign, (TagKey<Item>) key);
} else if (content instanceof TagPrefix prefix) {
if (prefix.getItemParentTags().length > 0) {
builder.define(sign, prefix.getItemParentTags()[0]);
var parentTags = prefix.getItemParentTags();
if (!parentTags.isEmpty()) {
builder.define(sign, parentTags.get(0));
}
} else if (content instanceof ItemLike itemLike) {
builder.define(sign, itemLike);
Expand Down Expand Up @@ -491,8 +492,9 @@ public static void addShapedFluidContainerRecipe(Consumer<FinishedRecipe> provid
} else if (content instanceof TagKey<?> key) {
builder.define(sign, (TagKey<Item>) key);
} else if (content instanceof TagPrefix prefix) {
if (prefix.getItemParentTags().length > 0) {
builder.define(sign, prefix.getItemParentTags()[0]);
var parentTags = prefix.getItemParentTags();
if (!parentTags.isEmpty()) {
builder.define(sign, parentTags.get(0));
}
} else if (content instanceof ItemLike itemLike) {
builder.define(sign, itemLike);
Expand Down
Loading