1.61 done

Project-Interactions · Feb 18, 2024 · d357def · d357def
1 parent 314ba5f
commit d357def
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 33 deletions.
diff --git a/groovy/postInit/Avaritia.groovy b/groovy/postInit/Avaritia.groovy
@@ -0,0 +1,14 @@
+mods.avaritia.ExtremeCrafting.removeByOutput(item('avaritia:resource', 6))
+
+mods.avaritia.ExtremeCrafting.shapedBuilder()
+    .matrix([[null,null,null,null,null,null,null,null,null],
+            [null, null, null, null, item('avaritia:resource', 5), item('avaritia:resource', 5), item('avaritia:resource', 5), null, null], 
+            [null, item('avaritia:resource', 5), item('avaritia:resource', 5), item('avaritia:resource', 5), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritia:resource', 5), null], 
+            [item('avaritia:resource', 5), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritiatweaks:infinitato'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritia:resource', 5)], 
+            [item('avaritia:resource', 5), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritiatweaks:infinitato'), item('extendedcrafting:material', 13), item('avaritiatweaks:infinitato'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritia:resource', 5)], 
+            [item('avaritia:resource', 5), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritiatweaks:infinitato'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritia:resource', 5)], 
+            [null, item('avaritia:resource', 5), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), ore('ingotCosmicNeutronium'), item('avaritia:resource', 5), item('avaritia:resource', 5), item('avaritia:resource', 5), null], 
+            [null, null, item('avaritia:resource', 5), item('avaritia:resource', 5), item('avaritia:resource', 5), null, null, null, null],
+            [null,null,null,null,null,null,null,null,null]])
+    .output(item('avaritia:resource',6))
+    .register()
diff --git a/groovy/postInit/ExtendedCrafting.groovy b/groovy/postInit/ExtendedCrafting.groovy
@@ -11,23 +11,15 @@ mods.extendedcrafting.TableCrafting.addShaped(4, item('environmentaltech:void_or
 ])
 
 mods.extendedcrafting.TableCrafting.addShaped(4, item("botania:pool", 1), [
-[ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('gearGaia'), ore('gearGaia'), ore('gearGaia'), ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('ore:runeAsgard')], 
-[ore('ore:runeAsgard'), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), ore('ore:runeAsgard')], 
-[ore('ore:runeAsgard'), item('botania:pool', 3), ore('runeLustB'), ore('runeGluttonyB'), item('botanicadds:rune_energy'), ore('runeSlothB'), ore('runeWrathB'), item('botania:pool', 3), ore('ore:runeAsgard')], 
+[ore('runeAsgard'), ore('runeAsgard'), ore('runeAsgard'), ore('gearGaia'), ore('gearGaia'), ore('gearGaia'), ore('runeAsgard'), ore('runeAsgard'), ore('runeAsgard')], 
+[ore('runeAsgard'), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), item('botania:pool', 3), ore('runeAsgard')], 
+[ore('runeAsgard'), item('botania:pool', 3), ore('runeLustB'), ore('runeGluttonyB'), item('botanicadds:rune_energy'), ore('runeSlothB'), ore('runeWrathB'), item('botania:pool', 3), ore('runeAsgard')], 
 [ore('gearGaia'), ore('runeEnvyB'), item('botania:lens', 14), item('botania:lens', 15), ore('singularityMirion'), item('botania:lens', 16), item('botania:lens', 20), ore('runeEarthB'), ore('gearGaia')], 
 [ore('gearGaia'), ore('runeSpringB'), ore('runeFireB'), ore('singularityMirion'), item('auraddons:item_creative_aura_cache'), ore('singularityMirion'), ore('runeWaterB'), ore('runeManaB'), ore('gearGaia')], 
 [ore('gearGaia'), ore('runeAirB'), item('botania:lens', 21), item('botania:lens', 22), item('botania_tweaks:compressed_tiny_potato_8'), item('botania:lens', 10), item('botania:lens', 23), ore('runeWinterB'), ore('gearGaia')], 
-[ore('ore:runeAsgard'), item('botanicadds:pool_dreaming'), ore('runePrideB'), ore('runeSummerB'), item('botanicadds:rune_tp'), ore('runeGreedB'), ore('runeAutumnB'), item('botanicadds:pool_dreaming'), ore('ore:runeAsgard')], 
-[ore('ore:runeAsgard'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), ore('ore:runeAsgard')], 
-[ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('gearGaia'), ore('gearGaia'), ore('gearGaia'), ore('ore:runeAsgard'), ore('ore:runeAsgard'), ore('ore:runeAsgard')]
-])
-
-mods.extendedcrafting.TableCrafting.addShaped(2, item("interaction:huge_le_infuser"), [
-[ore('plateDenseMystic'), ore('plateDenseSkyfather'), ore('rodBlitz'), ore('plateDenseSkyfather'), ore('plateDenseMystic')], 
-[ore('plateDenseMystic'), ore('rodBlitz'), ore('plateDenseSkyfather'), ore('plateDenseSkyfather'), ore('plateDenseMystic')], 
-[ore('plateDenseMystic'), ore('plateDenseSkyfather'), ore('rodBlitz'), ore('plateDenseSkyfather'), ore('plateDenseMystic')], 
-[ore('plateDenseMystic'), ore('plateDenseSkyfather'), ore('plateDenseSkyfather'), ore('rodBlitz'), ore('plateDenseMystic')], 
-[ore('plateDenseMystic'), ore('plateDenseSkyfather'), ore('rodBlitz'), ore('plateDenseSkyfather'), ore('plateDenseMystic')]
+[ore('runeAsgard'), item('botanicadds:pool_dreaming'), ore('runePrideB'), ore('runeSummerB'), item('botanicadds:rune_tp'), ore('runeGreedB'), ore('runeAutumnB'), item('botanicadds:pool_dreaming'), ore('runeAsgard')], 
+[ore('runeAsgard'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), item('botanicadds:pool_dreaming'), ore('runeAsgard')], 
+[ore('runeAsgard'), ore('runeAsgard'), ore('runeAsgard'), ore('gearGaiasteel'), ore('gearGaiasteel'), ore('gearGaiasteel'), ore('runeAsgard'), ore('runeAsgard'), ore('runeAsgard')]
 ])
 mods.extendedcrafting.TableCrafting.addShaped(3, item('extrautils2:passivegenerator',6), [
 [item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8), item('extrautils2:passivegenerator', 8)], 
@@ -68,8 +60,18 @@ mods.extendedcrafting.TableCrafting.addShaped(4, item('lightningcraft:lightning_
 [item('lightningcraft:lightning_cell', 2), null, null, null, ore('blockElectricium'), null, null, null, item('lightningcraft:lightning_cell', 2)], 
 [item('lightningcraft:lightning_cell', 2), null, null, ore('blockElectricium'), null, null, null, null, item('lightningcraft:lightning_cell', 2)], 
 [item('lightningcraft:lightning_cell', 2), null, ore('blockElectricium'), ore('blockElectricium'), item('minecraft:command_block'), ore('blockElectricium'), ore('blockElectricium'), null, item('lightningcraft:lightning_cell', 2)], 
-[item('lightningcraft:lightning_cell', 2), null, null, null, null, null, ore('blockElectricium'), null, item('lightningcraft:lightning_cell', 2)], 
 [item('lightningcraft:lightning_cell', 2), null, null, null, null, ore('blockElectricium'), null, null, item('lightningcraft:lightning_cell', 2)], 
 [item('lightningcraft:lightning_cell', 2), null, null, null, ore('blockElectricium'), null, null, null, item('lightningcraft:lightning_cell', 2)], 
+[item('lightningcraft:lightning_cell', 2), null, null, ore('blockElectricium'), null, null, null, null, item('lightningcraft:lightning_cell', 2)], 
 [item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2), item('lightningcraft:lightning_cell', 2)]
+])
+
+mods.extendedcrafting.TableCrafting.addShaped(3, item('mysticalagradditions:stuff', 69), [
+[null,ore('blockInsanium'), null, null, null, ore('blockInsanium'),null], 
+[null,null, null, ore('blockInsanium'), null, null,null], 
+[null,ore('blockInsanium'), null, ore('blockInsanium'), null, ore('blockInsanium'),null], 
+[null,ore('blockInsanium'), ore('blockInsanium'), ore('essenceLumium'), ore('blockInsanium'), ore('blockInsanium'),null], 
+[null,ore('blockInsanium'), ore('essenceLumium'), item('extendedcrafting:material', 13), ore('essenceLumium'), ore('blockInsanium'),null], 
+[null,ore('blockInsanium'), ore('essenceLumium'), ore('essenceLumium'), ore('essenceLumium'), ore('blockInsanium'),null], 
+[null,null, ore('blockInsanium'), ore('blockInsanium'), ore('blockInsanium'), null,null]
 ])
diff --git a/resources/modularmachinery/blockstates/adv_coke_oven_controller.json b/resources/modularmachinery/blockstates/adv_coke_oven_controller.json
@@ -0,0 +1,43 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "modularmachinery:blockcontroller"
+  },
+  "variants": {
+    "facing=north,formed=false": {
+      "model": "modularmachinery:blockcontroller"
+    },
+    "facing=south,formed=false": {
+      "model": "modularmachinery:blockcontroller",
+      "y": 180
+    },
+    "facing=west,formed=false": {
+      "model": "modularmachinery:blockcontroller",
+      "y": 270
+    },
+    "facing=east,formed=false": {
+      "model": "modularmachinery:blockcontroller",
+      "y": 90
+    },
+    "facing=north,formed=true": {
+      "model": "modularmachinery:blockcontroller"
+    },
+    "facing=south,formed=true": {
+      "model": "modularmachinery:blockcontroller",
+      "y": 180
+    },
+    "facing=west,formed=true": {
+      "model": "modularmachinery:blockcontroller",
+      "y": 270
+    },
+    "facing=east,formed=true": {
+      "model": "modularmachinery:blockcontroller",
+      "y": 90
+    },
+    "inventory": [
+      {
+        "transform": "forge:default-block"
+      }
+    ]
+  }
+}
diff --git a/scripts/recipes/mods/AT.zs b/scripts/recipes/mods/AT.zs
@@ -34,21 +34,6 @@ mods.extendedcrafting.TableCrafting.addShaped(2, <avaritia:neutron_collector>*2,
 mods.avaritia.ExtremeCrafting.remove(<avaritia:neutron_collector>);
 
 
-mods.avaritia.ExtremeCrafting.remove(<avaritia:resource:6>);
-
-
-mods.avaritia.ExtremeCrafting.addShaped("infinityingot", <avaritia:resource:6>, [
-	[null, null, null, null, null, null, null, null, null], 
-	[<ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>], 
-	[<ore:ingotUltimate>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>, <ore:ingotUltimate>], 
-	[<ore:ingotUltimate>,<avaritia:resource:5>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>,<avaritia:resource:5>, <ore:ingotUltimate>], 
-	[<ore:ingotUltimate>,<avaritia:resource:5>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <avaritiatweaks:infinitato>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>,<avaritia:resource:5>, <ore:ingotUltimate>], 
-	[<ore:ingotUltimate>,<avaritia:resource:5>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>, <ore:blockCosmicNeutronium>,<avaritia:resource:5>, <ore:ingotUltimate>], 
-	[<ore:ingotUltimate>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>,<avaritia:resource:5>, <ore:ingotUltimate>], 
-	[<ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>, <ore:ingotUltimate>], 
-	[null, null, null, null, null, null, null, null, null]
-]);
-
 //package
 RecipeUtils.recipeTweak(true, <packagedavaritia:extreme_crafter>, [[<avaritia:resource:1>, <packagedauto:me_package_component>, <avaritia:resource:1>], [<ore:dustRedstone>, <avaritiaddons:extreme_auto_crafter>, <ore:dustRedstone>], [<avaritia:resource:1>, <minecraft:hopper>, <avaritia:resource:1>]]);
 recipes.addShaped(<avaritiaddons:extreme_auto_crafter>, [[null, <avaritia:singularity:3>, null], [<ore:blockCosmicNeutronium>, <botania_tweaks:dire_crafty_crate>, <ore:blockCosmicNeutronium>], [null, <ore:blockCosmicNeutronium>, null]]);

diff --git a/scripts/recipes/mods/MA.zs b/scripts/recipes/mods/MA.zs
@@ -65,3 +65,5 @@ recipes.addShaped(<mysticalagriculture:supremium_leggings>, [[<mysticalagricultu
 recipes.addShaped(<mysticalagriculture:supremium_chestplate>, [[<mysticalagriculture:crafting:37>, <mysticalagriculture:gear:9>, <mysticalagriculture:crafting:37>],[<mysticalagriculture:crafting:37>, <deepmoblearning:glitch_infused_chestplate>, <mysticalagriculture:crafting:37>], [<mysticalagriculture:crafting:37>, <mysticalagriculture:crafting:37>, <mysticalagriculture:crafting:37>]]);
 recipes.addShaped(<mysticalagriculture:supremium_helmet>, [[<mysticalagriculture:crafting:37>, <mysticalagriculture:gear:9>, <mysticalagriculture:crafting:37>],[<mysticalagriculture:crafting:37>, <deepmoblearning:glitch_infused_helmet>, <mysticalagriculture:crafting:37>], [null, null, null]]);
 
+//creative
+recipes.addShapeless(<mysticalagradditions:insanium>*4,[<mysticalagradditions:stuff:69>.reuse()]);
diff --git a/scripts/recipes/mods/NCO.zs b/scripts/recipes/mods/NCO.zs
@@ -37,7 +37,6 @@ recipes.remove(<nuclearcraft:part:12>);
 recipes.addShaped(<nuclearcraft:part>, [[<ore:dustGraphite>, <ore:ingotEezo>, null],[<ore:ingotEezo>, <immersiveengineering:material:18>, null], [null, null, null]]);
 recipes.addShaped(<nuclearcraft:part:4>, [[null, <taiga:palladium_ingot>, null],[<enderio:item_alloy_ingot>, <taiga:palladium_ingot>, <enderio:item_alloy_ingot>], [null, <taiga:palladium_ingot>, null]]);
 recipes.remove(<nuclearcraft:part:4> * 2);
-RecipeUtils.recipeTweak(true,<nuclearcraft:assembler>, [[<ore:plateElite>, <ore:ingotHardCarbon>, <ore:plateElite>], [<ore:actuator>, <ore:chassis>, <ore:actuator>], [<ore:plateElite>, <ore:motor>, <ore:plateElite>]]);
 
 mods.extendedcrafting.TableCrafting.addShaped(2, <nuclearcraft:part:8>*2, [
 	[null, null, <ore:ingotFerroboron>, <ore:ingotFerroboron>, null], 
@@ -197,8 +196,7 @@ RecipeUtils.recipeTweak(true, <nuclearcraft:melter>, [[<ore:circuitOperation>, <
 RecipeUtils.recipeTweak(true, <nuclearcraft:pressurizer>, [[<ore:circuitOperation>, <ore:blockTough>, <ore:circuitOperation>], [<ore:gearAdvancedElectronicAlloy>, <ore:emptyFrame>, <ore:gearAdvancedElectronicAlloy>], [<ore:circuitOperation>, <ore:blockTough>, <ore:circuitOperation>]]);
 RecipeUtils.recipeTweak(true, <nuclearcraft:rock_crusher>, [[<ore:circuitOperation>, <ore:blockTough>, <ore:circuitOperation>], [<ore:ingotThaumiumTerra>, <ore:emptyFrame>, <ore:ingotThaumiumTerra>], [<ore:circuitOperation>, <ore:ingotTough>, <ore:circuitOperation>]]);
 RecipeUtils.recipeTweak(true, <nuclearcraft:ingot_former>, [[<ore:circuitThaumic>, <minecraft:hopper:*>, <ore:circuitThaumic>], [<ore:ingotFerroboron>, <ore:emptyFrame>, <ore:ingotFerroboron>], [<ore:circuitThaumic>, <ore:ingotTough>, <ore:circuitThaumic>]]);
-recipes.remove(<nuclearcraft:assembler>);
-recipes.addShaped(<nuclearcraft:assembler>, [[<ore:circuitOperation>, <ore:gearHardCarbon>, <ore:circuitOperation>], [<ore:plateFerroboron>, <ore:emptyFrame>, <ore:plateFerroboron>], [<ore:circuitOperation>, <ore:plateFerroboron>, <ore:circuitOperation>]]);
+RecipeUtils.recipeTweak(true, <nuclearcraft:assembler>, [[<ore:circuitOperation>, <ore:gearHardCarbon>, <ore:circuitOperation>], [<ore:plateFerroboron>, <ore:emptyFrame>, <ore:plateFerroboron>], [<ore:circuitOperation>, <ore:plateFerroboron>, <ore:circuitOperation>]]);
 
 //taiga
 OreLeacher.addRecipe(<enderio:block_infinity:2>,<liquid:nitric_acid>*16, <liquid:hydrochloric_acid>*16, <liquid:sulfuric_acid>*16, <enderio:item_material:20>*64, <taiga:eezo_dust>*2, null);