Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Primordial chaotic sauce #4004

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f892176
Create THE PrimordialChaoticSauce
EnderProyects Feb 4, 2025
e1e20ee
Chaos shard recipe line, and fluid for future uses
EnderProyects Feb 27, 2025
f259ff4
Merge branch 'PrimordialChaoticSauce' of https://github.com/EnderProy…
EnderProyects Feb 27, 2025
ecdade4
ups
EnderProyects Feb 27, 2025
129bee6
Merge branch 'GTNewHorizons:master' into PrimordialChaoticSauce
EnderProyects Feb 27, 2025
ce118f7
Merge branch 'master' into PrimordialChaoticSauce
EnderProyects Mar 1, 2025
ff7badf
Merge branch 'master' into PrimordialChaoticSauce
EnderProyects Mar 1, 2025
9abc2c2
Merge branch 'master' into PrimordialChaoticSauce
EnderProyects Mar 1, 2025
572c4b7
Merge branch 'master' into PrimordialChaoticSauce
EnderProyects Mar 3, 2025
467cf5c
Textures for chaotic fluids
EnderProyects Mar 3, 2025
803ba5c
Merge branch 'master' into PrimordialChaoticSauce
Dream-Master Mar 3, 2025
9d14e56
Merge branch 'master' into PrimordialChaoticSauce
EnderProyects Mar 3, 2025
bfa8c86
Merge branch 'master' into PrimordialChaoticSauce
EnderProyects Mar 3, 2025
d10dcad
Merge branch 'master' into PrimordialChaoticSauce
EnderProyects Mar 3, 2025
f353700
Merge branch 'master' into PrimordialChaoticSauce
EnderProyects Mar 3, 2025
1c9db39
Merge branch 'master' into PrimordialChaoticSauce
EnderProyects Mar 4, 2025
203e8cc
Merge branch 'master' into PrimordialChaoticSauce
EnderProyects Mar 4, 2025
92d49c2
ups
EnderProyects Mar 4, 2025
aeb2c2b
add 2 more catalyst
EnderProyects Mar 4, 2025
d23fb05
Merge branch 'master' into PrimordialChaoticSauce
EnderProyects Mar 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/main/java/gregtech/api/enums/MaterialsUEVplus.java
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,28 @@ public class MaterialsUEVplus {
.constructMaterial()
.setProcessingMaterialTierEU(TierEU.RECIPE_MAX);

public static Materials PrimordialChaoticSauce = new MaterialBuilder(
161,
new TextureSet("primchaosaucefluid", true),
"Primordial Chaotic Sauce").setName("primchaosauce")
.addFluid()
.addCell()
.setRGBA(255, 255, 255, 0)
.setTransparent(false)
.constructMaterial()
.setProcessingMaterialTierEU(TierEU.RECIPE_UEV);

public static Materials PurifiedPrimordialChaoticSauce = new MaterialBuilder(
162,
new TextureSet("pureprimchaosaucefluid", true),
"Purified Primordial Chaotic Sauce").setName("pureprimchaosauce")
.addFluid()
.addCell()
.setRGBA(255, 255, 255, 0)
.setTransparent(false)
.constructMaterial()
.setProcessingMaterialTierEU(TierEU.RECIPE_UEV);

/**
* called by Materials. Can be safely called multiple times. exists to allow Materials ensure this class is
* initialized
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package gregtech.loaders.postload.recipes;

import static gregtech.api.recipe.RecipeMaps.transcendentPlasmaMixerRecipes;
import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;

import net.minecraftforge.fluids.FluidStack;

import goodgenerator.items.GGMaterial;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsBotania;
import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTRecipeBuilder;
Expand Down Expand Up @@ -181,5 +184,34 @@ public void run() {
.metadata(GTRecipeConstants.EU_MULTIPLIER, 1000)
.eut(1_000_000_000L)
.addTo(transcendentPlasmaMixerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(GTUtility.getIntegratedCircuit(24))
.fluidInputs(
MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(368),
getFluidStack("fluiddeath", 110),
Materials.UUMatter.getFluid(482),
MaterialsUEVplus.SpaceTime.getMolten(286),
GGMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(394),
getFluidStack("potion.diablosauce.strong", 258),
Materials.EnhancedGalgadorian.getMolten(248),
Materials.LifeEssence.getFluid(286),
MaterialsUEVplus.PhononMedium.getFluid(564),
MaterialsUEVplus.TranscendentMetal.getMolten(666),
MaterialsUEVplus.Eternity.getMolten(1000),
MaterialsUEVplus.PrimordialMatter.getFluid(1000),
MaterialsUEVplus.MoltenProtoHalkoniteBase.getFluid(742),
Materials.MysteriousCrystal.getMolten(852),
MaterialsUEVplus.SixPhasedCopper.getPlasma(926),
Materials.Cheese.getMolten(684),
Materials.Flerovium.getMolten(458),
MaterialsBotania.GaiaSpirit.getMolten(576),
getFluidStack("fluidpure", 120),
MaterialsUEVplus.Antimatter.getFluid(998))
.fluidOutputs(MaterialsUEVplus.PrimordialChaoticSauce.getFluid(1000L))
.duration(10 * GTRecipeBuilder.TICKS)
.metadata(GTRecipeConstants.EU_MULTIPLIER, 100)
.eut(1_000_000L)
.addTo(transcendentPlasmaMixerRecipes);
}
}
48 changes: 48 additions & 0 deletions src/main/java/kubatech/loaders/DEFCRecipes.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
package kubatech.loaders;

import static gregtech.api.enums.Mods.AdvancedSolarPanel;
import static gregtech.api.enums.Mods.Avaritia;
import static gregtech.api.enums.Mods.BiomesOPlenty;
import static gregtech.api.enums.Mods.BloodMagic;
import static gregtech.api.enums.Mods.Botania;
import static gregtech.api.enums.Mods.DraconicEvolution;
import static gregtech.api.enums.Mods.ElectroMagicTools;
import static gregtech.api.enums.Mods.GalacticraftAmunRa;
import static gregtech.api.enums.Mods.GalaxySpace;
import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
import static gregtech.api.enums.Mods.SuperSolarPanels;
import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.enums.Mods.ThaumicBases;
import static gregtech.api.enums.Mods.Witchery;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
Expand Down Expand Up @@ -36,6 +45,7 @@
import gregtech.api.util.GTRecipe;
import gregtech.api.util.GTUtility;
import gregtech.nei.formatter.SimpleSpecialValueFormatter;
import gtPlusPlus.core.material.MaterialsAlloy;
import gtPlusPlus.xmod.forestry.bees.handler.GTPPCombType;
import kubatech.Tags;

Expand Down Expand Up @@ -314,6 +324,44 @@ private static void fusionRecipes() {
.metadata(DEFC_CASING_TIER, 3)
.addTo(fusionCraftingRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(DraconicEvolution.ID, "chaosFragment", 1, 0),
GTModHandler.getModItem(BloodMagic.ID, "enhancedFillingAgent", 1, 0),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.TengamPurified, 16),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.StellarAlloy, 16),
MaterialsAlloy.ARCANITE.getDust(16),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 16, 14),
GTModHandler.getModItem(Avaritia.ID, "big_pearl", 0, 0),
GTModHandler.getModItem(ThaumicBases.ID, "nodeFoci", 0, 1))
.fluidInputs(MaterialsUEVplus.PrimordialChaoticSauce.getFluid(1000L))
.fluidOutputs(MaterialsUEVplus.PurifiedPrimordialChaoticSauce.getFluid(10000L))
.itemOutputs(GTModHandler.getModItem(Botania.ID, "manaResource", 16, 5))
.eut(TierEU.RECIPE_UHV)
.duration(2800)
.metadata(DEFC_CASING_TIER, 4)
.addTo(fusionCraftingRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(GalaxySpace.ID, "item.UnknowCrystal", 1, 0),
GTModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 4),
GTModHandler.getModItem(GalacticraftAmunRa.ID, "item.baseItem", 16, 26),
GTModHandler.getModItem(HardcoreEnderExpansion.ID, "transference_gem", 1, 0),
GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 16),
GTModHandler.getModItem(DraconicEvolution.ID, "reactorStabilizer", 0, 0),
GTModHandler.getModItem(Botania.ID, "laputaShard", 0, 19),
GTModHandler.getModItem(Avaritia.ID, "Endest_Pearl", 0, 0),
GTModHandler.getModItem(Thaumcraft.ID, "blockCrystal", 0, 7))
.fluidInputs(MaterialsUEVplus.PurifiedPrimordialChaoticSauce.getFluid(100L))
.fluidOutputs(MaterialsUEVplus.PrimordialChaoticSauce.getFluid(10L))
.itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "chaosShard", 9, 0))
.eut(TierEU.RECIPE_UHV)
.duration(2800)
.metadata(DEFC_CASING_TIER, 4)
.addTo(fusionCraftingRecipes);

if (Witchery.isModLoaded()) {
GTValues.RA.stdBuilder()
.itemInputs(
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"animation": {
"frametime": 1,
"frames": [
0,
0,
0,
1,
1,
1,
2,
2,
2,
3,
3,
4,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
15,
16,
16,
17,
17,
17,
18,
18,
18,
19,
19,
19,
18,
18,
18,
17,
17,
17,
16,
16,
15,
15,
14,
13,
12,
11,
10,
9,
8,
7,
6,
5,
4,
4,
3,
3,
2,
2,
2,
1,
1,
1
]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"animation": {
"frametime": 1,
"frames": [
0,
0,
0,
1,
1,
1,
2,
2,
2,
3,
3,
4,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
15,
16,
16,
17,
17,
17,
18,
18,
18,
19,
19,
19,
18,
18,
18,
17,
17,
17,
16,
16,
15,
15,
14,
13,
12,
11,
10,
9,
8,
7,
6,
5,
4,
4,
3,
3,
2,
2,
2,
1,
1,
1
]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"animation": {"frametime": 1}}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"animation": {"frametime": 1}}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.