Skip to content

Commit 6d26ac5

Browse files
authored
Merge pull request #1065 from Nxer/cleanroom
fix cleanroom
2 parents 4171f02 + 772fa2f commit 6d26ac5

File tree

3 files changed

+28
-19
lines changed

3 files changed

+28
-19
lines changed

src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_CleanRoom.java

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import com.Nxer.TwistSpaceTechnology.common.machine.multiMachineClasses.TT_MultiMachineBase_EM;
2828
import com.Nxer.TwistSpaceTechnology.util.TextLocalization;
29+
import com.gtnewhorizon.gtnhlib.capability.Capabilities;
2930
import com.gtnewhorizon.structurelib.StructureLibAPI;
3031
import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
3132
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
@@ -147,7 +148,7 @@ public String[] getStructureDescription(ItemStack itemStack) {
147148
@Nonnull
148149
@Override
149150
public CheckRecipeResult checkProcessing_EM() {
150-
mEfficiencyIncrease = 100;
151+
mEfficiency = 10000;
151152

152153
// negate it to trigger the special energy consumption function. divide by 10 to get the actual final
153154
// consumption.
@@ -197,7 +198,7 @@ public CheckRecipeResult checkProcessing_EM() {
197198
}
198199

199200
return ePowerPass ? SimpleCheckRecipeResult.ofSuccess("routing")
200-
: SimpleCheckRecipeResult.ofFailure("running fine");
201+
: SimpleCheckRecipeResult.ofSuccess("running fine");
201202
}
202203

203204
@Override
@@ -359,14 +360,14 @@ else if (Math.abs(dX) < x) // on side parallel to x axis
359360
}
360361
}
361362
}
362-
if (this.mMaintenanceHatches.size() != 1 || this.mEnergyHatches.size() != 1
363-
|| mDoorCount > 4
364-
|| mHullCount > 10) {
365-
if (debugCleanroom) {
366-
GTLog.out.println("Cleanroom: Incorrect number of doors, hulls, or hatches.");
367-
}
368-
return false;
369-
}
363+
// if (this.mEnergyHatches.size() != 1
364+
// || mDoorCount > 4
365+
// || mHullCount > 10) {
366+
// if (debugCleanroom) {
367+
// GTLog.out.println("Cleanroom: Incorrect number of doors, hulls, or hatches.");
368+
// }
369+
// return false;
370+
// }
370371
if (mPlascreteCount < 20) {
371372
if (debugCleanroom) {
372373
GTLog.out.println("Cleanroom: Could not find 20 Plascrete.");
@@ -411,9 +412,18 @@ private void setCleanroomReceivers(int x, int y, int z, IGregTechTileEntity aBas
411412
for (int dX = -x + 1; dX <= x - 1; dX++) {
412413
for (int dZ = -z + 1; dZ <= z - 1; dZ++) for (int dY = -1; dY >= y + 1; dY--) {
413414
TileEntity tTileEntity = aBaseMetaTileEntity.getTileEntityOffset(dX, dY, dZ);
415+
if (tTileEntity == null) {
416+
continue;
417+
}
414418
if (tTileEntity instanceof ICleanroomReceiver receiver) {
415419
receiver.setCleanroom(this);
416420
cleanroomReceivers.add(receiver);
421+
} else { // new cleanroom system with Capabilities
422+
ICleanroomReceiver receiver = Capabilities.getCapability(tTileEntity, ICleanroomReceiver.class);
423+
if (receiver != null) {
424+
receiver.setCleanroom(this);
425+
cleanroomReceivers.add(receiver);
426+
}
417427
}
418428
}
419429
}

src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,7 +2051,7 @@ Tooltip_PrimordialDisjunctus_02=Draw raw auram essence into the arcane containme
20512051
Tooltip_PrimordialDisjunctus_03=parallel = The sum of diffusion cell values (Novice = 1, Adept = 2, Master = 4, Grandmaster = 8)
20522052
Tooltip_PrimordialDisjunctus_04=Min voltage 1A EV, standard overclocks
20532053
Tooltip_PrimordialDisjunctus_05=With the power of technology, this process only requires energy to produce a base amount of 16 primal aspects per parallel every 20 seconds at 1 amp EV
2054-
Tooltip_PrimordialDisjunctus_06=Providing Ordo centi-vis will reduce the flux produced to nothing, flux produced is not affected by muffler tier, while providing Perditio centi-vis will boost primal aspect production up to 200%
2054+
Tooltip_PrimordialDisjunctus_06=Providing Ordo vis(at least 50) will reduce the flux produced to nothing, flux produced is not affected by muffler tier.
20552055
Tooltip_PrimordialDisjunctus_07=This machine maxes out at 1 UMV amp anything more will just void power.
20562056
Tooltip_PrimordialDisjunctus_HatchBusInfo=Replace Magic mechanical blocks in any cabin
20572057
Tooltip_SkypiercerTwoer_MachineType=Essentia Synthesizer
@@ -2185,10 +2185,6 @@ Tooltip_SuperWaterPurifier_01=Water Grade has a§4 12% §7chance each
21852185
Tooltip_SuperWaterPurifier_02=Stable Baryonic Matter has a§4 4% §7chance
21862186
Tooltip_SuperWaterPurifier_03=Maximum of§b 2,000,000,000 §7parallels
21872187
Tooltip_SuperWaterPurifier_04=Each parallel requires 1 UMV amp
2188-
Tooltip_UniversalGenerator_00=Has§6 2§7 modes: Gas | Fuel
2189-
Tooltip_UniversalGenerator_01=Maximum§6 2§7 dynamo hatches
2190-
Tooltip_UniversalGenerator_02=Dynamo hatches§6 Lv-Hv tier§7
2191-
Tooltip_UniversalGenerator_03=Fuel Efficiency:§c 100%§7
21922188
Waila.SBF.0=Recipe Heat
21932189
Tooltip_BloodyHell_3=Also a weird stranger told you that Armok splashes Blood everywhere in the machine.
21942190
Tooltip.InfusionProvider=Infusion Provider
@@ -2264,3 +2260,6 @@ tst.recipe.NetherInterfaceVisualRecipeMap=Nether Interface
22642260
tst.recipe.SuperWaterPurifierVisualRecipeMap=Super Water Purifier
22652261
Tooltip_NetherInterface_02=Build portals and transport the dirty but useful resources of Hell back to you.
22662262
Tooltip_NetherInterface_03=Machine takes 2A IV to maintain the teleporter, and 1A IV per parallel.
2263+
Tooltip_PrimordialDisjunctus_06_01=while providing Perditio vis will boost primal aspect production.Every 10 increase the output by 100%. The maximum increase is 16 times.
2264+
Tooltip_PrimordialDisjunctus_06_02=It should be noted that the supply of VIS is specifically provided through Vis Relay located near the host.
2265+
Tooltip_PrimordialDisjunctus_EssentiaProvider=Since EssentiaHatch has been removed and is now replaced by EssentiaProvider, it is still just a decoration and does not require input.

src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,7 +2051,7 @@ Tooltip_PrimordialDisjunctus_02=将灵气吸引进罐子内然后离心,不幸
20512051
Tooltip_PrimordialDisjunctus_03=并行 = 扩散单元等级的总和 ( 新手=1,学徒=2,大师=4,宗师=8 )
20522052
Tooltip_PrimordialDisjunctus_04=最低使用1A EV, 使用标准超频 ( 即每提升一级电压加工时间减半 )
20532053
Tooltip_PrimordialDisjunctus_05=借助科技的力量, 此过程仅需能量, 在1A EV电压下每20秒每个并行产出16单位基础源质.
2054-
Tooltip_PrimordialDisjunctus_06=提供秩序vis可将咒波污染降为零(与消声仓等级无关),提供混沌vis可提升源质产量最高200%
2054+
Tooltip_PrimordialDisjunctus_06=提供秩序vis(至少50)可将咒波污染降为零(与消声仓等级无关),
20552055
Tooltip_PrimordialDisjunctus_07=本机最高支持1A UMV,超出的电力将被直接浪费.
20562056
Tooltip_PrimordialDisjunctus_HatchBusInfo=任何舱室替换魔法机械方块
20572057
Tooltip_SkypiercerTwoer_MachineType=源质合成者
@@ -2185,9 +2185,6 @@ Tooltip_SuperWaterPurifier_01=每级水有 12% 概率
21852185
Tooltip_SuperWaterPurifier_02=稳定重子物质有 4% 概率
21862186
Tooltip_SuperWaterPurifier_03=最大 2,000,000 并行
21872187
Tooltip_SuperWaterPurifier_04=每并行耗电 1A UMV
2188-
Tooltip_UniversalGenerator_01=最多§6 2§7个动力仓
2189-
Tooltip_UniversalGenerator_02=动力仓等级§6 LV-HV§7
2190-
Tooltip_UniversalGenerator_03=燃料效率:§c 100%§7
21912188
Waila.SBF.0=配方炉温限制
21922189
Tooltip_BloodyHell_3=还有,一个奇怪的陌生人曾对你说过,阿蒙克在机器里会把血溅得到处都是。
21932190
Tooltip.InfusionProvider=注魔供应器
@@ -2263,3 +2260,6 @@ tst.recipe.NetherInterfaceVisualRecipeMap=地狱接口
22632260
tst.recipe.SuperWaterPurifierVisualRecipeMap=Super Water Purifier
22642261
Tooltip_NetherInterface_02=构建传送门, 并将地狱那些肮脏但有用的资源传送回来.
22652262
Tooltip_NetherInterface_03=需要消耗 2A IV 维持传送器, 并且每个并行消耗1A IV.
2263+
Tooltip_PrimordialDisjunctus_06_01=提供混沌vis可提升源质产量,每40点增加100%产量,最高16倍.
2264+
Tooltip_PrimordialDisjunctus_06_02=注意VIS的供应具体来说是通过在主机附近的源质中继器来提供的
2265+
Tooltip_PrimordialDisjunctus_EssentiaProvider=由于EssentiaHatch被删除现在由EssentiaProvide替代,但仍然只是装饰无需输入.

0 commit comments

Comments
 (0)