amy/almostunified
1
0
Fork 0
mirror of https://github.com/AlmostReliable/almostunified.git synced 2024-11-24 16:48:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix automated hiding of stone strata variants

Browse source
This commit is contained in:
rlnt 2024-03-17 22:58:54 +01:00
parent 461b93f60e
commit ab51ba3204
No known key found for this signature in database
4 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog],
and this project adheres to [Semantic Versioning].
## Unreleased
### Fixed
- fixed automatic hiding of stone strata variants (bug introduced in 0.9.0)
- fixed a bug where stone stratas were not correctly identified (Fabric only)
## [0.9.1] - 2024-03-17
### Added

2
Common/src/main/java/com/almostreliable/unified/api/StoneStrataHandler.java
View file

@ -45,7 +45,7 @@ public final class StoneStrataHandler {
var stoneStrataTagMap = tagMap.filtered(stoneStrataTags::contains, item -> true);
Pattern tagMatcher = Pattern.compile(switch (AlmostUnifiedPlatform.INSTANCE.getPlatform()) {
case FORGE -> "forge:ores/.+";
case FABRIC -> "(c:ores/.+|c:.+_ores)";
case FABRIC -> "(c:ores/.+|(minecraft|c):.+_ores)";
});
return new StoneStrataHandler(stoneStrataIds, tagMatcher, stoneStrataTagMap);
}

25
Common/src/main/java/com/almostreliable/unified/compat/HideHelper.java
View file

@ -38,25 +38,32 @@ public final class HideHelper {
var itemsByTag = tagMap.getEntriesByTag(unifyTag);
if (Utils.allSameNamespace(itemsByTag)) continue;
ResourceLocation preferredItem = repMap.getPreferredItemForTag(unifyTag, $ -> true);
if (preferredItem == null) continue;
// it's not enough to exclude the preferred item from hiding because it would hide stone stratas
Set<ResourceLocation> replacements = new HashSet<>();
for (ResourceLocation item : itemsByTag) {
ResourceLocation replacement = repMap.getReplacementForItem(item);
replacements.add(replacement == null ? item : replacement);
}
Set<ResourceLocation> itemsToHide = getItemsToHide(unifyTag, itemsByTag, preferredItem);
if (itemsToHide == null) continue;
Set<ResourceLocation> itemsToHide = getItemsToHide(unifyTag, itemsByTag, replacements);
if (itemsToHide != null) {
hidingMap.putAll(unifyTag, itemsToHide);
}
Set<ResourceLocation> refItemsToHide = getRefItemsToHide(unifyTag, ownerships, preferredItem);
Set<ResourceLocation> refItemsToHide = getRefItemsToHide(unifyTag, ownerships, replacements);
if (!refItemsToHide.isEmpty()) {
hidingMap.putAll(unifyTag, refItemsToHide);
}
}
return hidingMap;
}
@Nullable
private static Set<ResourceLocation> getItemsToHide(UnifyTag<Item> unifyTag, Set<ResourceLocation> itemsByTag, ResourceLocation preferredItem) {
private static Set<ResourceLocation> getItemsToHide(UnifyTag<Item> unifyTag, Set<ResourceLocation> itemsByTag, Set<ResourceLocation> replacements) {
Set<ResourceLocation> itemsToHide = new HashSet<>();
for (ResourceLocation item : itemsByTag) {
if (!item.equals(preferredItem)) {
if (!replacements.contains(item)) {
itemsToHide.add(item);
}
}
@ -73,7 +80,7 @@ public final class HideHelper {
return itemsToHide;
}
private static Set<ResourceLocation> getRefItemsToHide(UnifyTag<Item> unifyTag, TagOwnerships ownerships, ResourceLocation preferredItem) {
private static Set<ResourceLocation> getRefItemsToHide(UnifyTag<Item> unifyTag, TagOwnerships ownerships, Set<ResourceLocation> replacements) {
var refTags = ownerships.getRefsByOwner(unifyTag);
Set<ResourceLocation> refItemsToHide = new HashSet<>();
@ -82,7 +89,7 @@ public final class HideHelper {
BuiltInRegistries.ITEM.getTagOrEmpty(asTagKey).forEach(holder -> {
ResourceLocation item = BuiltInRegistries.ITEM.getKey(holder.value());
if (item.equals(preferredItem)) return;
if (replacements.contains(item)) return;
refItemsToHide.add(item);
});

4
Common/src/main/java/com/almostreliable/unified/config/Defaults.java
View file

@ -130,9 +130,7 @@ public final class Defaults {
}
public static List<String> getIgnoredRecipeTypes(AlmostUnifiedPlatform.Platform platform) {
return switch (platform) {
default -> List.of("cucumber:shaped_tag");
};
return List.of("cucumber:shaped_tag");
}
public static JsonCompare.CompareSettings getDefaultDuplicateRules(AlmostUnifiedPlatform.Platform platform) {