🚧 Add Craft.zs submodule, update to new global Grid()

Krutoy242 · Dec 20, 2022 · 0c1b0e2 · 0c1b0e2
1 parent 6f4f682
commit 0c1b0e2
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 42 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "scripts/lib/D"]
 	path = scripts/lib/D
 	url = https://github.com/Krutoy242/D.zs.git
+[submodule "scripts/craft"]
+	path = scripts/craft
+	url = https://github.com/Krutoy242/Craft.zs.git
diff --git a/scripts/category/creative.zs b/scripts/category/creative.zs
@@ -1,7 +1,6 @@
 import crafttweaker.item.IItemCondition;
 import crafttweaker.item.IIngredient;
 import crafttweaker.item.IItemStack;
-import scripts.craft.grid.Grid;
 
 # *======= Gas Trophy Frame =======*
 

diff --git a/scripts/category/magicProcessing.zs b/scripts/category/magicProcessing.zs
@@ -1,7 +1,6 @@
 import crafttweaker.item.IItemStack;
 import crafttweaker.oredict.IOreDictEntry;
 import thaumcraft.aspect.CTAspectStack;
-import scripts.craft.grid.Grid;
 import mods.botaniatweaks.AgglomerationMultiblock;
 import mods.botaniatweaks.AgglomerationRecipe;
 import mods.botaniatweaks.Agglomeration;

diff --git a/scripts/craft b/scripts/craft
diff --git a/scripts/do/omegapotion.zs b/scripts/do/omegapotion.zs
@@ -5,7 +5,6 @@ import crafttweaker.item.IItemStack;
 import crafttweaker.liquid.ILiquidStack;
 import crafttweaker.recipes.IRecipeFunction;
 import mods.ctutils.utils.Math.sqrt;
-import scripts.craft.grid.Grid;
 
 
 # Sadly, i didnt find dynamic solution to convert Potion_Name -> EffectName -> EffectId

diff --git a/scripts/mods/appliedenergistics.zs b/scripts/mods/appliedenergistics.zs
@@ -1,6 +1,5 @@
 import crafttweaker.item.IItemStack;
 import crafttweaker.item.IIngredient;
-import scripts.craft.grid.Grid;
 #modloaded appliedenergistics2
 
 var pearlFluix = <ore:pearlFluix>;

diff --git a/scripts/mods/astralsorcery.zs b/scripts/mods/astralsorcery.zs
@@ -107,7 +107,7 @@ craft.make(<astralsorcery:blockmarble> * 8, ["pretty",
 });
 
 # [Luminous Crafting Table] from [Arcane Workbench][+2]
-recipes.addShaped("Luminous Crafting Table - RecipeAction", <astralsorcery:blockaltar>, scripts.craft.grid.Grid(["pretty",
+recipes.addShaped("Luminous Crafting Table - RecipeAction", <astralsorcery:blockaltar>, Grid(["pretty",
   "M n M",
   "M A M",
   "M   M"], {

diff --git a/scripts/mods/botania.zs b/scripts/mods/botania.zs
@@ -138,7 +138,7 @@ mods.thaumcraft.Infusion.registerRecipe(
   10, # Instability
   [<aspect:caeles> * 100, <aspect:draco> * 100, <aspect:rattus> * 100],
   <rats:idol_of_ratlantis>, # Central Item
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "S ◊ ╳",
   "▬   ▬",
   "* ◊ D"], {

diff --git a/scripts/mods/culinaryconstruct.zs b/scripts/mods/culinaryconstruct.zs
@@ -4,7 +4,7 @@
 recipes.remove(<culinaryconstruct:sandwich_station>);
 mods.extendedcrafting.TableCrafting.addShaped(0,
   <culinaryconstruct:sandwich_station>, 
-  scripts.craft.grid.Grid(['pretty',
+  Grid(['pretty',
     '  T  ',
     'F C F',
     'K K K'], {

diff --git a/scripts/mods/danknull.zs b/scripts/mods/danknull.zs
@@ -39,7 +39,7 @@ mods.thaumcraft.Infusion.registerRecipe(
   15, # Instability
   [<aspect:caeles> * 150, <aspect:draco> * 150, <aspect:visum> * 150],
   <ore:ingotTerrasteel>, # Central Item
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "C I C",
   "□   □",
   "C I C"], {

diff --git a/scripts/mods/deepmoblearning.zs b/scripts/mods/deepmoblearning.zs
@@ -143,7 +143,7 @@ mods.thaumcraft.Infusion.registerRecipe(
   10, # Instability
   [<aspect:draco> * 100, <aspect:caeles> * 100, <aspect:victus> * 100],
   <deepmoblearning:data_model_dragon>, # Central Item
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "E ▬ E",
   "-   -",
   "E ▬ E"], {

diff --git a/scripts/mods/draconicevolution.zs b/scripts/mods/draconicevolution.zs
@@ -1,6 +1,5 @@
 import crafttweaker.item.IItemStack;
 import crafttweaker.item.IIngredient;
-import scripts.craft.grid.Grid;
 #modloaded draconicevolution
 
 # Debug chest for recipes

diff --git a/scripts/mods/enderio.zs b/scripts/mods/enderio.zs
@@ -2,7 +2,6 @@ import crafttweaker.item.IItemStack;
 import crafttweaker.item.IIngredient;
 import mods.nuclearcraft.alloy_furnace.removeRecipeWithOutput as ncAlloyRm;
 import scripts.process.solution;
-import scripts.craft.grid.Grid;
 
 #modloaded enderio
 

diff --git a/scripts/mods/environmentaltech.zs b/scripts/mods/environmentaltech.zs
@@ -1,6 +1,5 @@
 import crafttweaker.item.IIngredient;
 import crafttweaker.item.IItemStack;
-import scripts.craft.grid.Grid;
 
 #modloaded environmentaltech
 

diff --git a/scripts/mods/extrautilities2.zs b/scripts/mods/extrautilities2.zs
@@ -390,7 +390,7 @@ for item in [
 ] as IItemStack[] {
 	mods.extendedcrafting.TableCrafting.addShaped(0,
 		getCreativeHarvest(item),
-		scripts.craft.grid.Grid(["pretty",
+		Grid(["pretty",
 		"d d d",
 		"d * d",
 		"d d d"], {

diff --git a/scripts/mods/forestry.zs b/scripts/mods/forestry.zs
@@ -1,7 +1,6 @@
 import crafttweaker.item.IItemStack;
 import crafttweaker.item.IIngredient;
 import crafttweaker.liquid.ILiquidStack;
-import scripts.craft.grid.Grid;
 #modloaded forestry
 
 # Fixing fruit juice amount from tomatos
@@ -19,7 +18,7 @@ for tomato in <ore:cropTomato>.items {
 # Intricate Circuit Board
 mods.forestry.Carpenter.removeRecipe(<forestry:chipsets:3>);
 mods.forestry.Carpenter.addRecipe(<forestry:chipsets:3>.withTag({T: 3 as short}), 
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
 	"◊ B ◊",
   "◊ E ◊",
   "◊ R ◊"], {
@@ -41,7 +40,7 @@ mods.forestry.Carpenter.addRecipe(<forestry:chipsets:3>.withTag({T: 3 as short})
 # [Hardened Casing] from [Sturdy Casing][+1]
 mods.forestry.Carpenter.removeRecipe(<forestry:hardened_machine>);
 mods.forestry.Carpenter.addRecipe(<forestry:hardened_machine>, 
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "◊   ◊",
   "  ⌂  ",
   "◊   ◊"], {

diff --git a/scripts/mods/forestry_bees.zs b/scripts/mods/forestry_bees.zs
@@ -10,7 +10,6 @@ import crafttweaker.item.IIngredient;
 import crafttweaker.item.IItemStack;
 import crafttweaker.item.WeightedItemStack;
 import crafttweaker.liquid.ILiquidStack;
-import scripts.craft.grid.Grid;
 
 // 🟠🟡🟢🟣🟤🟥🟦🟧🟨🟩🟪🟫
 

diff --git a/scripts/mods/immersiveengineering.zs b/scripts/mods/immersiveengineering.zs
@@ -4,7 +4,6 @@ import crafttweaker.liquid.ILiquidStack;
 import mods.alfinivia.ImmersiveEngineering.addChemthrowerEffect;
 import mods.alfinivia.ImmersiveEngineering.addRailgunBullet;
 import crafttweaker.potions.IPotionEffect;
-import scripts.craft.grid.Grid;
 
 
 

diff --git a/scripts/mods/modularmachinery.zs b/scripts/mods/modularmachinery.zs
@@ -1,7 +1,6 @@
 #modloaded modularmachinery
 
 import crafttweaker.item.IItemStack;
-import scripts.craft.grid.Grid;
 
 # [Machine Vent] from [Machine Casing][+1]
 craft.remake(<modularmachinery:blockcasing:1>, [
@@ -32,7 +31,7 @@ recipes.addShapedMirrored("Machine Gearbox",
 # Machine Circuitry
 recipes.remove(<modularmachinery:blockcasing:5>);
 mods.forestry.Carpenter.addRecipe(<modularmachinery:blockcasing:5>,
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "P ▬ P",
   "U I U",
   "P ▬ P"], {

diff --git a/scripts/mods/mysticalagriculture.zs b/scripts/mods/mysticalagriculture.zs
@@ -1,6 +1,5 @@
 import crafttweaker.item.IItemStack;
 import crafttweaker.item.IIngredient;
-import scripts.craft.grid.Grid;
 
 #modloaded mysticalagriculture
 
@@ -94,7 +93,7 @@ val seedIngrByTier = [
 
 
 for i in 0 .. 6 {
-	val shape = scripts.craft.grid.Grid(["pretty",
+	val shape = Grid(["pretty",
 		"o w o",
 		"w ! w",
 		"o w o"], {

diff --git a/scripts/mods/thaumadditions.zs b/scripts/mods/thaumadditions.zs
@@ -21,7 +21,7 @@ mods.thaumcraft.Infusion.registerRecipe(
   15, # Instability
   [<aspect:infernum> * 200, <aspect:draco> * 200, <aspect:visum> * 200, <aspect:spiritus> * 200],
   <thaumadditions:mithrillium_block>, # Central Item
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "▬ r ▬",
   "c   c",
   "▬ D ▬"], {

diff --git a/scripts/mods/thaumcraft.zs b/scripts/mods/thaumcraft.zs
@@ -15,7 +15,7 @@ furnace.addRecipe(<thermalfoundation:material:131> * 2, <thaumcraft:cluster:5>);
 
 # Primordial Pearl alt (for some people who dont want to close rifts)
 mods.astralsorcery.Altar.addConstellationAltarRecipe(
-  'Primordial Pearl alt', <thaumcraft:primordial_pearl>, 1500, 250, scripts.craft.grid.Grid([
+  'Primordial Pearl alt', <thaumcraft:primordial_pearl>, 1500, 250, Grid([
   "TVT"+
   "CSC"+
   "TVT"+
@@ -191,7 +191,7 @@ function remakeWorkbench(
 ) as void {
   mods.thaumcraft.ArcaneWorkbench.removeRecipe(output.anyAmount());
   mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe(
-    name, research, visCost, aspects, output, scripts.craft.grid.Grid(gridMap, ingrMap).shaped()
+    name, research, visCost, aspects, output, Grid(gridMap, ingrMap).shaped()
   );
 }
 
@@ -247,7 +247,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe(
   10, # Vis cost
   [<aspect:ignis>, <aspect:aqua>],
   <thaumcraft:mechanism_simple>, # Output
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "‚ ‚ ‚",
   "‚ # ‚",
   "‚ ‚ ‚"], {
@@ -263,7 +263,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe(
   30, # Vis cost
   [<aspect:ignis>, <aspect:aqua>],
   <thaumcraft:mechanism_complex>, # Output
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "  S  ",
   "‚ □ ‚",
   "  S  "], {
@@ -280,7 +280,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe(
   50, # Vis cost
   [<aspect:terra>, <aspect:aqua>],
   <thaumcraft:pattern_crafter>, # Output
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "  ■  ",
   "S # S"], {
   "■": <ore:hopper>, # Hopper
@@ -296,7 +296,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe(
   150, # Vis cost
   [<aspect:aer>, <aspect:aqua>, <aspect:ordo>, <aspect:perditio>, <aspect:terra>, <aspect:ignis>],
   <thaumcraft:vis_battery> * 8, # Output
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "A A A",
   "A V A",
   "A A A"], {
@@ -312,7 +312,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe(
   700, # Vis cost
   [<aspect:ignis> * 2, <aspect:ordo> * 2, <aspect:perditio> * 2, <aspect:aer> * 2],
   <thaumicaugmentation:impetus_generator>, # Output
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "E P E",
   "R V R",
   "E I E"], {
@@ -375,7 +375,7 @@ mods.thaumcraft.Infusion.registerRecipe("spawn_lesser_crimson_portal", "INFUSION
 <minecraft:spawn_egg>.withTag({EntityTag: {id: "thaumcraft:cultistportallesser"}}), 15,
 [<aspect:vitium> * 90, <aspect:mortuus> * 45, <aspect:praecantatio> * 90, <aspect:auram> * 30],
 <randomthings:ingredient:11>,      # Golden Egg
-scripts.craft.grid.Grid(["-K-T-K-T"], {
+Grid(["-K-T-K-T"], {
   "-": <thaumictinkerer:energetic_nitor>, # Energetic Nitor
   "K": <extrautils2:klein>,               # Klein Bottle
   "T": <thaumcraft:taint_log>,            # Taintwood Log
@@ -390,7 +390,7 @@ mods.thaumcraft.Infusion.registerRecipe(
   1, # Instability
   [<aspect:vacuos> * 100, <aspect:praecantatio> * 20],
   <thaumcraft:focus_2>, # CentralItem
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "  ˛  ",
   "q   q",
   "  ‚  "], {
@@ -408,7 +408,7 @@ mods.thaumcraft.Infusion.registerRecipe(
   1, # Instability
   [<aspect:perditio> * 10],
   <thaumcraft:seal>, # Central Item
-  scripts.craft.grid.Grid(["oG"], {
+  Grid(["oG"], {
   "o": <minecraft:golden_pickaxe>.anyDamage(), # Golden Pickaxe
   "G": <minecraft:golden_shovel>.anyDamage(),  # Golden Shovel
 }).spiral(1));
@@ -422,7 +422,7 @@ mods.thaumcraft.Infusion.registerRecipe(
   1, # Instability
   [<aspect:cognitio> * 10],
   <thaumcraft:mind>, # Central Item
-  scripts.craft.grid.Grid(["ZZ"], {
+  Grid(["ZZ"], {
   "Z": <thaumcraft:brain>, # Zombie Brain
 }).spiral(1));
 
@@ -435,7 +435,7 @@ mods.thaumcraft.Infusion.registerRecipe(
   2, # Instability
   [<aspect:alienis> * 20, <aspect:vitium> * 20],
   <thaumictinkerer:energetic_nitor>, # Central Item
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "  ▲  ",
   "D   D",
   "  ▲  "], {

diff --git a/scripts/mods/thaumictinkerer.zs b/scripts/mods/thaumictinkerer.zs
@@ -19,7 +19,7 @@ mods.thaumcraft.Infusion.registerRecipe(
   8, # Instability
   [<aspect:praecantatio> * 100, <aspect:cognitio> * 100, <aspect:alienis> * 100],
   <thaumadditions:shadow_enchanter>, # Central Item
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "▬ S ▬",
   "p   p",
   "▬ S ▬"], {

diff --git a/scripts/mods/thaumicwonders.zs b/scripts/mods/thaumicwonders.zs
@@ -12,7 +12,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe(
   200, # Vis cost
   [<aspect:terra>, <aspect:ignis>],
   <thaumicwonders:flux_capacitor>, # Output
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "  *  ",
   "F V F",
   "  *  "], {
@@ -29,7 +29,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe(
   750, # Vis cost
   [<aspect:aer> * 8, <aspect:aqua> * 8, <aspect:ordo> * 8],
   <thaumicwonders:flux_distiller>, # Output
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "□ F □",
   "C l C",
   "□ c □"], {
@@ -100,7 +100,7 @@ mods.thaumcraft.Infusion.registerRecipe(
   13, # Instability
   [<aspect:metallum> * 50, <aspect:vitium> * 50, <aspect:alkimia> * 50],
   <astralsorcery:itemcraftingcomponent:1>, # Central Item
-  scripts.craft.grid.Grid(["pretty",
+  Grid(["pretty",
   "  r  ",
   "♦   ◊",
   "  θ  "], {

diff --git a/scripts/mods/thermalexpansion.zs b/scripts/mods/thermalexpansion.zs
@@ -3,7 +3,6 @@ import crafttweaker.item.IIngredient;
 import crafttweaker.liquid.ILiquidStack;
 import crafttweaker.recipes.IRecipeFunction;
 import crafttweaker.data.IData;
-import scripts.craft.grid.Grid;
 #modloaded thermalexpansion
 
 # Planks/Slabs -> Sticks
@@ -158,7 +157,7 @@ craft.remake(<thermalfoundation:material:1028> * 2, ["pretty",
 # [Machine Frame]*2 from [Device Frame][+6]
 	recipes.remove(<thermalexpansion:frame>);
 	mods.forestry.ThermionicFabricator.addCast(<thermalexpansion:frame> * 2, 
-		scripts.craft.grid.Grid(["pretty",
+		Grid(["pretty",
 			"■ B ■",
 			"M ◙ ⌂",
 			"* ▄ *"], {

diff --git a/scripts/skyblock/skyrecipes.zs b/scripts/skyblock/skyrecipes.zs
@@ -4,7 +4,6 @@ import crafttweaker.item.IItemStack;
 import crafttweaker.oredict.IOreDictEntry;
 import crafttweaker.recipes.IRecipeFunction;
 import crafttweaker.world.IVector3d;
-import scripts.craft.grid.Grid;
 
 #priority 900