diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_MegaCraftingCenter.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_MegaCraftingCenter.java index e2e4f08b..8c038c39 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_MegaCraftingCenter.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_MegaCraftingCenter.java @@ -243,14 +243,28 @@ public void securityBreak() { @Override protected boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { + maintenance_EM(); if (structureCheck_EM("MAIN", 3, 3, 0)) { return !mInputBusses.isEmpty() && !mOutputBusses.isEmpty() - && (!mEnergyHatches.isEmpty() || !eEnergyMulti.isEmpty()) - && !mMaintenanceHatches.isEmpty(); + && (!mEnergyHatches.isEmpty() || !eEnergyMulti.isEmpty()); } return false; } + protected void maintenance_EM() { + mWrench = true; + mScrewdriver = true; + mSoftHammer = true; + mHardHammer = true; + mSolderingTool = true; + mCrowbar = true; + } + + @Override + public boolean doRandomMaintenanceDamage() { + return true; + } + @NotNull public DimensionalCoord getLocation() { return new DimensionalCoord( @@ -364,15 +378,21 @@ protected GT_Multiblock_Tooltip_Builder createTooltip() { .addInfo(TextEnums.tr("tst.megacraftingcenter.desc.2")) .addInfo(TextEnums.tr("tst.megacraftingcenter.desc.3")) .addInfo(TextEnums.tr("tst.megacraftingcenter.desc.4")) - .addStructureInfo(Text_SeparatingLine) + // #tr tst.megacraftingcenter.desc.5 + // # There is a performance issue when checking pattern. Please use with caution. + // #zh_CN 当前检查样板功能存在性能问题. 谨慎使用. + .addInfo(TextEnums.tr("tst.megacraftingcenter.desc.5")) + .addInfo(Text_SeparatingLine) .toolTipFinisher(ModName); return tt; } public static ItemStack[] convertAEToMC(IAEItemStack[] STACK) { + // TODO use normal code style instead `Stream` return Arrays.stream(STACK) .filter(Objects::nonNull) .map(IAEItemStack::getItemStack) .toArray(ItemStack[]::new); } + } diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_StarcoreMiner.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_StarcoreMiner.java index db208db6..895419c2 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_StarcoreMiner.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_StarcoreMiner.java @@ -493,16 +493,16 @@ protected GT_Multiblock_Tooltip_Builder createTooltip() { // #zh_CN 结构中采矿通道部分需要至少延伸至高度20以下. .addInfo(TextEnums.tr("Tooltip_Starcore_08")) // #tr Tooltip_Starcore_Crash_20240606 - // # There is a serious bug in the blueprint automatic construction function of this machine, - // #zh_CN {\RED}{\BOLD}此机器的蓝图自动搭建功能出现严重bug, + // # There is a serious bug in the blueprint automatic construction function of borosilicate glass, + // #zh_CN {\RED}{\BOLD}蓝图自动搭建硼玻璃功能发现严重bug, .addInfo(TextEnums.tr("Tooltip_Starcore_Crash_20240606")) // #tr Tooltip_Starcore_Crash_20240606_02 // # {\RED}{\BOLD}{\SPACE}which may cause the save file to crash and become inaccessible. // #zh_CN {\RED}{\BOLD}{\SPACE}可能导致存档崩溃无法进入. .addInfo(TextEnums.tr("Tooltip_Starcore_Crash_20240606_02")) // #tr Tooltip_Starcore_Crash_20240606_03 - // # In case of emergency, you can install ZeroPointBugFix-0.4.1 mod for temporary fix. - // #zh_CN {\RED}紧急情况可安装 ZeroPointBugFix-0.4.1 mod临时修复. + // # In case of emergency, you can install ZeroPointBugFix mod for temporary fix. + // #zh_CN {\RED}紧急情况可安装 ZeroPointBugFix mod 临时修复. .addInfo(TextEnums.tr("Tooltip_Starcore_Crash_20240606_03")) .addInfo(TextLocalization.Tooltips_JoinWirelessNetWithoutEnergyHatch) .addSeparator() diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/multiMachineClasses/GTCM_MultiMachineBase.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/multiMachineClasses/GTCM_MultiMachineBase.java index 408556e9..c33fd2a5 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/multiMachineClasses/GTCM_MultiMachineBase.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/multiMachineClasses/GTCM_MultiMachineBase.java @@ -486,5 +486,10 @@ public boolean supportsSingleRecipeLocking() { return true; } + @Override + public int getRecipeCatalystPriority() { + return -1; + } + // endregion } diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/recipeMap/GTCMRecipe.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/recipeMap/GTCMRecipe.java index 0be5b6dc..ffb2c3ba 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/common/recipeMap/GTCMRecipe.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/common/recipeMap/GTCMRecipe.java @@ -204,6 +204,9 @@ public class GTCMRecipe { .disableOptimize() .build(); + // #tr tst.recipe.MassFabricatorGenesis + // # Mass Fabricator : Genesis + // #zh_CN 质量发生器 : 创世纪 public static final RecipeMap MassFabricatorGenesis = RecipeMapBuilder .of("tst.recipe.MassFabricatorGenesis", TST_RecipeMapBackend::new) .maxIO(1, 0, 0, 1) diff --git a/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang b/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang index 9c637888..e3e94b89 100644 --- a/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang +++ b/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang @@ -1253,9 +1253,9 @@ Tooltip_IndistinctTentaclePrototypeMK2_02_01= Only §cPerfect Execution Core InstallingModuleNearControllerImproveMachine=Installing module hatches near the controller block can significantly improve machine performance. NameIndistinctTentaclePrototypeMK2=§8§lIndistinct Tentacle §rPrototype MK-II Waila.PerfectExecutionCore.ThisExecutionCore=This Execution Core -Tooltip_Starcore_Crash_20240606=There is a serious bug in the blueprint automatic construction function of this machine, +Tooltip_Starcore_Crash_20240606=There is a serious bug in the blueprint automatic construction function of borosilicate glass, Tooltip_Starcore_Crash_20240606_02=§c§l which may cause the save file to crash and become inaccessible. -Tooltip_Starcore_Crash_20240606_03=In case of emergency, you can install ZeroPointBugFix-0.4.1 mod for temporary fix. +Tooltip_Starcore_Crash_20240606_03=In case of emergency, you can install ZeroPointBugFix mod for temporary fix. GTCM_LightningSpire_11=§nOtherwise all internal lightning rods will be lost! Tooltip_MassFabricatorGenesis_MachineType=§fModularized Machine §7- §eNeutron Activator Tooltip_MassFabricatorGenesis_01=§9§o“Even though the future seems far away, it is actually beginning right now.” @@ -1280,3 +1280,5 @@ Tooltip_IncompactCyclotron_04="That's incredible!" Tooltip_IncompactCyclotron_05=Thanks to the upgrade of technology Tooltip_IncompactCyclotron_06=The accelerator upgraded 100%% speedup and 256 parallel Tooltip_IncompactCyclotron_07=But it requires additional 60%% of power to work +tst.megacraftingcenter.desc.5=There is a performance issue when checking pattern. Please use with caution. +tst.recipe.MassFabricatorGenesis=Mass Fabricator : Genesis diff --git a/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang b/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang index 792230cd..cea6b872 100644 --- a/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang +++ b/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang @@ -1253,9 +1253,9 @@ Tooltip_IndistinctTentaclePrototypeMK2_02_01= 只可安装 §c完美执行核 InstallingModuleNearControllerImproveMachine=在主机附近安装模块仓室可以显著提升机器性能. NameIndistinctTentaclePrototypeMK2=§8§l不可视之触§r原型机MK-II Waila.PerfectExecutionCore.ThisExecutionCore=此执行核心 -Tooltip_Starcore_Crash_20240606=§c§l此机器的蓝图自动搭建功能出现严重bug, +Tooltip_Starcore_Crash_20240606=§c§l蓝图自动搭建硼玻璃功能发现严重bug, Tooltip_Starcore_Crash_20240606_02=§c§l 可能导致存档崩溃无法进入. -Tooltip_Starcore_Crash_20240606_03=§c紧急情况可安装 ZeroPointBugFix-0.4.1 mod临时修复. +Tooltip_Starcore_Crash_20240606_03=§c紧急情况可安装 ZeroPointBugFix mod 临时修复. GTCM_LightningSpire_11=§n否则会丢失所有内部避雷针！ Tooltip_MassFabricatorGenesis_MachineType=§f模块化机械 §7- §e质量发生器 Tooltip_MassFabricatorGenesis_01=§9§o“虽然未来似乎很遥远，但其实已经开始了。” @@ -1280,3 +1280,5 @@ Tooltip_IncompactCyclotron_04=这太神奇了！ Tooltip_IncompactCyclotron_05=得益于工艺的升级 Tooltip_IncompactCyclotron_06=加速器拥有了额外100％的额外加速,以及256并行 Tooltip_IncompactCyclotron_07=但是需要额外60%%的供电来运行 +tst.megacraftingcenter.desc.5=当前检查样板功能存在性能问题. 谨慎使用. +tst.recipe.MassFabricatorGenesis=质量发生器 : 创世纪