From 38b5fb5bca5dfc8cfe8f9ec3c874c13a9a8ceea0 Mon Sep 17 00:00:00 2001 From: ManuCoding11 Date: Tue, 8 Mar 2022 16:31:31 +0100 Subject: [PATCH 1/3] Create primal aspectus --- resources/contenttweaker/lang/en_us.lang | 1 + .../models/item/aspectus_primal.json | 6 ++++++ .../textures/items/aspectus_primal.png | Bin 0 -> 6022 bytes .../textures/items/aspectus_primal.png.mcmeta | 6 ++++++ scripts/_new.zs | 4 ++++ scripts/embers.zs | 19 ++++++++++++++++++ 6 files changed, 36 insertions(+) create mode 100644 resources/contenttweaker/models/item/aspectus_primal.json create mode 100644 resources/contenttweaker/textures/items/aspectus_primal.png create mode 100644 resources/contenttweaker/textures/items/aspectus_primal.png.mcmeta diff --git a/resources/contenttweaker/lang/en_us.lang b/resources/contenttweaker/lang/en_us.lang index 6c8e195..9de8f8e 100644 --- a/resources/contenttweaker/lang/en_us.lang +++ b/resources/contenttweaker/lang/en_us.lang @@ -6,3 +6,4 @@ tile.contenttweaker.botanic_alloy_block.name=Botanic Alloy Block tile.contenttweaker.elite_table_base.name=Elite Crafting Table Base item.contenttweaker.nether_star_shard.name=Nether Star Shard item.contenttweaker.nether_star_core.name=Nether Star Core +item.contenttweaker.aspectus_primal.name=Primal Aspectus diff --git a/resources/contenttweaker/models/item/aspectus_primal.json b/resources/contenttweaker/models/item/aspectus_primal.json new file mode 100644 index 0000000..0b1620d --- /dev/null +++ b/resources/contenttweaker/models/item/aspectus_primal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/aspectus_primal" + } +} diff --git a/resources/contenttweaker/textures/items/aspectus_primal.png b/resources/contenttweaker/textures/items/aspectus_primal.png new file mode 100644 index 0000000000000000000000000000000000000000..7dcb371243101f742687091b1ca679d16b54614e GIT binary patch literal 6022 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 Ap#T5? literal 0 HcmV?d00001 diff --git a/resources/contenttweaker/textures/items/aspectus_primal.png.mcmeta b/resources/contenttweaker/textures/items/aspectus_primal.png.mcmeta new file mode 100644 index 0000000..f5dae5e --- /dev/null +++ b/resources/contenttweaker/textures/items/aspectus_primal.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 30, + "interpolate": true + } +} diff --git a/scripts/_new.zs b/scripts/_new.zs index 45c7b65..1de6ca4 100644 --- a/scripts/_new.zs +++ b/scripts/_new.zs @@ -62,3 +62,7 @@ star_shard.register(); val star_core = VanillaFactory.createItem("nether_star_core"); star_core.glowing = true; star_core.register(); + +// Primal Aspectus +val aspectus_primal = VanillaFactory.createItem("aspectus_primal"); +aspectus_primal.register(); diff --git a/scripts/embers.zs b/scripts/embers.zs index e11b430..809a463 100644 --- a/scripts/embers.zs +++ b/scripts/embers.zs @@ -168,3 +168,22 @@ for metal in metals { ingot, ingot, hammer ]); } + +// Primal Aspectus recipe +mods.astralsorcery.Altar.addTraitAltarRecipe("contenttweaker:aspectus_primal", , 4500, 600, [ + , , , + null, , null, + , , , + + null, null, null, null, + + null, null, null, null, + null, null, null, null, + + , null, null, , + + , , , , +]); + +// Add Primal Aspectus to alchemy aspects +mods.embers.Alchemy.addAspect("primal", ); From b53cdf30ad86ad599dd55d260ae119b3fd5639c1 Mon Sep 17 00:00:00 2001 From: ManuCoding11 Date: Tue, 8 Mar 2022 16:31:49 +0100 Subject: [PATCH 2/3] Add slime saplings recipe --- scripts/tconstruct.zs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/scripts/tconstruct.zs b/scripts/tconstruct.zs index 291260f..61ac7df 100644 --- a/scripts/tconstruct.zs +++ b/scripts/tconstruct.zs @@ -588,3 +588,27 @@ recipes.addShaped("tconstructController", , [ [, , ], [, , ] ]); + +// Slime saplings +recipes.addShaped("slimesapling0", , [ + [, , ], + [, , ], + [null, .withTag({type: "narslimmus"}), null] +]); + +recipes.addShaped("slimesapling1", , [ + [, , ], + [, , ], + [null, .withTag({type: "arcanerose"}), null] +]); + +recipes.addShaped("slimesapling2", , [ + [, , ], + [, , ], + [null, .withTag({type: "thermalily"}), null] +]); + +// Slimy dirt +mods.tconstruct.Drying.addRecipe(, , 18000); +mods.tconstruct.Drying.addRecipe(, , 18000); +mods.tconstruct.Drying.addRecipe(, , 18000); From 8784baed9a41c6be40c522e437a948d742bc1370 Mon Sep 17 00:00:00 2001 From: ManuCoding11 Date: Tue, 8 Mar 2022 16:32:22 +0100 Subject: [PATCH 3/3] Add rgb ingot recipe & enhanced ender recipe --- scripts/extended.zs | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/scripts/extended.zs b/scripts/extended.zs index a38d065..fe7a794 100644 --- a/scripts/extended.zs +++ b/scripts/extended.zs @@ -64,15 +64,18 @@ for item in items { disable(item); } +// Remove Crystaltine Ingot recipe +mods.extendedcrafting.TableCrafting.remove(); + // Better Ultimate Ingot -mods.extendedcrafting.TableCrafting.addShaped(0, , [ - [, , , , , , ], - [, , , , , , ], - [, , , , , , ], - [, , , , , , ], - [, , , , , , ], - [, , , , , , ], - [, , , , , , ] +mods.extendedcrafting.TableCrafting.addShaped(0, * 2, [ + [, , , , , , ], + [, , , , , , ], + [, , , , , , ], + [, , , , , , ], + [, , , , , , ], + [, , , , , , ], + [, , , , , , ] ]); //Handheld Advanced Crafting @@ -81,3 +84,8 @@ recipes.addShaped("extendedcrafting_handheld_table", ], [, null] ]); + +// Enhanced Ender Ingot +mods.embers.Alchemy.add( * 2, [, , , , ], { + "primal": 450 .. 480 +});