aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBlueWeabo <ilia.iliev2005@gmail.com>2023-08-30 12:05:56 +0300
committerGitHub <noreply@github.com>2023-08-30 11:05:56 +0200
commitc72337be53c20ce1129e755aa46a72335b2226df (patch)
treed6fa8dfe43adc655b3738bb73c9c36d9928a3a3f /src
parent8e6ddecbbf05a6f322f239b9ce1b34af6fd8a5d8 (diff)
downloadGT5-Unofficial-c72337be53c20ce1129e755aa46a72335b2226df.tar.gz
GT5-Unofficial-c72337be53c20ce1129e755aa46a72335b2226df.tar.bz2
GT5-Unofficial-c72337be53c20ce1129e755aa46a72335b2226df.zip
Fix precise assembler not overclocking with amperage and Precise mode having parallels (#207)
* fix precise assembler not overclocking with amperage * fix precise mode having parallels * address review
Diffstat (limited to 'src')
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java22
1 files changed, 20 insertions, 2 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java
index 0102ab8294..3ce10f3b09 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java
@@ -11,6 +11,8 @@ import java.util.Collections;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
+import javax.annotation.Nullable;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
@@ -49,11 +51,13 @@ import gregtech.api.metatileentity.GregTechTileClientEvents;
import gregtech.api.metatileentity.implementations.*;
import gregtech.api.recipe.check.CheckRecipeResult;
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
+import gregtech.api.recipe.check.FindRecipeResult;
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_HatchElementBuilder;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_OverclockCalculator;
import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
import gregtech.common.tileentities.machines.IDualInputHatch;
@@ -221,10 +225,24 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB
@NotNull
@Override
+ protected FindRecipeResult findRecipe(@Nullable GT_Recipe_Map map) {
+ if (map == null) return FindRecipeResult.NOT_FOUND;
+ return map.findRecipeWithResult(
+ lastRecipe,
+ false,
+ false,
+ availableVoltage,
+ inputFluids,
+ specialSlotItem,
+ inputItems);
+ }
+
+ @NotNull
+ @Override
protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
return super.createOverclockCalculator(recipe).setSpeedBoost(mode == 0 ? 1 : 0.5F);
}
- }.setMaxParallelSupplier(() -> (int) Math.pow(2, 4 + (casingTier + 1)));
+ }.setMaxParallelSupplier(() -> mode == 0 ? 1 : (int) Math.pow(2, 4 + (casingTier + 1)));
}
@Override
@@ -232,7 +250,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB
boolean useSingleAmp = mEnergyHatches.size() == 1 && mExoticEnergyHatches.size() == 0;
logic.setAvailableVoltage(getMachineVoltageLimit());
logic.setAvailableAmperage(useSingleAmp ? 1 : getMaxInputAmps());
- logic.setAmperageOC(false);
+ logic.setAmperageOC(true);
}
@Override