R3944Realms/ExtendedAE_Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

样板上传时合成配方固定记录配方为crafting

Browse Source
This commit is contained in:
GaLi 2026-03-28 15:29:32 +08:00
parent 663b10ddd3
commit 61be0610bf
5 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/extendedae_plus/client/event/CtrlQPatternKeyHandler.java
View File

@ -157,6 +157,7 @@ public final class CtrlQPatternKeyHandler {
RecipeInfo matching = matchById(recipeInfos, recipeId);
List<ItemStack> selectedIngredients = selectIngredientsWithJeiPriority(matching);
List<ItemStack> selectedOutputs = convertOutputsToItemStacks(matching);
ExtendedAEPatternUploadUtil.presetCraftingProviderSearchKey();
PacketDistributor.sendToServer(new CreateAndUploadPatternC2SPacket(
recipeId,

12
src/main/java/com/extendedae_plus/client/screen/ProviderSelectScreen.java
View File

@ -66,7 +66,7 @@ public class ProviderSelectScreen extends Screen {
private String query = "";
private boolean needsRefresh = false;
private int page = 0;
private boolean autoUploadRequestedFromProcessingName = false;
private boolean autoUploadRequestedFromPresetSearch = false;
private boolean autoUploadAttempted = false;
private int lastExactMatchCount = 0;
@ -76,14 +76,12 @@ public class ProviderSelectScreen extends Screen {
this.ids = ids;
this.names = names;
this.emptySlots = emptySlots;
// 如果有来自 JEI 的最近处理名称，则作为初始查询
// 如果有来自最近一次写样板流程的预设搜索词，则作为初始查询
try {
String recent = ExtendedAEPatternUploadUtil.lastProcessingName;
String recent = ExtendedAEPatternUploadUtil.consumeLastProviderSearchKey();
if (recent != null && !recent.isBlank()) {
this.query = recent;
this.autoUploadRequestedFromProcessingName = true;
// 用后即清空，避免污染下次
ExtendedAEPatternUploadUtil.lastProcessingName = null;
this.autoUploadRequestedFromPresetSearch = true;
}
} catch (Throwable ignored) {}
this.buildGroups();
@ -253,7 +251,7 @@ public class ProviderSelectScreen extends Screen {
}
private void tryAutoUploadIfUniqueMatch() {
if (!this.autoUploadRequestedFromProcessingName || this.autoUploadAttempted) {
if (!this.autoUploadRequestedFromPresetSearch || this.autoUploadAttempted) {
return;
}
this.autoUploadAttempted = true;

6
src/main/java/com/extendedae_plus/mixin/jei/AE2JeiEncodePatternTransferHandlerMixin.java
View File

@ -35,8 +35,10 @@ public abstract class AE2JeiEncodePatternTransferHandlerMixin<T extends PatternE
recipe = holder.value();
}
if (recipe != null) {
// 仅记录处理配方（非 3x3 合成）
if (EncodingHelper.isSupportedCraftingRecipe(recipe)) return;
if (EncodingHelper.isSupportedCraftingRecipe(recipe)) {
ExtendedAEPatternUploadUtil.presetCraftingProviderSearchKey();
return;
}
name = ExtendedAEPatternUploadUtil.mapRecipeTypeToSearchKey(recipe);
} else {
// 非原版 Recipe<?> 的显示，尝试从 recipeBase 类名/包名推导关键词

6
src/main/java/com/extendedae_plus/mixin/jei/EncodePatternTransferHandlerMixin.java
View File

@ -28,8 +28,10 @@ public abstract class EncodePatternTransferHandlerMixin {
String name = null;
Recipe<?> recipe = holder != null ? holder.value() : null;
if (recipe != null) {
// 仅记录处理配方（非 3x3 合成）
if (EncodingHelper.isSupportedCraftingRecipe(recipe)) return;
if (EncodingHelper.isSupportedCraftingRecipe(recipe)) {
ExtendedAEPatternUploadUtil.presetCraftingProviderSearchKey();
return;
}
name = ExtendedAEPatternUploadUtil.mapRecipeTypeToSearchKey(recipe);
} else {
// 非原版 Recipe<?> 的显示，尝试从 display 类名/包名推导关键词

47
src/main/java/com/extendedae_plus/util/uploadPattern/ExtendedAEPatternUploadUtil.java
View File

@ -53,8 +53,10 @@ public class ExtendedAEPatternUploadUtil {
private static final Map<ResourceLocation, String> CUSTOM_NAMES = new ConcurrentHashMap<>();
private static final Map<String, String> CUSTOM_ALIASES = new ConcurrentHashMap<>();
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
// 最近一次通过 JEI 填充到编码终端的“处理配方”的中文名称（如：烧炼/高炉/烟熏...)
public static volatile String lastProcessingName = null;
// 最近一次打开供应器选择界面时的预设搜索关键字。
// 处理样板会写入映射后的配方类型关键字，合成样板固定使用 crafting（可通过映射改名）。
public static final String DEFAULT_CRAFTING_SEARCH_KEY = "crafting";
private static volatile String lastProviderSearchKey = null;
static {
try {
@ -128,7 +130,26 @@ public class ExtendedAEPatternUploadUtil {
}
public static void setLastProcessingName(String name) {
lastProcessingName = name;
setLastProviderSearchKey(name);
}
public static void setLastProviderSearchKey(String name) {
if (name == null) {
lastProviderSearchKey = null;
return;
}
String trimmed = name.trim();
lastProviderSearchKey = trimmed.isEmpty() ? null : trimmed;
}
public static void presetCraftingProviderSearchKey() {
setLastProviderSearchKey(resolveSearchKeyAlias(DEFAULT_CRAFTING_SEARCH_KEY));
}
public static String consumeLastProviderSearchKey() {
String searchKey = lastProviderSearchKey;
lastProviderSearchKey = null;
return searchKey;
}
/**
@ -278,14 +299,28 @@ public class ExtendedAEPatternUploadUtil {
* - 有中文映射则返回中文；
* - 否则返回配方类型的 path（不含命名空间），例如 assembler。
*/
public static String resolveSearchKeyAlias(String rawKey) {
if (rawKey == null) {
return null;
}
String normalized = rawKey.trim();
if (normalized.isEmpty()) {
return null;
}
String alias = CUSTOM_ALIASES.get(normalized.toLowerCase());
if (alias != null && !alias.isBlank()) {
return alias;
}
return normalized;
}
public static String mapRecipeTypeToSearchKey(Recipe<?> recipe) {
if (recipe == null) return null;
RecipeType<?> type = recipe.getType();
ResourceLocation key = BuiltInRegistries.RECIPE_TYPE.getKey(type);
if (key == null) return null;
// 先查别名（按 path 匹配）
String alias = CUSTOM_ALIASES.get(key.getPath().toLowerCase());
if (alias != null && !alias.isBlank()) return alias;
String resolvedPath = resolveSearchKeyAlias(key.getPath());
if (resolvedPath != null) return resolvedPath;
// 再查完整ID映射
String custom = CUSTOM_NAMES.get(key);
if (custom != null && !custom.isBlank()) {