diff options
author | Martin Robertz <dream-master@gmx.net> | 2023-02-12 18:48:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-12 18:48:09 +0100 |
commit | 44c2fa1a6f11aa488b00412a77a786ba5339011c (patch) | |
tree | d0cea0fcac7ed5a355a89b0f26761318e0876d03 /src | |
parent | 8d05d21684467424c0d21fce1df0ac45064333aa (diff) | |
parent | ebd09041df4d520eb4414a73c07134872d54cc9a (diff) | |
download | GT5-Unofficial-44c2fa1a6f11aa488b00412a77a786ba5339011c.tar.gz GT5-Unofficial-44c2fa1a6f11aa488b00412a77a786ba5339011c.tar.bz2 GT5-Unofficial-44c2fa1a6f11aa488b00412a77a786ba5339011c.zip |
Merge pull request #152 from GTNewHorizons/FixEOH2
Fix material referencing and some EOH stuff
Diffstat (limited to 'src')
3 files changed, 27 insertions, 27 deletions
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index ee7e902f46..cd93641235 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -5069,8 +5069,8 @@ public class DreamCraftRecipeLoader { ItemList.Field_Generator_UMV.get(16), ItemList.Robot_Arm_UMV.get(16), ItemList.ZPM4.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) }, - new FluidStack[] { FluidUtils.getFluidStack("time", 144_000), - FluidUtils.getFluidStack("space", 144_000), + new FluidStack[] { FluidUtils.getFluidStack("temporalFluid", 144_000), + FluidUtils.getFluidStack("spatialFluid", 144_000), FluidUtils.getFluidStack("molten.metastable oganesson", 144 * 256 * 4), FluidUtils.getFluidStack("molten.shirabon", 144 * 256 * 4), }, CustomItemList.Machine_Multi_EyeOfHarmony.get(1), @@ -5111,7 +5111,7 @@ public class DreamCraftRecipeLoader { new FluidStack[] { Materials.Neutronium.getMolten(144 * 256 * 4), Materials.CosmicNeutronium.getMolten(144 * 256 * 4), - new FluidStack(solderUEV, 144 * 256 * 2), FluidUtils.getFluidStack("space", 1440) }, + new FluidStack(solderUEV, 144 * 256 * 2), FluidUtils.getFluidStack("spatialFluid", 1440) }, CustomItemList.EOH_Reinforced_Spatial_Casing.get(4), 10_000, (int) TierEU.RECIPE_UMV); @@ -5164,7 +5164,7 @@ public class DreamCraftRecipeLoader { getModItem("miscutils", "gtplusplus.blockcasings.5", tier, 8), ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] }, CustomItemList.SpacetimeCompressionFieldGeneratorTier0.get(1), (absoluteTier + 1) * 4_000 * 20, @@ -5190,7 +5190,7 @@ public class DreamCraftRecipeLoader { ME_Singularity, ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] }, CustomItemList.SpacetimeCompressionFieldGeneratorTier1.get(1), (absoluteTier + 1) * 4_000 * 20, @@ -5216,7 +5216,7 @@ public class DreamCraftRecipeLoader { ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier2.get(1), (absoluteTier + 1) * 4_000 * 20, @@ -5245,7 +5245,7 @@ public class DreamCraftRecipeLoader { ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier3.get(1), (absoluteTier + 1) * 4_000 * 20, @@ -5271,7 +5271,7 @@ public class DreamCraftRecipeLoader { ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier4.get(1), (absoluteTier + 1) * 4_000 * 20, @@ -5297,7 +5297,7 @@ public class DreamCraftRecipeLoader { ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier5.get(1), (absoluteTier + 1) * 4_000 * 20, @@ -5326,7 +5326,7 @@ public class DreamCraftRecipeLoader { ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier6.get(1), (absoluteTier + 1) * 4_000 * 20, @@ -5353,7 +5353,7 @@ public class DreamCraftRecipeLoader { ME_Singularity, ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier7.get(1), (absoluteTier + 1) * 4_000 * 20, @@ -5380,7 +5380,7 @@ public class DreamCraftRecipeLoader { ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier8.get(1), set * 16_000 * 20, @@ -5467,7 +5467,7 @@ public class DreamCraftRecipeLoader { }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("time", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("temporalFluid", 1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] }, researchStuff[absoluteTier + 1], (absoluteTier + 1) * 4_000 * 20, @@ -5559,8 +5559,8 @@ public class DreamCraftRecipeLoader { }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), - FluidUtils.getFluidStack("time", 1_440 * (absoluteTier + 1)), - FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("temporalFluid", 1_440 * (absoluteTier + 1)), + FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] }, researchStuff[absoluteTier + 1], (absoluteTier + 1) * 4_000 * 20, @@ -5605,7 +5605,7 @@ public class DreamCraftRecipeLoader { new FluidStack[] { Materials.Neutronium.getMolten(144 * 256 * 4), Materials.CosmicNeutronium.getMolten(144 * 256 * 4), - new FluidStack(solderUEV, 144 * 256 * 2), FluidUtils.getFluidStack("space", 1440) }, + new FluidStack(solderUEV, 144 * 256 * 2), FluidUtils.getFluidStack("spatialFluid", 1440) }, CustomItemList.EOH_Reinforced_Temporal_Casing.get(4), 10_000, (int) TierEU.RECIPE_UMV); 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..6bfc669573 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 @@ -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)) { |