diff --git a/overrides/scripts/Midgame.zs b/overrides/scripts/Midgame.zs index da57602..b830927 100644 --- a/overrides/scripts/Midgame.zs +++ b/overrides/scripts/Midgame.zs @@ -1,6 +1,11 @@ import mods.gregtech.recipe.RecipeMap; import crafttweaker.item.IItemStack; import crafttweaker.item.IIngredient; +import mods.gregtech.ore.OrePrefix; +import mods.gregtech.ore.IOreRecipeHandler; +import mods.gregtech.material.Material; +import mods.gregtech.recipe.helpers; +import mods.gregtech.recipe.IRecipeUtils; import crafttweaker.data.IData; recipes.remove(); @@ -134,3 +139,15 @@ recipes.addShaped(, [ [, , ] ]); +// Perfect Gems +val gemPerfect as OrePrefix = OrePrefix.getPrefix("gemPerfect"); + +gemPerfect.generateRecipes(function(orePrefix as OrePrefix, material as Material) { + val utils as IRecipeUtils = IRecipeUtils.utils; + + .recipeBuilder() + .inputs(utils.item(orePrefix, material)) + .fluidInputs( * 100) + .outputs(utils.ore("gemExquisite", material)) + .duration(100).EUt(1920).buildAndRegister(); +} as IOreRecipeHandler); diff --git a/overrides/scripts/materials.zs b/overrides/scripts/materials.zs index 39d3192..f588d56 100644 --- a/overrides/scripts/materials.zs +++ b/overrides/scripts/materials.zs @@ -1,5 +1,4 @@ #loader gregtech -#packmode normal import mods.gregtech.material.MaterialBuilder; import mods.gregtech.material.MaterialRegistry; @@ -8,10 +7,6 @@ import mods.gregtech.material.Material; import mods.gregtech.material.Elements; import mods.gregtech.ore.OrePrefix; -val gemPerfect as OrePrefix = OrePrefix.registerOrePrefix("gemPerfect", 8, "gemPerfect", 1); -gemPerfect.setGenerationPredicate(IMaterialPredicate.hasGem); -gemPerfect.createMaterialItem(); - var element_omnium = Elements.add(130, 234, -1, null, "Omnium", "Nm", false); var element_draconium = Elements.add(149, 264, -1, null, "Draconium", "Dc", false); var element_draconium_awakened = Elements.add(149, 267, -1, null, "AwakenedDraconium", "Dc*", false); @@ -402,12 +397,11 @@ var snowchestite = MaterialBuilder(32059, "snowchestite") .flags("disable_decomposition") .color(0x274c9f).iconSet("shiny") .components([ * 3, * 1]) - .addOreByproducts(, , ) + .addOreByproducts(, , ) .build(); var naquadah_hydroxide = MaterialBuilder(32060, "naquadah_hydroxide") .dust() - .flags("disable_decomposition") .color(0x1941a6).iconSet("dull") .components([ * 1, * 3, * 3]) .build(); @@ -783,7 +777,7 @@ var taranium = MaterialBuilder(32109, "taranium") .addFlags(["generate_gear"]); .addFlags(["generate_gear"]); .addFlags(["generate_gear"]); -.addFlags(["generate_gear", ]); +.addFlags(["generate_gear"]); .addFlags(["generate_gear"]); .addFlags(["generate_gear"]); diff --git a/overrides/scripts/oreprefix.zs b/overrides/scripts/oreprefix.zs new file mode 100644 index 0000000..1506665 --- /dev/null +++ b/overrides/scripts/oreprefix.zs @@ -0,0 +1,30 @@ +#loader gregtech +#priority 10 + +import mods.gregtech.material.MaterialBuilder; +import mods.gregtech.material.MaterialRegistry; +import mods.gregtech.material.IMaterialPredicate; +import mods.gregtech.material.Material; +import mods.gregtech.material.Elements; +import mods.gregtech.ore.OrePrefix; +import mods.gregtech.recipe.helpers; +import mods.gregtech.ore.IOreRecipeHandler; +import mods.gregtech.MaterialFlag; +import mods.gregtech.recipe.RecipeMap; +import mods.gregtech.MaterialFlagBuilder; + +val gemPerfectFlag = MaterialFlagBuilder.create("generate_perfect") + .requireGem() + .build(); + +.addFlags(["generate_perfect"]); +.addFlags(["generate_perfect"]); +.addFlags(["generate_perfect"]); +.addFlags(["generate_perfect"]); + +val gemPerfect as OrePrefix = OrePrefix.registerOrePrefix("gemPerfect", 8, "gemPerfect", 1); +gemPerfect.setGenerationPredicate(function(mat as Material) as bool { + return mat.hasFlag(gemPerfectFlag); +} as IMaterialPredicate); + +gemPerfect.createMaterialItem();