From 0c1b0e28cc8986c437f3bf0f30f466f7a16dde5d Mon Sep 17 00:00:00 2001 From: Krutoy242 Date: Tue, 20 Dec 2022 14:43:05 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Add=20Craft.zs=20submodule,=20up?= =?UTF-8?q?date=20to=20new=20global=20`Grid()`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 +++ scripts/category/creative.zs | 1 - scripts/category/magicProcessing.zs | 1 - scripts/craft | 1 + scripts/do/omegapotion.zs | 1 - scripts/mods/appliedenergistics.zs | 1 - scripts/mods/astralsorcery.zs | 2 +- scripts/mods/botania.zs | 2 +- scripts/mods/culinaryconstruct.zs | 2 +- scripts/mods/danknull.zs | 2 +- scripts/mods/deepmoblearning.zs | 2 +- scripts/mods/draconicevolution.zs | 1 - scripts/mods/enderio.zs | 1 - scripts/mods/environmentaltech.zs | 1 - scripts/mods/extrautilities2.zs | 2 +- scripts/mods/forestry.zs | 5 ++--- scripts/mods/forestry_bees.zs | 1 - scripts/mods/immersiveengineering.zs | 1 - scripts/mods/modularmachinery.zs | 3 +-- scripts/mods/mysticalagriculture.zs | 3 +-- scripts/mods/thaumadditions.zs | 2 +- scripts/mods/thaumcraft.zs | 24 ++++++++++++------------ scripts/mods/thaumictinkerer.zs | 2 +- scripts/mods/thaumicwonders.zs | 6 +++--- scripts/mods/thermalexpansion.zs | 3 +-- scripts/skyblock/skyrecipes.zs | 1 - 26 files changed, 32 insertions(+), 42 deletions(-) create mode 160000 scripts/craft diff --git a/.gitmodules b/.gitmodules index 148859564..92eec1733 100644 --- 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 index 54587615f..2ba569be6 100644 --- 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 index e1c18c13d..29d14c4ec 100644 --- 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 new file mode 160000 index 000000000..1e0c56a5e --- /dev/null +++ b/scripts/craft @@ -0,0 +1 @@ +Subproject commit 1e0c56a5e66fd5bca636c08e028f85a23390437d diff --git a/scripts/do/omegapotion.zs b/scripts/do/omegapotion.zs index 6e50daab7..6ca30e568 100644 --- 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 index 851957380..27a836803 100644 --- 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 = ; diff --git a/scripts/mods/astralsorcery.zs b/scripts/mods/astralsorcery.zs index 3913fa334..caccad60c 100644 --- a/scripts/mods/astralsorcery.zs +++ b/scripts/mods/astralsorcery.zs @@ -107,7 +107,7 @@ craft.make( * 8, ["pretty", }); # [Luminous Crafting Table] from [Arcane Workbench][+2] -recipes.addShaped("Luminous Crafting Table - RecipeAction", , scripts.craft.grid.Grid(["pretty", +recipes.addShaped("Luminous Crafting Table - RecipeAction", , Grid(["pretty", "M n M", "M A M", "M M"], { diff --git a/scripts/mods/botania.zs b/scripts/mods/botania.zs index d40a15eb6..e3ac8c586 100644 --- a/scripts/mods/botania.zs +++ b/scripts/mods/botania.zs @@ -138,7 +138,7 @@ mods.thaumcraft.Infusion.registerRecipe( 10, # Instability [ * 100, * 100, * 100], , # Central Item - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", "S ◊ ╳", "▬ ▬", "* ◊ D"], { diff --git a/scripts/mods/culinaryconstruct.zs b/scripts/mods/culinaryconstruct.zs index 6ee130c68..df326751f 100644 --- a/scripts/mods/culinaryconstruct.zs +++ b/scripts/mods/culinaryconstruct.zs @@ -4,7 +4,7 @@ recipes.remove(); mods.extendedcrafting.TableCrafting.addShaped(0, , - 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 index da8fc2b22..3e543b09c 100644 --- a/scripts/mods/danknull.zs +++ b/scripts/mods/danknull.zs @@ -39,7 +39,7 @@ mods.thaumcraft.Infusion.registerRecipe( 15, # Instability [ * 150, * 150, * 150], , # 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 index fbbd01828..6ccc8781a 100644 --- a/scripts/mods/deepmoblearning.zs +++ b/scripts/mods/deepmoblearning.zs @@ -143,7 +143,7 @@ mods.thaumcraft.Infusion.registerRecipe( 10, # Instability [ * 100, * 100, * 100], , # 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 index 752c5bdd0..cb89d4976 100644 --- 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 index a47cea57e..f8ea6d61b 100644 --- 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 index 2f04de925..1297b5ed7 100644 --- 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 index 5c43c9c1b..4ba5a96b2 100644 --- 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 index 98258bf48..040aadfea 100644 --- 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 .items { # Intricate Circuit Board mods.forestry.Carpenter.removeRecipe(); mods.forestry.Carpenter.addRecipe(.withTag({T: 3 as short}), - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", "◊ B ◊", "◊ E ◊", "◊ R ◊"], { @@ -41,7 +40,7 @@ mods.forestry.Carpenter.addRecipe(.withTag({T: 3 as short}) # [Hardened Casing] from [Sturdy Casing][+1] mods.forestry.Carpenter.removeRecipe(); mods.forestry.Carpenter.addRecipe(, - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", "◊ ◊", " ⌂ ", "◊ ◊"], { diff --git a/scripts/mods/forestry_bees.zs b/scripts/mods/forestry_bees.zs index 42664e679..95d2f017b 100644 --- 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 index c490d6ac4..e96a4ef71 100644 --- 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 index 0f451fa46..327a9be58 100644 --- 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(, [ @@ -32,7 +31,7 @@ recipes.addShapedMirrored("Machine Gearbox", # Machine Circuitry recipes.remove(); mods.forestry.Carpenter.addRecipe(, - 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 index 7508977d0..63c2e6d13 100644 --- 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 index 21d91b7ee..a62107277 100644 --- a/scripts/mods/thaumadditions.zs +++ b/scripts/mods/thaumadditions.zs @@ -21,7 +21,7 @@ mods.thaumcraft.Infusion.registerRecipe( 15, # Instability [ * 200, * 200, * 200, * 200], , # 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 index 194ed6f34..335dcb300 100644 --- a/scripts/mods/thaumcraft.zs +++ b/scripts/mods/thaumcraft.zs @@ -15,7 +15,7 @@ furnace.addRecipe( * 2, ); # Primordial Pearl alt (for some people who dont want to close rifts) mods.astralsorcery.Altar.addConstellationAltarRecipe( - 'Primordial Pearl alt', , 1500, 250, scripts.craft.grid.Grid([ + 'Primordial Pearl alt', , 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 [, ], , # Output - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", "‚ ‚ ‚", "‚ # ‚", "‚ ‚ ‚"], { @@ -263,7 +263,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe( 30, # Vis cost [, ], , # Output - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", " S ", "‚ □ ‚", " S "], { @@ -280,7 +280,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe( 50, # Vis cost [, ], , # Output - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", " ■ ", "S # S"], { "■": , # Hopper @@ -296,7 +296,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe( 150, # Vis cost [, , , , , ], * 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 [ * 2, * 2, * 2, * 2], , # 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 .withTag({EntityTag: {id: "thaumcraft:cultistportallesser"}}), 15, [ * 90, * 45, * 90, * 30], , # Golden Egg -scripts.craft.grid.Grid(["-K-T-K-T"], { +Grid(["-K-T-K-T"], { "-": , # Energetic Nitor "K": , # Klein Bottle "T": , # Taintwood Log @@ -390,7 +390,7 @@ mods.thaumcraft.Infusion.registerRecipe( 1, # Instability [ * 100, * 20], , # CentralItem - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", " ˛ ", "q q", " ‚ "], { @@ -408,7 +408,7 @@ mods.thaumcraft.Infusion.registerRecipe( 1, # Instability [ * 10], , # Central Item - scripts.craft.grid.Grid(["oG"], { + Grid(["oG"], { "o": .anyDamage(), # Golden Pickaxe "G": .anyDamage(), # Golden Shovel }).spiral(1)); @@ -422,7 +422,7 @@ mods.thaumcraft.Infusion.registerRecipe( 1, # Instability [ * 10], , # Central Item - scripts.craft.grid.Grid(["ZZ"], { + Grid(["ZZ"], { "Z": , # Zombie Brain }).spiral(1)); @@ -435,7 +435,7 @@ mods.thaumcraft.Infusion.registerRecipe( 2, # Instability [ * 20, * 20], , # Central Item - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", " ▲ ", "D D", " ▲ "], { diff --git a/scripts/mods/thaumictinkerer.zs b/scripts/mods/thaumictinkerer.zs index 3b73e7d3e..0431ceba8 100644 --- a/scripts/mods/thaumictinkerer.zs +++ b/scripts/mods/thaumictinkerer.zs @@ -19,7 +19,7 @@ mods.thaumcraft.Infusion.registerRecipe( 8, # Instability [ * 100, * 100, * 100], , # 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 index b42f996fe..f6cf0ff1b 100644 --- a/scripts/mods/thaumicwonders.zs +++ b/scripts/mods/thaumicwonders.zs @@ -12,7 +12,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe( 200, # Vis cost [, ], , # Output - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", " * ", "F V F", " * "], { @@ -29,7 +29,7 @@ mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe( 750, # Vis cost [ * 8, * 8, * 8], , # Output - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", "□ F □", "C l C", "□ c □"], { @@ -100,7 +100,7 @@ mods.thaumcraft.Infusion.registerRecipe( 13, # Instability [ * 50, * 50, * 50], , # Central Item - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", " r ", "♦ ◊", " θ "], { diff --git a/scripts/mods/thermalexpansion.zs b/scripts/mods/thermalexpansion.zs index 39fe9480c..623b5587f 100644 --- 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( * 2, ["pretty", # [Machine Frame]*2 from [Device Frame][+6] recipes.remove(); mods.forestry.ThermionicFabricator.addCast( * 2, - scripts.craft.grid.Grid(["pretty", + Grid(["pretty", "■ B ■", "M ◙ ⌂", "* ▄ *"], { diff --git a/scripts/skyblock/skyrecipes.zs b/scripts/skyblock/skyrecipes.zs index 7e9e9fb8f..9b896bc03 100644 --- 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