diff options
Diffstat (limited to 'src/main/java/goodgenerator/loader')
4 files changed, 38 insertions, 13 deletions
diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index 36ce938a04..4822ab6067 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -344,7 +344,7 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), (int) TierEU.RECIPE_UEV, 1, - new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1), + new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.ProtoHalkonite, 1), GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), @@ -353,11 +353,12 @@ public class ComponentAssemblyLineMiscRecipes { ComponentType.Electric_Motor.getComponent(t) .get(16), GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 4), - GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 16), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.ProtoHalkonite, 16), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, + StackUtils.getTieredFluid(t, 144 * t), + MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(1000 * (t - 2)) }, Compassline_Casing_UIV.get(1), 50 * SECONDS, (int) TierEU.RECIPE_UEV); @@ -382,7 +383,8 @@ public class ComponentAssemblyLineMiscRecipes { GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t - 1, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, + StackUtils.getTieredFluid(t, 144 * t), + MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(1000 * (t - 2)) }, Compassline_Casing_UMV.get(1), 50 * 20, (int) TierEU.RECIPE_UIV); @@ -416,7 +418,7 @@ public class ComponentAssemblyLineMiscRecipes { getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), MaterialsUEVplus.BlackDwarfMatter.getMolten(144 * t * 2), MaterialsUEVplus.Eternity.getMolten(144 * t), - Materials.Lubricant.getFluid(1000 * (t - 2)) }, + MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(1000 * (t - 2)) }, Compassline_Casing_UXV.get(1), 50 * SECONDS, (int) TierEU.RECIPE_UMV); diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java index 9de6926cf3..38ce27cd8a 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java @@ -3,6 +3,7 @@ package goodgenerator.loader; import static goodgenerator.util.StackUtils.getTotalItems; import static goodgenerator.util.StackUtils.mergeStacks; import static goodgenerator.util.StackUtils.multiplyAndSplitIntoStacks; +import static gregtech.api.enums.GTValues.M; import static gregtech.api.util.GTRecipeConstants.COAL_CASING_TIER; import java.util.ArrayList; @@ -333,8 +334,8 @@ public class ComponentAssemblyLineRecipeLoader { /** * Transforms each {@code ItemStack}, if possible, into a more compact form. For example, a stack of 16 1x cables, - * when passed into the {@code items} array, will be converted into a single 16x cable. Also handles GraviStar and - * neutronium nanite conversion. + * when passed into the {@code items} array, will be converted into a single 16x cable. Also handles GraviStar, + * proto-halkonite fine wire and neutronium nanite conversion. */ private static ArrayList<ItemStack> compactItems(List<ItemStack> items, int tier) { ArrayList<ItemStack> stacks = new ArrayList<>(); @@ -378,6 +379,19 @@ public class ComponentAssemblyLineRecipeLoader { totalItems / 16)); isCompacted = true; } + // Proto-Halkonite cannot be molten into a fluid, so instead replace it with an equivalent amount of dense + // plates + if (GTUtility.areStacksEqual( + itemstack, + GTOreDictUnificator.get(OrePrefixes.wireFine, MaterialsUEVplus.ProtoHalkonite, 1))) { + // Superdense plate is 64 plates + int superDensePlateAmount = (int) (((totalItems * OrePrefixes.wireFine.mMaterialAmount) / M) / 64); + stacks.addAll( + multiplyAndSplitIntoStacks( + GTOreDictUnificator.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.ProtoHalkonite, 1), + superDensePlateAmount)); + isCompacted = true; + } if (!isCompacted) stacks.addAll(multiplyAndSplitIntoStacks(itemstack, totalItems)); } stacks = mergeStacks(stacks); diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index 58afffeee4..c43ffb58c6 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -769,7 +769,7 @@ public class RecipeLoader { .fluidInputs( WerkstoffLoader.Oganesson.getFluidOrGas(1000), Materials.Neutronium.getMolten(9216), - Materials.Lubricant.getFluid(128000)) + MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(64000)) .itemOutputs(ItemRefer.Field_Restriction_Coil_T3.get(1)) .eut(TierEU.RECIPE_ZPM) .duration(1 * HOURS) @@ -791,7 +791,7 @@ public class RecipeLoader { .fluidInputs( GGMaterial.metastableOganesson.getMolten(1000), MaterialsUEVplus.TranscendentMetal.getMolten(9216), - Materials.Lubricant.getFluid(128000)) + MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(64000)) .itemOutputs(ItemRefer.Field_Restriction_Coil_T4.get(1)) .eut(TierEU.RECIPE_ZPM) .duration(2 * HOURS) diff --git a/src/main/java/goodgenerator/loader/RecipeLoader2.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java index 3f44301308..15f44dc97d 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader2.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader2.java @@ -648,12 +648,12 @@ public class RecipeLoader2 { ItemList.Electric_Pump_UIV.get(8), GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), - GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), + GTOreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.ProtoHalkonite, 12), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 64)) .fluidInputs( Materials.DraconiumAwakened.getMolten(14400), FluidRegistry.getFluidStack("supercoolant", 46080), - Materials.Lubricant.getFluid(46080)) + MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(46080)) .itemOutputs(ItemRefer.YOTTank_Cell_T9.get(1)) .eut(TierEU.RECIPE_UMV) .duration(50 * SECONDS) @@ -669,13 +669,13 @@ public class RecipeLoader2 { ItemList.Electric_Pump_UMV.get(8), GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 64), GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), - GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), + GTOreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.ProtoHalkonite, 12), GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 10)) .fluidInputs( Materials.DraconiumAwakened.getMolten(14400), MaterialsUEVplus.TranscendentMetal.getMolten(1440), FluidRegistry.getFluidStack("supercoolant", 46080), - Materials.Lubricant.getFluid(46080)) + MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(46080)) .itemOutputs(ItemRefer.YOTTank_Cell_T10.get(1)) .eut(TierEU.RECIPE_UXV) .duration(50 * SECONDS) @@ -1812,6 +1812,15 @@ public class RecipeLoader2 { .metadata(FUSION_THRESHOLD, 1_000_000_000) .addTo(fusionRecipes); + // Mk5 recipe + GTValues.RA.stdBuilder() + .fluidInputs(Materials.Copper.getPlasma(288), WerkstoffLoader.Oganesson.getFluidOrGas(500)) + .fluidOutputs(GGMaterial.metastableOganesson.getMolten(288)) + .eut(TierEU.RECIPE_UEV) + .duration(5 * SECONDS) + .metadata(FUSION_THRESHOLD, 1_000_000_000) + .addTo(fusionRecipes); + GTValues.RA.stdBuilder() .itemInputs(GGMaterial.metastableOganesson.get(OrePrefixes.dust)) .fluidOutputs(WerkstoffLoader.Oganesson.getFluidOrGas(250)) |