Skip to content

Qol recipes and decorative stuff #1227

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

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
76f5804
Qol recipes
EnderProyects Mar 26, 2025
8458f44
Update ScriptDraconicEvolution.java
EnderProyects Mar 26, 2025
2f00609
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Mar 26, 2025
bd49a65
Update ScriptEnderIO.java
EnderProyects Mar 26, 2025
21de5d9
Update ScriptEnderIO.java
EnderProyects Mar 26, 2025
b79d774
changed location of recipe
EnderProyects Mar 26, 2025
d3876f1
Update ScriptEnderIO.java
EnderProyects Mar 26, 2025
1f2548f
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Mar 31, 2025
cf359c8
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 1, 2025
e10d17c
add some things
EnderProyects Apr 4, 2025
9c11063
Update AssemblerRecipes.java
EnderProyects Apr 4, 2025
7fc3386
update
EnderProyects Apr 9, 2025
faf1bcd
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 9, 2025
8233792
Update AssemblerRecipes.java
EnderProyects Apr 9, 2025
cfc2038
autoclave go brrr
EnderProyects Apr 9, 2025
d3cfdd6
Update ScriptAdvancedSolarPanel.java
EnderProyects Apr 9, 2025
ba08d4b
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 9, 2025
d3fdaa7
Update dependencies.gradle
EnderProyects Apr 9, 2025
8c27ce9
update eu/t
EnderProyects Apr 9, 2025
1168673
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 9, 2025
1bfa128
change
EnderProyects Apr 9, 2025
dcf9ee0
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 23, 2025
8b87398
update deps
EnderProyects Apr 23, 2025
b2c48dc
Merge branch 'master' into QOL-and-decorative-stuff
serenibyss Apr 24, 2025
f11fada
Merge branch 'master' into QOL-and-decorative-stuff
serenibyss Apr 24, 2025
354d21d
Merge branch 'master' into QOL-and-decorative-stuff
EnderProyects Apr 26, 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
12 changes: 6 additions & 6 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.211:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.227:dev")
api("com.github.GTNewHorizons:Yamcl:0.7.0:dev")
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")

implementation("com.github.GTNewHorizons:GTNHLib:0.6.17:dev")
implementation("com.github.GTNewHorizons:GTNHLib:0.6.19:dev")

compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.61:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.62:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.39:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.13-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.18-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
compileOnly("com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.12.6-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.8:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
compileOnly("com.github.GTNewHorizons:amunra:0.8.1:dev") { transitive = false }
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ modId = dreamcraft
modGroup = com.dreammaster

# Whether to use modGroup as the maven publishing group.
# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
# When false, com.github.GTNewHorizons is used.
useModGroupForPublishing = false

# Updates your build.gradle and settings.gradle automatically whenever an update is available.
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.37'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
}


165 changes: 162 additions & 3 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,59 @@
import static goodgenerator.loader.Loaders.advancedRadiationProtectionPlate;
import static gregtech.api.enums.GTValues.L;
import static gregtech.api.enums.GTValues.W;
import static gregtech.api.enums.Mods.*;
import static gregtech.api.enums.Mods.AE2FluidCraft;
import static gregtech.api.enums.Mods.AE2Stuff;
import static gregtech.api.enums.Mods.AdvancedSolarPanel;
import static gregtech.api.enums.Mods.AppliedEnergistics2;
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.BuildCraftCore;
import static gregtech.api.enums.Mods.BuildCraftFactory;
import static gregtech.api.enums.Mods.BuildCraftTransport;
import static gregtech.api.enums.Mods.Chisel;
import static gregtech.api.enums.Mods.Computronics;
import static gregtech.api.enums.Mods.EnderIO;
import static gregtech.api.enums.Mods.EnhancedLootBags;
import static gregtech.api.enums.Mods.EtFuturumRequiem;
import static gregtech.api.enums.Mods.ExtraBees;
import static gregtech.api.enums.Mods.ExtraUtilities;
import static gregtech.api.enums.Mods.FloodLights;
import static gregtech.api.enums.Mods.Forestry;
import static gregtech.api.enums.Mods.ForgeMicroblocks;
import static gregtech.api.enums.Mods.GalacticraftAmunRa;
import static gregtech.api.enums.Mods.GalacticraftCore;
import static gregtech.api.enums.Mods.GalacticraftMars;
import static gregtech.api.enums.Mods.GalaxySpace;
import static gregtech.api.enums.Mods.Gendustry;
import static gregtech.api.enums.Mods.GraviSuite;
import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
import static gregtech.api.enums.Mods.IndustrialCraft2;
import static gregtech.api.enums.Mods.IronChests;
import static gregtech.api.enums.Mods.IronTanks;
import static gregtech.api.enums.Mods.JABBA;
import static gregtech.api.enums.Mods.Minecraft;
import static gregtech.api.enums.Mods.Natura;
import static gregtech.api.enums.Mods.NaturesCompass;
import static gregtech.api.enums.Mods.OpenBlocks;
import static gregtech.api.enums.Mods.OpenComputers;
import static gregtech.api.enums.Mods.OpenGlasses;
import static gregtech.api.enums.Mods.OpenModularTurrets;
import static gregtech.api.enums.Mods.OpenPrinters;
import static gregtech.api.enums.Mods.OpenSecurity;
import static gregtech.api.enums.Mods.PamsHarvestCraft;
import static gregtech.api.enums.Mods.ProjectRedIllumination;
import static gregtech.api.enums.Mods.Railcraft;
import static gregtech.api.enums.Mods.StevesCarts2;
import static gregtech.api.enums.Mods.StorageDrawers;
import static gregtech.api.enums.Mods.SuperSolarPanels;
import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.enums.Mods.TinkerConstruct;
import static gregtech.api.enums.Mods.TwilightForest;
import static gregtech.api.enums.Mods.VisualProspecting;
import static gregtech.api.enums.Mods.Witchery;
import static gregtech.api.enums.Mods.ZTones;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.util.GTModHandler.getModItem;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
Expand Down Expand Up @@ -48,6 +100,7 @@
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsBotania;
import gregtech.api.enums.MaterialsKevlar;
import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
Expand Down Expand Up @@ -2781,6 +2834,112 @@ public void run() {

}

if (Botania.isModLoaded()) {

// Hand of Ender

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(Botania.ID, "enderEyeBlock", 1L, 0),
GTModHandler.getModItem(Witchery.ID, "witchhand", 1L, 0),
GTModHandler.getModItem(Botania.ID, "manaResource", 5L, 22),
GTModHandler.getModItem(Botania.ID, "manaBeacon", 1L, 5),
new ItemStack(Blocks.ender_chest, 1),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 2L),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(GTModHandler.getModItem(Botania.ID, "enderHand", 1L, 0))
.fluidInputs(MaterialsBotania.Terrasteel.getMolten(1296)).duration(12 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_MV).addTo(assemblerRecipes);

// Botania seeds grass

GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Blocks.grass, 16),
getModItem(Botania.ID, "grassSeeds", 1, 3, missing),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Botania.ID, "altGrass", 16, 0, missing)).duration(5 * SECONDS).eut(24)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Blocks.grass, 16),
getModItem(Botania.ID, "grassSeeds", 1, 4, missing),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Botania.ID, "altGrass", 16, 1, missing)).duration(5 * SECONDS).eut(24)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Blocks.grass, 16),
getModItem(Botania.ID, "grassSeeds", 1, 5, missing),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Botania.ID, "altGrass", 16, 2, missing)).duration(5 * SECONDS).eut(24)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Blocks.grass, 16),
getModItem(Botania.ID, "grassSeeds", 1, 6, missing),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Botania.ID, "altGrass", 16, 3, missing)).duration(5 * SECONDS).eut(24)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Blocks.grass, 16),
getModItem(Botania.ID, "grassSeeds", 1, 7, missing),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Botania.ID, "altGrass", 16, 4, missing)).duration(5 * SECONDS).eut(24)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Blocks.grass, 16),
getModItem(Botania.ID, "grassSeeds", 1, 8, missing),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Botania.ID, "altGrass", 16, 5, missing)).duration(5 * SECONDS).eut(24)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Botania.ID, "altGrass", 2, 0, missing),
getModItem(Botania.ID, "altGrass", 2, 1, missing),
getModItem(Botania.ID, "altGrass", 2, 2, missing),
getModItem(Botania.ID, "altGrass", 2, 3, missing),
getModItem(Botania.ID, "altGrass", 2, 4, missing),
getModItem(Botania.ID, "altGrass", 2, 5, missing),
getModItem(Botania.ID, "overgrowthSeed", 1, 0, missing),
getModItem(Botania.ID, "worldSeed", 1, 0, missing),
GTUtility.getIntegratedCircuit(10))
.itemOutputs(getModItem(Botania.ID, "enchantedSoil", 12, 0, missing)).duration(50 * SECONDS)
.eut(240).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Items.wheat, 16),
new ItemStack(Items.wheat_seeds, 1),
getModItem(Botania.ID, "fertilizer", 1, 0, missing),
GTUtility.getIntegratedCircuit(10))
.itemOutputs(new ItemStack(Blocks.tallgrass, 16, 1)).duration(5 * SECONDS).eut(24)
.addTo(assemblerRecipes);
}

// 16A Zpm to LuV transformer
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 4),
GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1),
ItemList.Transformer_ZPM_LuV.get(1),
ItemList.Casing_Coil_TungstenSteel.get(1))
.itemOutputs(GregtechItemList.Transformer_HA_ZPM_LuV.get(1)).duration(5 * SECONDS).eut(TierEU.RECIPE_EV)
.addTo(assemblerRecipes);

// 64A Zpm To LuV transformer
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.cableGt16, Materials.VanadiumGallium, 2),
GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.Naquadah, 1),
GTOreDictUnificator.get(OrePrefixes.spring, Materials.Naquadah, 1),
GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.VanadiumGallium, 1),
GregtechItemList.Transformer_HA_ZPM_LuV.get(1),
ItemList.Electric_Pump_LV.get(1))
.fluidInputs(Materials.Lubricant.getFluid(2000)).itemOutputs(ItemList.WetTransformer_ZPM_LuV.get(1))
.duration(5 * SECONDS).eut(TierEU.RECIPE_EV).addTo(assemblerRecipes);

// Hastelloy-X Structural Block
GTValues.RA.stdBuilder()
.itemInputs(
Expand Down Expand Up @@ -4854,7 +5013,7 @@ private void makeEnderIORecipes() {
GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.bolt, 4),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Manganese, 4),
ItemList.Gravistar.get(1L),
GTModHandler.getModItem(EnderIO.ID, "itemFrankenSkull", 1L, 5),
GTModHandler.getModItem(EtFuturumRequiem.ID, "totem_of_undying", 1L, 0),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 2),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(GTModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 1L, 6))
Expand All @@ -4865,7 +5024,7 @@ private void makeEnderIORecipes() {
.itemInputs(
GTModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 1L, 5),
ItemList.Gravistar.get(1L),
GTModHandler.getModItem(EnderIO.ID, "itemFrankenSkull", 1L, 5),
GTModHandler.getModItem(EtFuturumRequiem.ID, "totem_of_undying", 1L, 0),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 2))
.itemOutputs(GTModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 1L, 6))
.fluidInputs(Materials.Neutronium.getMolten(1152)).duration(10 * SECONDS).eut(TierEU.RECIPE_ZPM)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static bartworks.system.material.WerkstoffLoader.Roquesit;
import static goodgenerator.items.GGMaterial.indiumPhosphate;
import static gregtech.api.enums.Mods.Botania;
import static gregtech.api.enums.Mods.DraconicEvolution;
import static gregtech.api.enums.Mods.Forestry;
import static gregtech.api.enums.Mods.Gendustry;
Expand Down Expand Up @@ -331,6 +332,14 @@ public void run() {
.fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 1000)).requiresCleanRoom()
.duration(60 * MINUTES).eut(TierEU.RECIPE_MV).addTo(UniversalChemical);

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(Botania.ID, "cocoon", 1L, 0),
GTModHandler.getModItem(Genetics.ID, "misc", 64L, 4))
.itemOutputs(CustomItemList.TheBigEgg.get(1L))
.fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 1000)).requiresCleanRoom()
.duration(60 * MINUTES).eut(TierEU.RECIPE_MV).addTo(UniversalChemical);

}

if (Gendustry.isModLoaded() && IndustrialCraft2.isModLoaded()) {
Expand Down Expand Up @@ -400,6 +409,18 @@ public void run() {

}

if (Botania.isModLoaded()) {

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(Botania.ID, "manaBottle", 1L, 0),
GTModHandler.getModItem(HardcoreEnderExpansion.ID, "essence", 1L, 0))
.itemOutputs(GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 15))
.fluidInputs(FluidRegistry.getFluidStack("liquidair", 1000)).duration(1 * MINUTES)
.eut(TierEU.RECIPE_MV).addTo(UniversalChemical);

}

}

public static void singleBlockOnly() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.dreammaster.gthandler.recipes;

import static gregtech.api.enums.Mods.Botania;
import static gregtech.api.enums.Mods.GalacticraftCore;
import static gregtech.api.enums.Mods.OpenComputers;
import static gregtech.api.enums.Mods.SuperSolarPanels;
Expand All @@ -21,6 +22,7 @@
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsBotania;
import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
Expand Down Expand Up @@ -243,6 +245,36 @@ public void run() {
.itemOutputs(ItemList.Circuit_Wafer_NPIC.get(32)).requiresCleanRoom().duration(60 * 20)
.eut(TierEU.RECIPE_UV).addTo(WaferEngravingRecipes);

// Bifrost laser recipes
GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(Botania.ID, "elfGlass", 1L, 0),
GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0))
.itemOutputs(GTModHandler.getModItem(Botania.ID, "bifrostPerm", 1L, 0)).duration(2 * SECONDS)
.eut(TierEU.RECIPE_IV).addTo(laserEngraverRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(Botania.ID, "livingrock", 1L, 0),
GTModHandler.getModItem(Botania.ID, "elfGlass", 1L, 0),
GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0),
GTUtility.copyAmount(
0,
GTOreDictUnificator.get(OrePrefixes.lens, MaterialsBotania.BotaniaDragonstone, 1)))
.itemOutputs(GTModHandler.getModItem(Botania.ID, "shimmerrock", 1L, 0)).duration(2 * SECONDS)
.eut(TierEU.RECIPE_IV).addTo(laserEngraverRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(Botania.ID, "dreamwood", 1L, 1),
GTModHandler.getModItem(Botania.ID, "elfGlass", 1L, 0),
GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0),
GTUtility.copyAmount(
0,
GTOreDictUnificator.get(OrePrefixes.lens, MaterialsBotania.BotaniaDragonstone, 1)))
.itemOutputs(GTModHandler.getModItem(Botania.ID, "shimmerwoodPlanks", 1L, 0)).duration(2 * SECONDS)
.eut(TierEU.RECIPE_IV).addTo(laserEngraverRecipes);

// Protomatter recipes
GTValues.RA.stdBuilder().fluidInputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(100L))
.duration(10 * SECONDS).eut(TierEU.RECIPE_UIV).fluidOutputs(MaterialsUEVplus.Protomatter.getFluid(100L))
Expand Down
Loading