Skip to content

Commit ccde586

Browse files
Lach01298Lach01298
committedMay 26, 2024·
1.3.4
1 parent c093dc3 commit ccde586

File tree

1 file changed

+73
-17
lines changed

1 file changed

+73
-17
lines changed
 

‎src/main/java/lach_01298/qmd/vacuumChamber/NucleosynthesisChamberLogic.java

+73-17
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ public boolean onUpdateServer()
843843
{
844844
getMultiblock().beams.get(0).setParticleStack(null);
845845
pull();
846-
846+
847847

848848
if ((!getMultiblock().tanks.get(4).isEmpty() || !getMultiblock().tanks.get(5).isEmpty()))
849849
{
@@ -867,13 +867,11 @@ public boolean onUpdateServer()
867867

868868
if (recipeInfo != null)
869869
{
870-
871870
if (rememberedRecipeInfo != null)
872871
{
873872
if (rememberedRecipeInfo.getRecipe() != recipeInfo.getRecipe())
874873
{
875874
particleWorkDone = 0;
876-
startRecipe(); // to void the in use contents to stop infinite power exploit
877875
}
878876
}
879877
rememberedRecipeInfo = recipeInfo;
@@ -885,15 +883,14 @@ public boolean onUpdateServer()
885883
{
886884
startRecipe();
887885
finishRecipe();
888-
889886
}
890887
}
891888
}
892889
else
893-
{
890+
{
891+
particleWorkDone = 0;
894892
casingExternalCooling();
895893
}
896-
897894
}
898895
else
899896
{
@@ -914,6 +911,7 @@ else if (plasmaOn)
914911
{
915912
setPlasma(false);
916913
operational = false;
914+
particleWorkDone = 0;
917915
}
918916

919917

@@ -971,32 +969,90 @@ private void setPlasma(boolean on)
971969

972970
// Recipes
973971

972+
// private void startRecipe()
973+
// {
974+
// if(getMultiblock().tanks.get(4).getFluid() != null)
975+
// {
976+
// if(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack() != null && getMultiblock().tanks.get(4).getFluid().getFluid() == rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack().getFluid())
977+
// {
978+
// getMultiblock().tanks.get(4).drain(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack(), true);
979+
// }
980+
// else if(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack() != null && getMultiblock().tanks.get(4).getFluid().getFluid() == rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack().getFluid())
981+
// {
982+
// getMultiblock().tanks.get(4).drain(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack(), true);
983+
// }
984+
// }
985+
//
986+
// if(getMultiblock().tanks.get(5).getFluid() != null)
987+
// {
988+
// if(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack() != null && getMultiblock().tanks.get(5).getFluid().getFluid() == rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack().getFluid())
989+
// {
990+
// getMultiblock().tanks.get(5).drain(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack(), true);
991+
// }
992+
// else if(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack() != null && getMultiblock().tanks.get(5).getFluid().getFluid() == rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack().getFluid())
993+
// {
994+
// getMultiblock().tanks.get(5).drain(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack(), true);
995+
// }
996+
// }
997+
// }
998+
999+
9741000
private void startRecipe()
9751001
{
976-
if(getMultiblock().tanks.get(4).getFluid() != null)
1002+
loop: if (getMultiblock().tanks.get(4).getFluid() != null)
9771003
{
978-
if(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack() != null && getMultiblock().tanks.get(4).getFluid().getFluid() == rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack().getFluid())
1004+
if (rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0) != null)
9791005
{
980-
getMultiblock().tanks.get(4).drain(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack(), true);
1006+
for (FluidStack fluid : rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getInputStackList())
1007+
{
1008+
if (fluid != null && getMultiblock().tanks.get(4).getFluid().getFluid() == fluid.getFluid())
1009+
{
1010+
getMultiblock().tanks.get(4).drain(fluid, true);
1011+
break loop;
1012+
}
1013+
}
9811014
}
982-
else if(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack() != null && getMultiblock().tanks.get(4).getFluid().getFluid() == rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack().getFluid())
1015+
if (rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1) != null)
9831016
{
984-
getMultiblock().tanks.get(4).drain(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack(), true);
1017+
for (FluidStack fluid : rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getInputStackList())
1018+
{
1019+
if (fluid != null && getMultiblock().tanks.get(4).getFluid().getFluid() == fluid.getFluid())
1020+
{
1021+
getMultiblock().tanks.get(4).drain(fluid, true);
1022+
break loop;
1023+
}
1024+
}
9851025
}
9861026
}
987-
988-
if(getMultiblock().tanks.get(5).getFluid() != null)
1027+
1028+
loop: if (getMultiblock().tanks.get(5).getFluid() != null)
9891029
{
990-
if(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack() != null && getMultiblock().tanks.get(5).getFluid().getFluid() == rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack().getFluid())
1030+
if (rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0) != null)
9911031
{
992-
getMultiblock().tanks.get(5).drain(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getStack(), true);
1032+
for (FluidStack fluid : rememberedRecipeInfo.getRecipe().getFluidIngredients().get(0).getInputStackList())
1033+
{
1034+
if (fluid != null && getMultiblock().tanks.get(5).getFluid().getFluid() == fluid.getFluid())
1035+
{
1036+
getMultiblock().tanks.get(5).drain(fluid, true);
1037+
break loop;
1038+
}
1039+
}
9931040
}
994-
else if(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack() != null && getMultiblock().tanks.get(5).getFluid().getFluid() == rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack().getFluid())
1041+
if (rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1) != null)
9951042
{
996-
getMultiblock().tanks.get(5).drain(rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getStack(), true);
1043+
for (FluidStack fluid : rememberedRecipeInfo.getRecipe().getFluidIngredients().get(1).getInputStackList())
1044+
{
1045+
if (fluid != null && getMultiblock().tanks.get(5).getFluid().getFluid() == fluid.getFluid())
1046+
{
1047+
getMultiblock().tanks.get(5).drain(fluid, true);
1048+
break loop;
1049+
}
1050+
}
9971051
}
9981052
}
1053+
9991054
}
1055+
10001056

10011057

10021058
private void processRecipe()

0 commit comments

Comments
 (0)
Please sign in to comment.