diff options
| author | GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> | 2023-02-12 17:29:37 +0000 |
|---|---|---|
| committer | GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> | 2023-02-12 17:29:37 +0000 |
| commit | a64df3adf9ef4025d09326ebf78d92bf0bf3a6dc (patch) | |
| tree | 8cde0bce50cada95a729f3631de25aa9c22c38f4 | |
| parent | d01a31a7f92e6d04e5531093cded4c4741a3d67a (diff) | |
| download | GT5-Unofficial-a64df3adf9ef4025d09326ebf78d92bf0bf3a6dc.tar.gz GT5-Unofficial-a64df3adf9ef4025d09326ebf78d92bf0bf3a6dc.tar.bz2 GT5-Unofficial-a64df3adf9ef4025d09326ebf78d92bf0bf3a6dc.zip | |
Fix some EOH stuff
2 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java index 074163d9ae..99f25832eb 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -145,12 +145,12 @@ public class EyeOfHarmonyRecipe { // Tier 8 - 576 Universium // Tier 9 - 2304 Universium - if (rocketTierOfRecipe <= 3) { + if (rocketTierOfRecipe <= 2) { fluidStackArrayList.add(Materials.WhiteDwarfMatter.getMolten(576L * pow(4, (int) rocketTierOfRecipe))); } - if ((4 <= rocketTierOfRecipe) && (rocketTierOfRecipe <= 7)) { - fluidStackArrayList.add(Materials.BlackDwarfMatter.getMolten(576L * pow(4, (int) rocketTierOfRecipe - 4))); + if ((3 <= rocketTierOfRecipe) && (rocketTierOfRecipe <= 7)) { + fluidStackArrayList.add(Materials.BlackDwarfMatter.getMolten(576L * pow(4, (int) rocketTierOfRecipe - 3))); } if (rocketTierOfRecipe >= 8) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 51cfa1745f..8183ca8404 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -58,7 +58,7 @@ import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable, IGlobalWirelessEnergy, ISurvivalConstructable { - private static final boolean EOH_DEBUG_MODE = false; + private static final boolean EOH_DEBUG_MODE = true; private boolean disableAnimation = false; // Region variables. @@ -1008,14 +1008,6 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl currentRecipe = eyeOfHarmonyRecipeStorage.recipeLookUp(aStack); if (processRecipe(currentRecipe)) { - // Get circuit damage, clamp it and then use it later for overclocking. - ItemStack circuit = mInputBusses.get(0).getStackInSlot(0); - if (circuit != null) { - currentCircuitMultiplier = Math.max(0, Math.min(circuit.getItemDamage(), 24)); - } else { - currentCircuitMultiplier = 0; - } - return true; } @@ -1034,6 +1026,14 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl public boolean processRecipe(EyeOfHarmonyRecipe recipeObject) { + // Get circuit damage, clamp it and then use it later for overclocking. + ItemStack circuit = mInputBusses.get(0).getStackInSlot(0); + if (circuit != null) { + currentCircuitMultiplier = (long) clamp(circuit.getItemDamage(), 0, 24); + } else { + currentCircuitMultiplier = 0; + } + // Debug mode, overwrites the required fluids to initiate the recipe to 100L of each. if (EOH_DEBUG_MODE) { if ((getHydrogenStored() < 100) || (getHeliumStored() < 100)) { |