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:31:11 +08:00
parent c77e354abd
commit af35ee9d97
4 changed files with 50 additions and 16 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

@ -282,6 +282,7 @@ public class CtrlQPatternKeyHandler {
// 10. 获取输出材料
List<ItemStack> selectedOutputs = convertOutputsToItemStacks(matchingRecipeInfo);
RecipeTypeNameConfig.presetCraftingProviderSearchKey();
// 11. 发送网络包创建样板并上传到装配矩阵
ModNetwork.CHANNEL.sendToServer(new CreateAndUploadPatternC2SPacket(

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

@ -78,7 +78,7 @@ public class ProviderSelectScreen extends Screen {
// 缓存 Component JSON 解析
private static final Map<String, String> componentCache = new HashMap<>();
private String lastLanguage = ""; // 当前语言版本
private boolean autoUploadRequestedFromProcessingName = false;
private boolean autoUploadRequestedFromPresetSearch = false;
private boolean autoUploadAttempted = false;
private int lastExactMatchCount = 0;
private boolean lastFilterUsedFallback = false;
@ -89,14 +89,12 @@ public class ProviderSelectScreen extends Screen {
this.ids = ids;
this.names = names;
this.emptySlots = emptySlots;
// 如果有来自 JEI 的最近处理名称，则作为初始查询
// 如果有来自最近一次写样板流程的预设搜索词，则作为初始查询
try {
String recent = RecipeTypeNameConfig.lastProcessingName;
String recent = RecipeTypeNameConfig.consumeLastProviderSearchKey();
if (recent != null && !recent.isBlank()) {
this.query = recent;
this.autoUploadRequestedFromProcessingName = true;
// 用后即清空，避免污染下次
RecipeTypeNameConfig.lastProcessingName = null;
this.autoUploadRequestedFromPresetSearch = true;
}
} catch (Throwable ignored) {}
buildGroups();
@ -401,7 +399,7 @@ public class ProviderSelectScreen extends Screen {
}
private void tryAutoUploadIfUniqueMatch() {
if (!autoUploadRequestedFromProcessingName || autoUploadAttempted) {
if (!autoUploadRequestedFromPresetSearch || autoUploadAttempted) {
return;
}
autoUploadAttempted = true;

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

@ -30,8 +30,10 @@ public abstract class EncodePatternTransferHandlerMixin {
if (!doTransfer) return;
String name = null;
if (recipeBase instanceof Recipe<?> recipe) {
// 仅记录处理配方（非 3x3 合成）
if (EncodingHelper.isSupportedCraftingRecipe(recipe)) return;
if (EncodingHelper.isSupportedCraftingRecipe(recipe)) {
RecipeTypeNameConfig.presetCraftingProviderSearchKey();
return;
}
name = RecipeTypeNameConfig.mapRecipeTypeToSearchKey(recipe);
} else if (recipeBase != null &&
"com.gregtechceu.gtceu.api.recipe.GTRecipe".equals(recipeBase.getClass().getName())) {

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

@ -42,10 +42,32 @@ public final class RecipeTypeNameConfig {
private RecipeTypeNameConfig() {}
// 最近一次通过 JEI 填充到编码终端的“处理配方”的中文名称（如：烧炼/高炉/烟熏...）
public static volatile String lastProcessingName = null;
// 最近一次打开供应器选择界面时的预设搜索关键字。
// 处理样板会写入映射后的配方类型关键字，合成样板固定使用 crafting（可通过映射改名）。
public static final String DEFAULT_CRAFTING_SEARCH_KEY = "crafting";
private static volatile String lastProviderSearchKey = null;
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;
}
/**
@ -240,14 +262,25 @@ public final class RecipeTypeNameConfig {
* @param recipe 配方对象
* @return 搜索关键字（自定义名称、别名或类型路径），或 null 如果无效
*/
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());
return alias != null && !alias.isBlank() ? alias : 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;
String path = key.getPath().toLowerCase();
// 优先查别名，再查完整 ID，最后用路径
return CUSTOM_ALIASES.getOrDefault(path, CUSTOM_NAMES.getOrDefault(key, path));
String resolvedPath = resolveSearchKeyAlias(key.getPath());
if (resolvedPath != null) {
return resolvedPath;
}
String custom = CUSTOM_NAMES.get(key);
return custom != null && !custom.isBlank() ? custom : key.getPath();
}
/**
@ -269,7 +302,7 @@ public final class RecipeTypeNameConfig {
// 1) 别名优先（使用 path 作为最终搜索关键字）
String path = rl.getPath();
if (path != null) {
String alias = CUSTOM_ALIASES.get(path.toLowerCase());
String alias = resolveSearchKeyAlias(path);
if (alias != null && !alias.isBlank()) return alias;
}
// 2) 再查完整ID映射