Skip to content

Commit 487eff9

Browse files
committed
补上丢失的生命萃取祭坛配方...
1 parent d049d72 commit 487eff9

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

src/main/java/github/kasuminova/novaeng/common/CommonProxy.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import github.kasuminova.novaeng.common.machine.BiogenicSimulationComputer
4040
import github.kasuminova.novaeng.common.machine.DreamEnergyCore
4141
import github.kasuminova.novaeng.common.machine.GeocentricDrill
4242
import github.kasuminova.novaeng.common.machine.IllumPool
43+
import github.kasuminova.novaeng.common.machine.LifeExtractsAltar
4344
import github.kasuminova.novaeng.common.machine.MMAltar
4445
import github.kasuminova.novaeng.common.machine.MaterialSequenceProcessing
4546
import github.kasuminova.novaeng.common.machine.SingularityCore
@@ -139,6 +140,7 @@ open class CommonProxy : IGuiHandler {
139140
}
140141
if (Mods.BM2.isPresent) {
141142
RegistryMachineSpecial.registrySpecialMachine(MMAltar)
143+
RegistryMachineSpecial.registrySpecialMachine(LifeExtractsAltar)
142144
}
143145
RegistryMachineSpecial.registrySpecialMachine(DreamEnergyCore.INSTANCE)
144146
RegistryMachineSpecial.registrySpecialMachine(GeocentricDrill.INSTANCE)
@@ -204,7 +206,7 @@ open class CommonProxy : IGuiHandler {
204206

205207
GuiType.EFABRICATOR_CONTROLLER -> {
206208
val efController = present as? EFabricatorController
207-
return if (efController != null && efController.channel != null && ModIntegrationAE2.securityCheck(
209+
if (efController != null && efController.channel != null && ModIntegrationAE2.securityCheck(
208210
player, efController.channel!!.proxy
209211
)
210212
) {
@@ -214,7 +216,7 @@ open class CommonProxy : IGuiHandler {
214216

215217
GuiType.EFABRICATOR_PATTERN_SEARCH -> {
216218
val efController = present as? EFabricatorController
217-
return if (efController != null && efController.channel != null && ModIntegrationAE2.securityCheck(
219+
if (efController != null && efController.channel != null && ModIntegrationAE2.securityCheck(
218220
player, efController.channel!!.proxy
219221
)
220222
) {
@@ -225,7 +227,7 @@ open class CommonProxy : IGuiHandler {
225227
GuiType.EFABRICATOR_PATTERN_BUS -> {
226228
val efPatternBus = present as? EFabricatorPatternBus
227229
val efController = efPatternBus?.controller
228-
return if (efController != null && efController.channel != null && ModIntegrationAE2.securityCheck(
230+
if (efController != null && efController.channel != null && ModIntegrationAE2.securityCheck(
229231
player, efController.channel!!.proxy
230232
)
231233
) {
@@ -240,7 +242,7 @@ open class CommonProxy : IGuiHandler {
240242

241243
GuiType.ECALCULATOR_CONTROLLER -> {
242244
val ecController = present as ECalculatorController?
243-
return if (ecController != null && ecController.channel != null && ModIntegrationAE2.securityCheck(
245+
if (ecController != null && ecController.channel != null && ModIntegrationAE2.securityCheck(
244246
player, ecController.channel.getProxy()
245247
)
246248
) {
@@ -255,7 +257,7 @@ open class CommonProxy : IGuiHandler {
255257
MEHandler.getTerminalGuiObject(stack, player, x, y)?.let {
256258
return ContainerNEWCraftConfirm(player.inventory, it)
257259
}
258-
return null
260+
null
259261
}
260262

261263
GuiType.MACHINE_ASSEMBLY_TOOL -> null

src/main/java/github/kasuminova/novaeng/common/mod/Mods.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ public enum Mods {
88
AE2EL("appliedenergistics2") {
99
@Override
1010
public boolean loaded() {
11-
if (initialized) {
12-
return loaded;
11+
if (this.initialized) {
12+
return this.loaded;
1313
}
14-
initialized = true;
14+
this.initialized = true;
1515
if (!super.loaded()) {
16-
return loaded = false;
16+
return this.loaded = false;
1717
}
1818
try {
1919
Class.forName("appeng.core.AE2ELCore");
20-
return loaded = true;
20+
return this.loaded = true;
2121
} catch (Exception e) {
22-
return loaded = false;
22+
return this.loaded = false;
2323
}
2424
}
2525
},
@@ -31,16 +31,16 @@ public boolean loaded() {
3131
if (!MEK.loaded()) {
3232
return false;
3333
}
34-
if (initialized) {
35-
return loaded;
34+
if (this.initialized) {
35+
return this.loaded;
3636
}
3737

3838
try {
3939
Class.forName("mekanism.common.config.MEKCEConfig");
40-
initialized = true;
41-
return loaded = true;
40+
this.initialized = true;
41+
return this.loaded = true;
4242
} catch (Throwable e) {
43-
return loaded = false;
43+
return this.loaded = false;
4444
}
4545
}
4646
};
@@ -54,11 +54,11 @@ public boolean loaded() {
5454
}
5555

5656
public boolean loaded() {
57-
if (!initialized) {
58-
loaded = Loader.isModLoaded(modID);
59-
initialized = true;
57+
if (!this.initialized) {
58+
this.loaded = Loader.isModLoaded(this.modID);
59+
this.initialized = true;
6060
}
61-
return loaded;
61+
return this.loaded;
6262
}
6363

6464
}

0 commit comments

Comments
 (0)