Skip to content

Commit b816bd3

Browse files
Circulate233Circulate233
committed
修复bug
1 parent 5fa083b commit b816bd3

File tree

3 files changed

+40
-30
lines changed

3 files changed

+40
-30
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ dependencies {
248248
implementation(rfg.deobf("curse.maven:FTB-Library-237167:2985811"))
249249
implementation(rfg.deobf("curse.maven:FTBU-237102:3157548"))
250250
implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098"))
251-
implementation(rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5504001"))
251+
implementation(rfg.deobf("curse.maven:ae2fluidcraft-rework-unofficial-1404390:7336029"))
252252
compileOnly(rfg.deobf("curse.maven:MekanismEnergistics-1027681:5775101"))
253253
implementation(rfg.deobf("curse.maven:nae2-884359:5380800"))
254254
// implementation(rfg.deobf("curse.maven:applied-energistics-2-223794:2747063"))

‎src/main/java/github/kasuminova/novaeng/common/machine/drills/Drill.kt‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,7 @@ abstract class Drill : MachineSpecial {
169169
}
170170

171171
private fun getUsableMix(worldInfo: MineralWorldInfo): MineralMix? {
172-
return if (worldInfo.mineralOverride != null) {
173-
worldInfo.mineralOverride
174-
} else {
175-
worldInfo.mineral
176-
}
172+
return worldInfo.mineralOverride ?: worldInfo.mineral
177173
}
178174
}
179175

@@ -252,7 +248,7 @@ abstract class Drill : MachineSpecial {
252248
.addEnergyPerTickInput(this.getBaseEnergy())
253249
.addInput(circuit_0).setChance(0f)
254250
.addPreCheckHandler { event ->
255-
val ctrl = event!!.getController()
251+
val ctrl = event.getController()
256252
val data = ctrl.customDataTag
257253
if (!data.hasKey("pos")) {
258254
event.setFailed("novaeng.drill.failed.pos")
@@ -284,7 +280,7 @@ abstract class Drill : MachineSpecial {
284280
ctrl.customDataTag = data
285281
}
286282
.addFactoryStartHandler { event ->
287-
val ctrl = event!!.getController()
283+
val ctrl = event.getController()
288284
val data = ctrl.customDataTag
289285
val kmm = data.getString("kmm11")
290286
val x: Int
@@ -356,7 +352,7 @@ abstract class Drill : MachineSpecial {
356352
.addEnergyPerTickInput(this.getBaseEnergy() * 2)
357353
.addInput(itemUtils.getItem("thermalinnovation:drill", 4)).setChance(0f)
358354
.addPreCheckHandler { event ->
359-
val ctrl = event!!.getController()
355+
val ctrl = event.getController()
360356
val data = ctrl.customDataTag
361357
if (!data.hasKey("pos")) {
362358
event.setFailed("novaeng.drill.failed.pos")
@@ -388,7 +384,7 @@ abstract class Drill : MachineSpecial {
388384
ctrl.customDataTag = data
389385
}
390386
.addFactoryStartHandler { event ->
391-
val ctrl = event!!.getController()
387+
val ctrl = event.getController()
392388
val data = ctrl.customDataTag
393389
val kmm = data.getString("kmm11")
394390
val x: Int
@@ -468,7 +464,7 @@ abstract class Drill : MachineSpecial {
468464
.setLoadJEI(false)
469465
.addEnergyPerTickInput(this.getBaseEnergy())
470466
.addPreCheckHandler { event ->
471-
val ctrl = event!!.getController()
467+
val ctrl = event.getController()
472468
val data = ctrl.customDataTag
473469
val kmm = data.getString("kmm$k$kk")
474470
val depletion = data.getInteger("depletion$k$kk")
@@ -483,7 +479,7 @@ abstract class Drill : MachineSpecial {
483479
}
484480
}
485481
.addFactoryStartHandler { event ->
486-
val ctrl = event!!.getController()
482+
val ctrl = event.getController()
487483
val data = ctrl.customDataTag
488484
data.getString("kmm$k$kk")
489485
val x: Int
@@ -550,7 +546,7 @@ abstract class Drill : MachineSpecial {
550546
.setLoadJEI(false)
551547
.addEnergyPerTickInput(this.getBaseEnergy() * 2)
552548
.addPreCheckHandler { event ->
553-
val ctrl = event!!.getController()
549+
val ctrl = event.getController()
554550
val data = ctrl.customDataTag
555551
val kmm = data.getString("kmm$k$kk")
556552
val depletion = data.getInteger("depletion$k$kk")
@@ -566,7 +562,7 @@ abstract class Drill : MachineSpecial {
566562
event.activeRecipe.maxParallelism = 8
567563
}
568564
.addFactoryStartHandler { event ->
569-
val ctrl = event!!.getController()
565+
val ctrl = event.getController()
570566
val data = ctrl.customDataTag
571567
data.getString("kmm$k$kk")
572568
val x: Int
@@ -637,7 +633,7 @@ abstract class Drill : MachineSpecial {
637633
SINGLE -> machine.addMachineEventHandler(
638634
MachineStructureFormedEvent::class.java
639635
) { event ->
640-
val ctrl = event!!.getController()
636+
val ctrl = event.getController()
641637
val data = ctrl.customDataTag
642638
val x = ctrl.getPos().x
643639
val z = ctrl.getPos().z
@@ -661,7 +657,7 @@ abstract class Drill : MachineSpecial {
661657
RANGE -> machine.addMachineEventHandler(
662658
MachineStructureFormedEvent::class.java
663659
) { event ->
664-
val ctrl = event!!.getController()
660+
val ctrl = event.getController()
665661
val data = ctrl.customDataTag
666662
val x = ctrl.getPos().x
667663
val z = ctrl.getPos().z
@@ -697,7 +693,7 @@ abstract class Drill : MachineSpecial {
697693
SINGLE -> machine.addMachineEventHandler(
698694
ControllerGUIRenderEvent::class.java
699695
) { event ->
700-
val ctrl = event!!.getController()
696+
val ctrl = event.getController()
701697
val data = ctrl.customDataTag
702698
val research_progress = data.getByte("research_progress")
703699
val components_amount = data.getByte("components_amount")
@@ -724,7 +720,7 @@ abstract class Drill : MachineSpecial {
724720
RANGE -> machine.addMachineEventHandler(
725721
ControllerGUIRenderEvent::class.java
726722
) { event ->
727-
val ctrl = event!!.getController()
723+
val ctrl = event.getController()
728724
val data = ctrl.customDataTag
729725
val research_progress = data.getByte("research_progress")
730726
val components_amount = data.getByte("components_amount")
@@ -784,13 +780,13 @@ abstract class Drill : MachineSpecial {
784780
}
785781
.addOutput(itemUtils.getItem("contenttweaker:zbk", 0))
786782
.addPreCheckHandler { event ->
787-
val ctrl = event!!.getController()
783+
val ctrl = event.getController()
788784
if (ctrl.isWorking) {
789785
event.setFailed("novaeng.machine.failed.work")
790786
}
791787
}
792788
.addFactoryStartHandler { event ->
793-
val ctrl = event!!.getController()
789+
val ctrl = event.getController()
794790
val data = ctrl.customDataTag
795791
val poss = data.getIntArray("poss")
796792
val world = DimensionManager.getWorld(poss[3])
@@ -833,6 +829,7 @@ abstract class Drill : MachineSpecial {
833829
}
834830
data.setIntArray("pos", poss)
835831
}
832+
.setLoadJEI(false)
836833
.setParallelized(false)
837834
.setThreadName(upThreadName)
838835
.build()
@@ -845,7 +842,7 @@ abstract class Drill : MachineSpecial {
845842

846843
RecipeBuilder.newBuilder("research_mineral_utilization_" + name + "_" + i, name, 10)
847844
.addPreCheckHandler { event ->
848-
val ctrl = event!!.getController()
845+
val ctrl = event.getController()
849846
val data = ctrl.customDataTag
850847
data.getByte("research_progress")
851848
data.getByte("components_amount")
@@ -855,7 +852,7 @@ abstract class Drill : MachineSpecial {
855852
}
856853
}
857854
.addFactoryFinishHandler { event ->
858-
val ctrl = event!!.getController()
855+
val ctrl = event.getController()
859856
val data = ctrl.customDataTag
860857
val research_progress = data.getByte("research_progress")
861858

@@ -880,7 +877,7 @@ abstract class Drill : MachineSpecial {
880877
RecipeBuilder.newBuilder("additional_component_loading_" + name + "_" + i, name, 100, 1)
881878
.addItemInput(itemUtils.getItem("contenttweaker:additional_component_$i", 0))
882879
.addPreCheckHandler { event ->
883-
val ctrl = event!!.getController()
880+
val ctrl = event.getController()
884881
val data = ctrl.customDataTag
885882
data.getByte("research_progress")
886883
data.getByte("components_amount")
@@ -890,7 +887,7 @@ abstract class Drill : MachineSpecial {
890887
}
891888
}
892889
.addFactoryFinishHandler { event ->
893-
val ctrl = event!!.getController()
890+
val ctrl = event.getController()
894891
val data = ctrl.customDataTag
895892
val components_amount = data.getByte("components_amount")
896893

@@ -927,7 +924,7 @@ abstract class Drill : MachineSpecial {
927924
RecipeBuilder.newBuilder("additional_component_loading_" + name + "_3", name, 100, 1)
928925
.addItemInput(itemUtils.getItem("contenttweaker:additional_component_3", 0))
929926
.addPreCheckHandler { event ->
930-
val ctrl = event!!.getController()
927+
val ctrl = event.getController()
931928
val data = ctrl.customDataTag
932929
data.getByte("research_progress")
933930
data.getByte("components_amount")
@@ -937,7 +934,7 @@ abstract class Drill : MachineSpecial {
937934
}
938935
}
939936
.addFactoryFinishHandler { event ->
940-
val ctrl = event!!.getController()
937+
val ctrl = event.getController()
941938
val data = ctrl.customDataTag
942939
val components_amount = data.getByte("components_amount")
943940
val research_progress = data.getByte("research_progress")
@@ -969,7 +966,7 @@ abstract class Drill : MachineSpecial {
969966
RecipeBuilder.newBuilder("additional_component_loading_" + name + "_raw_ore", name, 100, 1)
970967
.addItemInput(itemUtils.getItem("contenttweaker:additional_component_raw_ore", 0))
971968
.addPreCheckHandler { event ->
972-
val ctrl = event!!.getController()
969+
val ctrl = event.getController()
973970
val data = ctrl.customDataTag
974971
data.getByte("research_progress")
975972
data.getByte("components_amount")
@@ -979,7 +976,7 @@ abstract class Drill : MachineSpecial {
979976
}
980977
}
981978
.addFactoryFinishHandler { event ->
982-
val ctrl = event!!.getController()
979+
val ctrl = event.getController()
983980
val data = ctrl.customDataTag
984981
data.setBoolean("additional_component_raw_ore", true)
985982
ctrl.addPermanentModifier(

‎src/main/java/github/kasuminova/novaeng/mixin/ae2/MixinCraftingCPUClusterTwo.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@
2727
import com.circulation.random_complement.client.buttonsetting.IntelligentBlocking;
2828
import com.circulation.random_complement.common.interfaces.RCIConfigurableObject;
2929
import com.glodblock.github.coremod.CoreModHooks;
30+
import com.glodblock.github.integration.mek.FCGasItems;
3031
import com.glodblock.github.inventory.FluidConvertingInventoryCrafting;
32+
import com.glodblock.github.loader.FCItems;
3133
import com.glodblock.github.util.FluidCraftingPatternDetails;
34+
import com.glodblock.github.util.ModAndClassUtil;
3235
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
3336
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
3437
import github.kasuminova.mmce.common.tile.MEPatternProvider;
@@ -164,10 +167,20 @@ private void executeCrafting(IEnergyGrid eg, CraftingGridCache cc) {
164167
if (ic == null) {
165168
IAEItemStack[] input = key.getInputs();
166169
double sum = 0;
167-
168170
for (IAEItemStack anInput : input) {
169171
if (anInput != null) {
170-
sum += (double) CoreModHooks.getFluidSize(anInput);
172+
if (anInput.getDefinition() != null && !anInput.getDefinition().isEmpty()) {
173+
if (anInput.getDefinition().getItem() == FCItems.FLUID_DROP) {
174+
sum += Math.max((double)anInput.getStackSize() / (double)1000.0F, (double)1.0F);
175+
continue;
176+
}
177+
178+
if (ModAndClassUtil.GAS && anInput.getDefinition().getItem() == FCGasItems.GAS_DROP) {
179+
sum += Math.max((double)anInput.getStackSize() / (double)4000.0F, (double)1.0F);
180+
continue;
181+
}
182+
}
183+
sum += anInput.getStackSize();
171184
}
172185
}
173186

0 commit comments

Comments
 (0)